sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 16:19:03 +08:00
Code

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

Browse Source
This commit is contained in:
LmeSzinc 2020-04-25 20:51:15 +08:00
parent 47cec0af36
commit d43ff8a3f7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/combat/combat.py
View File

@ -38,11 +38,6 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
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 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
if self.appear_then_click(MAP_OFFENSIVE, interval=1):
continue
if self.handle_combat_low_emotion():
continue
# Break
if self.combat_appear():

6
module/map/fleet.py
View File

@ -125,6 +125,12 @@ class Fleet(Camera, MapOperation, AmbushHandler):
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()