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

Fix: Handle unexpected META ui switching

Browse Source 
Refactor expected_end in meta combat
This commit is contained in:
LmeSzinc
2022-10-23 23:48:59 +08:00
parent df7a13a39b
commit f49e4c291f
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/os_ash/ash.py
View File

@@ -62,20 +62,13 @@ class AshCombat(Combat):
if self.appear(BEACON_EMPTY, offset=(20, 20)):
logger.info("Ash beacon already empty.")
raise AshBeaconFinished
if self.appear(ASH_SHOWDOWN, offset=(20, 20)):
logger.info("Ash beacon already at ASH_SHOWDOWN.")
raise AshBeaconFinished
return False
def combat(self, *args, expected_end=None, **kwargs):
end = expected_end
if end is not None and callable(end):
def expected_end():
if end():
logger.info('Meta combat finished and in correct page.')
return True
if self.appear(BATTLE_PREPARATION, offset=(30, 30), interval=2):
logger.info('Wrong click into battle preparation page')
self.device.click(BACK_ARROW)
return False
try:
super().combat(*args, expected_end=expected_end, **kwargs)
except AshBeaconFinished: