diff --git a/resources/graphics/Cards/card_cherrybomb.png b/resources/graphics/Cards/card_cherrybomb.png index 40274be..d8783d3 100644 Binary files a/resources/graphics/Cards/card_cherrybomb.png and b/resources/graphics/Cards/card_cherrybomb.png differ diff --git a/resources/graphics/Cards/card_cherrybomb_move.png b/resources/graphics/Cards/card_cherrybomb_move.png deleted file mode 100644 index d8783d3..0000000 Binary files a/resources/graphics/Cards/card_cherrybomb_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_chomper.png b/resources/graphics/Cards/card_chomper.png index e93c6c8..3ec32cd 100644 Binary files a/resources/graphics/Cards/card_chomper.png and b/resources/graphics/Cards/card_chomper.png differ diff --git a/resources/graphics/Cards/card_chomper_move.png b/resources/graphics/Cards/card_chomper_move.png deleted file mode 100644 index 3ec32cd..0000000 Binary files a/resources/graphics/Cards/card_chomper_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_coffeebean.png b/resources/graphics/Cards/card_coffeebean.png index 85f13f7..a78379f 100644 Binary files a/resources/graphics/Cards/card_coffeebean.png and b/resources/graphics/Cards/card_coffeebean.png differ diff --git a/resources/graphics/Cards/card_doomshroom.png b/resources/graphics/Cards/card_doomshroom.png index 2aa1e67..f14e167 100644 Binary files a/resources/graphics/Cards/card_doomshroom.png and b/resources/graphics/Cards/card_doomshroom.png differ diff --git a/resources/graphics/Cards/card_doomshroom_move.png b/resources/graphics/Cards/card_doomshroom_move.png deleted file mode 100644 index f14e167..0000000 Binary files a/resources/graphics/Cards/card_doomshroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_fumeshroom.png b/resources/graphics/Cards/card_fumeshroom.png index bdf1bf0..f48ecf6 100644 Binary files a/resources/graphics/Cards/card_fumeshroom.png and b/resources/graphics/Cards/card_fumeshroom.png differ diff --git a/resources/graphics/Cards/card_fumeshroom_move.png b/resources/graphics/Cards/card_fumeshroom_move.png deleted file mode 100644 index f48ecf6..0000000 Binary files a/resources/graphics/Cards/card_fumeshroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_gravebuster.png b/resources/graphics/Cards/card_gravebuster.png index e411f2b..80a5874 100644 Binary files a/resources/graphics/Cards/card_gravebuster.png and b/resources/graphics/Cards/card_gravebuster.png differ diff --git a/resources/graphics/Cards/card_gravebuster_move.png b/resources/graphics/Cards/card_gravebuster_move.png deleted file mode 100644 index 80a5874..0000000 Binary files a/resources/graphics/Cards/card_gravebuster_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_hypnoshroom.png b/resources/graphics/Cards/card_hypnoshroom.png index 3708c8b..e212860 100644 Binary files a/resources/graphics/Cards/card_hypnoshroom.png and b/resources/graphics/Cards/card_hypnoshroom.png differ diff --git a/resources/graphics/Cards/card_hypnoshroom_move.png b/resources/graphics/Cards/card_hypnoshroom_move.png deleted file mode 100644 index e212860..0000000 Binary files a/resources/graphics/Cards/card_hypnoshroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_iceshroom.png b/resources/graphics/Cards/card_iceshroom.png index 77dc16a..e0daf0b 100644 Binary files a/resources/graphics/Cards/card_iceshroom.png and b/resources/graphics/Cards/card_iceshroom.png differ diff --git a/resources/graphics/Cards/card_iceshroom_move.png b/resources/graphics/Cards/card_iceshroom_move.png deleted file mode 100644 index e0daf0b..0000000 Binary files a/resources/graphics/Cards/card_iceshroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_jalapeno.png b/resources/graphics/Cards/card_jalapeno.png index 042bbcd..e88b55a 100644 Binary files a/resources/graphics/Cards/card_jalapeno.png and b/resources/graphics/Cards/card_jalapeno.png differ diff --git a/resources/graphics/Cards/card_jalapeno_move.png b/resources/graphics/Cards/card_jalapeno_move.png deleted file mode 100644 index e88b55a..0000000 Binary files a/resources/graphics/Cards/card_jalapeno_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_lilypad.png b/resources/graphics/Cards/card_lilypad.png index beb77a8..ca33cf3 100644 Binary files a/resources/graphics/Cards/card_lilypad.png and b/resources/graphics/Cards/card_lilypad.png differ diff --git a/resources/graphics/Cards/card_lilypad_move.png b/resources/graphics/Cards/card_lilypad_move.png deleted file mode 100644 index ca33cf3..0000000 Binary files a/resources/graphics/Cards/card_lilypad_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_peashooter.png b/resources/graphics/Cards/card_peashooter.png index 2e20222..a86e850 100644 Binary files a/resources/graphics/Cards/card_peashooter.png and b/resources/graphics/Cards/card_peashooter.png differ diff --git a/resources/graphics/Cards/card_peashooter_move.png b/resources/graphics/Cards/card_peashooter_move.png deleted file mode 100644 index a86e850..0000000 Binary files a/resources/graphics/Cards/card_peashooter_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_potatomine.png b/resources/graphics/Cards/card_potatomine.png index f9abd76..315da5f 100644 Binary files a/resources/graphics/Cards/card_potatomine.png and b/resources/graphics/Cards/card_potatomine.png differ diff --git a/resources/graphics/Cards/card_potatomine_move.png b/resources/graphics/Cards/card_potatomine_move.png deleted file mode 100644 index 315da5f..0000000 Binary files a/resources/graphics/Cards/card_potatomine_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_puffshroom.png b/resources/graphics/Cards/card_puffshroom.png index ce37a42..3a25bad 100644 Binary files a/resources/graphics/Cards/card_puffshroom.png and b/resources/graphics/Cards/card_puffshroom.png differ diff --git a/resources/graphics/Cards/card_puffshroom_move.png b/resources/graphics/Cards/card_puffshroom_move.png deleted file mode 100644 index 3a25bad..0000000 Binary files a/resources/graphics/Cards/card_puffshroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_pumpkinhead.png b/resources/graphics/Cards/card_pumpkinhead.png index 8762718..a3be4f1 100644 Binary files a/resources/graphics/Cards/card_pumpkinhead.png and b/resources/graphics/Cards/card_pumpkinhead.png differ diff --git a/resources/graphics/Cards/card_pumpkinhead_move.png b/resources/graphics/Cards/card_pumpkinhead_move.png deleted file mode 100644 index a3be4f1..0000000 Binary files a/resources/graphics/Cards/card_pumpkinhead_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_redwallnut_move.png b/resources/graphics/Cards/card_redwallnut.png similarity index 100% rename from resources/graphics/Cards/card_redwallnut_move.png rename to resources/graphics/Cards/card_redwallnut.png diff --git a/resources/graphics/Cards/card_repeaterpea.png b/resources/graphics/Cards/card_repeaterpea.png index f47c24e..f9a0afc 100644 Binary files a/resources/graphics/Cards/card_repeaterpea.png and b/resources/graphics/Cards/card_repeaterpea.png differ diff --git a/resources/graphics/Cards/card_repeaterpea_move.png b/resources/graphics/Cards/card_repeaterpea_move.png deleted file mode 100644 index f9a0afc..0000000 Binary files a/resources/graphics/Cards/card_repeaterpea_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_scaredyshroom.png b/resources/graphics/Cards/card_scaredyshroom.png index 54d44ac..625254d 100644 Binary files a/resources/graphics/Cards/card_scaredyshroom.png and b/resources/graphics/Cards/card_scaredyshroom.png differ diff --git a/resources/graphics/Cards/card_scaredyshroom_move.png b/resources/graphics/Cards/card_scaredyshroom_move.png deleted file mode 100644 index 625254d..0000000 Binary files a/resources/graphics/Cards/card_scaredyshroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_seashroom.png b/resources/graphics/Cards/card_seashroom.png index 506de74..ecd8bbe 100644 Binary files a/resources/graphics/Cards/card_seashroom.png and b/resources/graphics/Cards/card_seashroom.png differ diff --git a/resources/graphics/Cards/card_seashroom_move.png b/resources/graphics/Cards/card_seashroom_move.png deleted file mode 100644 index ecd8bbe..0000000 Binary files a/resources/graphics/Cards/card_seashroom_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_snowpea.png b/resources/graphics/Cards/card_snowpea.png index d1fc2fb..6df72ce 100644 Binary files a/resources/graphics/Cards/card_snowpea.png and b/resources/graphics/Cards/card_snowpea.png differ diff --git a/resources/graphics/Cards/card_snowpea_move.png b/resources/graphics/Cards/card_snowpea_move.png deleted file mode 100644 index 6df72ce..0000000 Binary files a/resources/graphics/Cards/card_snowpea_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_spikeweed.png b/resources/graphics/Cards/card_spikeweed.png index d661c6e..a4a70f8 100644 Binary files a/resources/graphics/Cards/card_spikeweed.png and b/resources/graphics/Cards/card_spikeweed.png differ diff --git a/resources/graphics/Cards/card_spikeweed_move.png b/resources/graphics/Cards/card_spikeweed_move.png deleted file mode 100644 index a4a70f8..0000000 Binary files a/resources/graphics/Cards/card_spikeweed_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_squash.png b/resources/graphics/Cards/card_squash.png index 0a5b406..fc667cb 100644 Binary files a/resources/graphics/Cards/card_squash.png and b/resources/graphics/Cards/card_squash.png differ diff --git a/resources/graphics/Cards/card_squash_move.png b/resources/graphics/Cards/card_squash_move.png deleted file mode 100644 index fc667cb..0000000 Binary files a/resources/graphics/Cards/card_squash_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_starfruit.png b/resources/graphics/Cards/card_starfruit.png index af7be92..45999fa 100644 Binary files a/resources/graphics/Cards/card_starfruit.png and b/resources/graphics/Cards/card_starfruit.png differ diff --git a/resources/graphics/Cards/card_starfruit_move.png b/resources/graphics/Cards/card_starfruit_move.png deleted file mode 100644 index 45999fa..0000000 Binary files a/resources/graphics/Cards/card_starfruit_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_sunflower.png b/resources/graphics/Cards/card_sunflower.png index 3413a28..e0ca28f 100644 Binary files a/resources/graphics/Cards/card_sunflower.png and b/resources/graphics/Cards/card_sunflower.png differ diff --git a/resources/graphics/Cards/card_sunshroom.png b/resources/graphics/Cards/card_sunshroom.png index 3f14fac..e2b6a45 100644 Binary files a/resources/graphics/Cards/card_sunshroom.png and b/resources/graphics/Cards/card_sunshroom.png differ diff --git a/resources/graphics/Cards/card_tallnut.png b/resources/graphics/Cards/card_tallnut.png index b91b4c2..67c2177 100644 Binary files a/resources/graphics/Cards/card_tallnut.png and b/resources/graphics/Cards/card_tallnut.png differ diff --git a/resources/graphics/Cards/card_tallnut_move.png b/resources/graphics/Cards/card_tallnut_move.png deleted file mode 100644 index 67c2177..0000000 Binary files a/resources/graphics/Cards/card_tallnut_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_tangleklep.png b/resources/graphics/Cards/card_tangleklep.png index d59175b..f7f208c 100644 Binary files a/resources/graphics/Cards/card_tangleklep.png and b/resources/graphics/Cards/card_tangleklep.png differ diff --git a/resources/graphics/Cards/card_tangleklep_move.png b/resources/graphics/Cards/card_tangleklep_move.png deleted file mode 100644 index f7f208c..0000000 Binary files a/resources/graphics/Cards/card_tangleklep_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_threepeashooter.png b/resources/graphics/Cards/card_threepeashooter.png index b7e5788..c46aab5 100644 Binary files a/resources/graphics/Cards/card_threepeashooter.png and b/resources/graphics/Cards/card_threepeashooter.png differ diff --git a/resources/graphics/Cards/card_threepeashooter_move.png b/resources/graphics/Cards/card_threepeashooter_move.png deleted file mode 100644 index c46aab5..0000000 Binary files a/resources/graphics/Cards/card_threepeashooter_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_torchwood.png b/resources/graphics/Cards/card_torchwood.png index 49318f1..b4fbb2c 100644 Binary files a/resources/graphics/Cards/card_torchwood.png and b/resources/graphics/Cards/card_torchwood.png differ diff --git a/resources/graphics/Cards/card_torchwood_move.png b/resources/graphics/Cards/card_torchwood_move.png deleted file mode 100644 index b4fbb2c..0000000 Binary files a/resources/graphics/Cards/card_torchwood_move.png and /dev/null differ diff --git a/resources/graphics/Cards/card_wallnut.png b/resources/graphics/Cards/card_wallnut.png index e7207f1..e56b255 100644 Binary files a/resources/graphics/Cards/card_wallnut.png and b/resources/graphics/Cards/card_wallnut.png differ diff --git a/resources/graphics/Cards/card_wallnut_move.png b/resources/graphics/Cards/card_wallnut_move.png deleted file mode 100644 index e56b255..0000000 Binary files a/resources/graphics/Cards/card_wallnut_move.png and /dev/null differ diff --git a/source/component/menubar.py b/source/component/menubar.py index b5919ad..5774551 100755 --- a/source/component/menubar.py +++ b/source/component/menubar.py @@ -36,6 +36,12 @@ class Card(): self.rect.y = y # 计划以后以此坐标进行相对变化，用字体绘制阳光消耗大小，不再采用现在的图片包含阳光方法 # 以便减小程序体积并增加可维护性 + font = pg.font.Font(c.FONT_PATH, 12) + font.bold = True + self.sun_cost_img = font.render(str(c.PLANT_CARD_INFO[index][c.SUN_INDEX]), True, c.BLACK) + self.sun_cost_img_rect = self.sun_cost_img.get_rect() + sun_cost_img_x = 32 - self.sun_cost_img_rect.w + self.orig_image.blit(self.sun_cost_img, (sun_cost_img_x, 52, self.sun_cost_img_rect.w, self.sun_cost_img_rect.h)) self.index = index self.sun_cost = c.PLANT_CARD_INFO[index][c.SUN_INDEX] @@ -399,7 +405,7 @@ class MoveBar(): x = self.card_end_x y = 6 selected_card = random.choices(self.card_pool_name, self.card_pool_weight)[0] - self.card_list.append(MoveCard(x, y, selected_card[c.CARD_INDEX] + "_move", selected_card[c.PLANT_NAME_INDEX])) + self.card_list.append(MoveCard(x, y, selected_card[c.CARD_INDEX], selected_card[c.PLANT_NAME_INDEX])) return True def update(self, current_time):