Fix: 修复退役后出现行走超时的问题

LmeSzinc · Apr 25, 2020 · d43ff8a · d43ff8a
1 parent 47cec0a
commit d43ff8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/module/combat/combat.py b/module/combat/combat.py
@@ -38,11 +38,6 @@ def combat_appear(self):
         if self.config.ENABLE_MAP_FLEET_LOCK and not self.is_in_map():
             if self.is_combat_loading():
                 return True
-            if self.handle_retirement():
-                self.map_offensive()
-                return False
-            if self.handle_combat_low_emotion():
-                return False
 
         if self.appear(BATTLE_PREPARATION):
             return True
@@ -57,6 +52,8 @@ def map_offensive(self):
 
             if self.appear_then_click(MAP_OFFENSIVE, interval=1):
                 continue
+            if self.handle_combat_low_emotion():
+                continue
 
             # Break
             if self.combat_appear():

diff --git a/module/map/fleet.py b/module/map/fleet.py
@@ -125,6 +125,12 @@ def _goto(self, location, expected=''):
                     result_mystery = mystery
 
                 # Combat
+                if self.config.ENABLE_MAP_FLEET_LOCK and not self.is_in_map():
+                    if self.handle_retirement():
+                        self.map_offensive()
+                        walk_timeout.reset()
+                    if self.handle_combat_low_emotion():
+                        walk_timeout.reset()
                 if self.combat_appear():
                     self.combat(expected_end=self._expected_combat_end(expected), fleet_index=self.fleet_current_index)
                     self.hp_get()