From 9fdd050a668e89af9fb95fd37988c52858e1d222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Sat, 9 Apr 2022 22:24:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=88=BA=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/data/map/level_0.json | 33 +-------------------------------- source/component/plant.py | 10 +++++----- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/resources/data/map/level_0.json b/resources/data/map/level_0.json index ec591e9..6d65538 100644 --- a/resources/data/map/level_0.json +++ b/resources/data/map/level_0.json @@ -3,38 +3,7 @@ "init_sun_value":5000, "shovel":1, "zombie_list":[ - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":1000, "map_y":2, "name":"NewspaperZombie"}, - {"time":2000, "map_y":2, "name":"NewspaperZombie"}, - {"time":3000, "map_y":2, "name":"NewspaperZombie"}, - {"time":4000, "map_y":2, "name":"Zombie"}, - {"time":5000, "map_y":2, "name":"Zombie"}, - {"time":6000, "map_y":2, "name":"Zombie"}, - {"time":7000, "map_y":2, "name":"BucketheadZombie"}, - {"time":8000, "map_y":2, "name":"BucketheadZombie"}, - {"time":9000, "map_y":2, "name":"Zombie"}, - {"time":10000, "map_y":2, "name":"Zombie"}, + {"time":1000, "map_y":2, "name":"Zombie"}, {"time":60000, "map_y":2, "name":"Zombie"} ] } \ No newline at end of file diff --git a/source/component/plant.py b/source/component/plant.py index a1d61bc..e7f0072 100755 --- a/source/component/plant.py +++ b/source/component/plant.py @@ -625,7 +625,7 @@ class Squash(Plant): class Spikeweed(Plant): def __init__(self, x, y): Plant.__init__(self, x, y, c.SPIKEWEED, c.PLANT_HEALTH, None) - self.animate_interval = 200 + self.animate_interval = 70 self.attack_timer = 0 def loadImages(self, name, scale): @@ -633,18 +633,18 @@ class Spikeweed(Plant): def setIdle(self): print('spikeweed idle') - self.animate_interval = 200 + self.animate_interval = 70 self.state = c.IDLE def canAttack(self, zombie): # 地刺能不能扎的判据：僵尸中心与地刺中心的距离或僵尸包括了地刺中心和右端（平衡得到合理的攻击范围,"僵尸包括了地刺中心和右端"是为以后巨人做准备） - if ((-60 <= zombie.rect.x - self.rect.x <= 40) or (zombie.rect.left <= self.rect.x <= zombie.rect.right and zombie.rect.left <= self.rect.right <= zombie.rect.right)): + if ((-45 <= zombie.rect.x - self.rect.x <= 30) or (zombie.rect.left <= self.rect.x <= zombie.rect.right and zombie.rect.left <= self.rect.right <= zombie.rect.right)): return True return False def setAttack(self, zombie_group): self.zombie_group = zombie_group - self.animate_interval = 50 + self.animate_interval = 35 self.state = c.ATTACK def attacking(self): @@ -652,7 +652,7 @@ class Spikeweed(Plant): self.attack_timer = self.current_time for zombie in self.zombie_group: if self.canAttack(zombie): - zombie.setDamage(10, False) + zombie.setDamage(20, False) class Jalapeno(Plant):