diff --git a/source/component/map.py b/source/component/map.py index ce01487..206905a 100755 --- a/source/component/map.py +++ b/source/component/map.py @@ -360,16 +360,21 @@ LEVEL_MAP_DATA = ( LITTLE_GAME_MAP_DATA = ( # 第0关 测试 { - c.BACKGROUND_TYPE: 6, + c.BACKGROUND_TYPE: 3, c.GAME_TITLE: "隐藏测试关卡", - c.CHOOSEBAR_TYPE: c.CHOOSEBAR_BOWLING, - c.SHOVEL: 0, + c.CHOOSEBAR_TYPE: c.CHOOSEBAR_MOVE, + c.SHOVEL: 1, c.SPAWN_ZOMBIES:c.SPAWN_ZOMBIES_AUTO, - c.INCLUDED_ZOMBIES: ( c.POLE_VAULTING_ZOMBIE,), - c.NUM_FLAGS:1, - c.CARD_POOL: { c.WALLNUTBOWLING: 0, - c.REDWALLNUTBOWLING: 0, - c.GIANTWALLNUT:100,} + c.INCLUDED_ZOMBIES: ( c.NORMAL_ZOMBIE, c.NEWSPAPER_ZOMBIE, + c.ZOMBONI, c.FOOTBALL_ZOMBIE, + c.CONEHEAD_ZOMBIE, c.BUCKETHEAD_ZOMBIE), + c.NUM_FLAGS:4, + c.CARD_POOL: { c.LILYPAD: 300, + c.STARFRUIT: 400, + c.PUMPKINHEAD: 100, + c.SEASHROOM: 100, + c.SPIKEWEED: 100, + } }, # 第1关 坚果保龄球 { diff --git a/source/component/plant.py b/source/component/plant.py index db01a8f..d3bf123 100755 --- a/source/component/plant.py +++ b/source/component/plant.py @@ -195,8 +195,7 @@ class StarBullet(Bullet): self.rect.x += 7 self.rect.y += 7 elif self.direction == c.STAR_UPWARD: - # 实际上不知道为什么向上飞的看起来要快一些,所以拟合的时候把速度调小了一点 - self.rect.y -= 9 + self.rect.y -= 10 elif self.direction == c.STAR_DOWNWARD: self.rect.y += 10 else: diff --git a/source/state/level.py b/source/state/level.py index 6091cf6..cf3013e 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -1547,6 +1547,14 @@ class Level(tool.State): self.showAllContentOfMenu(surface) # 以后可能需要插入一个预备的状态(预览显示僵尸、返回战场) elif self.state == c.PLAY: + if self.has_shovel: + # 画铲子 + surface.blit(self.shovel_box, self.shovel_box_rect) + surface.blit(self.shovel, self.shovel_rect) + # 画小菜单 + surface.blit(self.little_menu, self.little_menu_rect) + + self.menubar.draw(surface) for i in range(self.map_y_len): self.plant_groups[i].draw(surface) self.zombie_groups[i].draw(surface) @@ -1556,19 +1564,6 @@ class Level(tool.State): if self.cars[i]: self.cars[i].draw(surface) self.head_group.draw(surface) - - # 浓雾模式的雾 - #if self.background_type == c.BACKGROUND_FOG: - # pg.draw.rect(surface, c.LIGHTGRAY, (400, 0, 400, 600)) - - if self.has_shovel: - # 画铲子 - surface.blit(self.shovel_box, self.shovel_box_rect) - surface.blit(self.shovel, self.shovel_rect) - # 画小菜单 - surface.blit(self.little_menu, self.little_menu_rect) - - self.menubar.draw(surface) self.sun_group.draw(surface) if self.drag_plant: