From d1f5d798b4b25813249bdd4b34d48e468adc8939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= <wszqkzqk@qq.com>
Date: Thu, 5 May 2022 11:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A2=AB=E9=AD=85=E6=83=91?=
 =?UTF-8?q?=E5=83=B5=E5=B0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/component/zombie.py | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/source/component/zombie.py b/source/component/zombie.py
index 48d142e..41e5798 100755
--- a/source/component/zombie.py
+++ b/source/component/zombie.py
@@ -148,28 +148,20 @@ class Zombie(pg.sprite.Sprite):
             # 尚未进入水池，或被魅惑的僵尸已经走出水池
             else:
                 if self.swimming:
-                    self.changeFrames(self.swim_frames)
-                    if self.helmet:
-                        if self.helmetHealth <= 0:
-                            self.changeFrames(self.swim_frames)
-                            self.helmet = False
-                        else:
-                            self.changeFrames(self.helmet_walk_frames)
-                    if self.helmetType2:
-                        if self.helmetType2Health <= 0:
-                            self.changeFrames(self.swim_frames)
-                            self.helmetType2 = False
-                        else:
-                            self.changeFrames(self.helmet_walk_frames)
-                else:
-                    if self.helmet:
-                        if self.helmetHealth <= 0:
-                            self.changeFrames(self.swim_frames)
-                            self.helmet = False
-                    if self.helmetType2:
-                        if self.helmetType2Health <= 0:
-                            self.changeFrames(self.swim_frames)
-                            self.helmetType2 = False
+                    self.changeFrames(self.walk_frames)
+                if self.helmet:
+                    if self.helmetHealth <= 0:
+                        self.changeFrames(self.walk_frames)
+                        self.helmet = False
+                    elif self.swimming: # 游泳状态需要改为步行
+                        self.changeFrames(self.helmet_walk_frames)
+                if self.helmetType2:
+                    if self.helmetType2Health <= 0:
+                        self.changeFrames(self.walk_frames)
+                        self.helmetType2 = False
+                    elif self.swimming: # 游泳状态需要改为步行
+                        self.changeFrames(self.helmet_walk_frames)
+                self.swimming = False
         # 不能游泳的一般僵尸
         else:
             if self.helmetHealth <= 0 and self.helmet: