From d96ccf5fa82a3c7c92c948817d0d3dce27b4b74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Sun, 8 May 2022 10:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=A0=E7=BB=95=E6=B0=B4?= =?UTF-8?q?=E8=8D=89=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + resources/sound/tangleKelpDrag.ogg | Bin 0 -> 3299 bytes source/component/plant.py | 2 ++ source/state/level.py | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 resources/sound/tangleKelpDrag.ogg diff --git a/README.md b/README.md index bd53c12..18282a5 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,7 @@ nuitka --mingw64 --standalone --onefile --show-progress --show-memory --output-d * 从地面刺伤 * 已实现 * 缠绕与拖拽 + * 自0.7.5.0已实现 * 吞噬 * 已实现 * 特殊 diff --git a/resources/sound/tangleKelpDrag.ogg b/resources/sound/tangleKelpDrag.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e04edc67e43004c2c705fabd97447eb708a8b762 GIT binary patch literal 3299 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 self.frame_num: self.health = 0 \ No newline at end of file diff --git a/source/state/level.py b/source/state/level.py index 2cad525..e7d7a73 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -1023,7 +1023,7 @@ class Level(tool.State): if ((pg.sprite.collide_circle_ratio(0.6)(zombie, plant)) or (abs(zombie.rect.centerx - x) <= plant.explode_x_range)): zombie.setDamage(1800, damageType=c.ZOMBIE_RANGE_DAMAGE) - elif plant.name != c.WALLNUTBOWLING: + elif plant.name not in {c.WALLNUTBOWLING, c.TANGLEKLEP}: # 触发植物死亡音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "plantDie.ogg")).play() else: