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

Fix: Handle another PAUSE and remove direct use of PAUSE

Browse Source
This commit is contained in:
LmeSzinc
2024-05-09 18:50:32 +08:00
parent 6bd10d1a9d
commit 4e469098e2
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/os/map.py
View File

@@ -539,6 +539,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
def interrupt_auto_search(self, skip_first_screenshot=True):
logger.info('Interrupting auto search')
is_loading = False
pause_interval = Timer(0.5, count=1)
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
@@ -552,14 +553,18 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=3):
continue
if self.appear_then_click(PAUSE, interval=0.5):
if pause_interval.reached() and self.is_combat_executing():
self.device.click(PAUSE)
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue
if self.appear_then_click(QUIT_CONFIRM, offset=(20, 20), interval=5):
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue
if self.appear_then_click(QUIT_RECONFIRM, offset=True, interval=5):
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue
if self.appear_then_click(GOTO_MAIN, offset=(20, 20), interval=3):