diff --git a/resources/graphics/Bullets/PeaIceExplode/PeaIceExplode_0.png b/resources/graphics/Bullets/PeaIceExplode/PeaIceExplode_0.png new file mode 100644 index 0000000..7ec793f Binary files /dev/null and b/resources/graphics/Bullets/PeaIceExplode/PeaIceExplode_0.png differ diff --git a/source/component/plant.py b/source/component/plant.py index a74b8c2..debbac6 100755 --- a/source/component/plant.py +++ b/source/component/plant.py @@ -76,6 +76,8 @@ class Bullet(pg.sprite.Sprite): fly_name = self.name if self.name == c.BULLET_MUSHROOM: explode_name = 'BulletMushRoomExplode' + elif self.name == c.BULLET_PEA_ICE: + explode_name = 'PeaIceExplode' else: explode_name = 'PeaNormalExplode' diff --git a/source/component/zombie.py b/source/component/zombie.py index fba96c9..f7b1f29 100755 --- a/source/component/zombie.py +++ b/source/component/zombie.py @@ -202,7 +202,6 @@ class Zombie(pg.sprite.Sprite): def setDamage(self, damage, effect=False, damageType=c.ZOMBIE_COMMON_DAMAGE): # 冰冻减速效果 - print(damage, effect, damageType) if effect == c.BULLET_EFFECT_ICE: if damageType == c.ZOMBIE_DEAFULT_DAMAGE: # 寒冰射手不能穿透二类防具进行减速 if not self.helmetType2: diff --git a/source/state/level.py b/source/state/level.py index 643f89d..d117b81 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -638,7 +638,7 @@ class Level(tool.State): def checkGlobalBulletCollision(self): - collided_func = pg.sprite.collide_circle_ratio(0.7) + collided_func = pg.sprite.collide_circle_ratio(0.6) for i in range(self.map_y_len): for globalBullet in self.global_bullet_group: if globalBullet.state == c.FLY: @@ -841,12 +841,6 @@ class Level(tool.State): elif plant.name == c.STARFRUIT: can_attack = False if (plant.state == c.IDLE): - ''' - totalZombie = 0 - for zombieColumn in range(self.map_y_len): - totalZombie += len(self.zombie_groups[zombieColumn]) - if totalZombie > 0: # 只要场上有僵尸就需要判断 - ''' for zombie_group in self.zombie_groups: # 遍历循环所有僵尸 for zombie in zombie_group: if plant.canAttack(zombie):