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

Fix: Handle fleet died without auto search reward

Browse Source
This commit is contained in:
LmeSzinc 2022-01-08 22:17:24 +08:00
parent 1ed8ce0a19
commit f8eeb44057
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
module/os/map.py
View File

@ -158,6 +158,7 @@ class OSMap(OSFleet, Map, GlobeCamera):
self.ash_popup_canceled = False
success = True
died_timer = Timer(1.5, count=3)
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
@ -171,6 +172,14 @@ class OSMap(OSFleet, Map, GlobeCamera):
raise RequestHumanTakeover
if self.is_in_map():
self.device.stuck_record_clear()
if not success:
if died_timer.reached():
logger.warning('Fleet died confirm')
break
else:
died_timer.reset()
else:
died_timer.reset()
if self.handle_os_auto_search_map_option(enable=success):
unlock_checked = True
continue

6
module/os/operation_siren.py
View File

@ -533,10 +533,10 @@ class OperationSiren(Reward, OSMap):
if __name__ == '__main__':
self = OperationSiren('alas', task='OpsiObscure')
self = OperationSiren('alas', task='OpsiStronghold')
from module.os.config import OSConfig
self.config = self.config.merge(OSConfig())
self.device.screenshot()
self.os_init()
self.clear_stronghold()
self.zone_init()
self.run_stronghold()