sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-17 01:45:25 +08:00
Code Activity

Merge branch 'master' into app

Browse Source 
# Conflicts:
#	module/config/event.py
This commit is contained in:
LmeSzinc
2021-10-11 12:58:52 +08:00
parent c68f9c1ccd 63a8821112
commit 85101590b7
18 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/exercise/combat.py
View File

@@ -95,8 +95,10 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
continue
# End
if end and self._in_exercise() or self.appear(BATTLE_PREPARATION):
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