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

Fix: Check exercise combat end before handlers

Browse Source
This commit is contained in:
LmeSzinc
2025-04-07 01:01:46 +08:00
parent 6462e68a16
commit ff425a4ebe
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/exercise/combat.py
View File

@@ -53,6 +53,13 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
while 1: while 1:
self.device.screenshot() self.device.screenshot()
# End
if self._in_exercise() or self.appear(BATTLE_PREPARATION, offset=(20, 20)):
logger.hr('Combat end')
if not end:
logger.warning('Combat ended without end conditions detected')
break
p = self.is_combat_executing() p = self.is_combat_executing()
if p: if p:
if end: if end:
@@ -108,13 +115,6 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
show_hp_timer.reset() show_hp_timer.reset()
self._show_hp() self._show_hp()
# End
if self._in_exercise() or self.appear(BATTLE_PREPARATION, offset=(20, 20)):
logger.hr('Combat end')
if not end:
logger.warning('Combat ended without end conditions detected')
break
return success return success
def _choose_opponent(self, index, skip_first_screenshot=True): def _choose_opponent(self, index, skip_first_screenshot=True):