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

Fix: Retry interval in OS storage and map_exit

Browse Source
This commit is contained in:
LmeSzinc
2021-08-25 01:27:34 +08:00
parent b510203942
commit 625602d028
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/os/map_operation.py
View File

@@ -120,8 +120,10 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
if self.appear_then_click(MAP_EXIT, offset=(20, 20), interval=5): if self.appear_then_click(MAP_EXIT, offset=(20, 20), interval=5):
continue continue
if self.handle_popup_confirm('MAP_EXIT'): if self.handle_popup_confirm('MAP_EXIT'):
self.interval_reset(MAP_EXIT)
continue continue
if self.handle_map_event(): if self.handle_map_event():
self.interval_reset(MAP_EXIT)
changed = True changed = True
continue continue

18
module/os_handler/storage.py
View File

@@ -51,15 +51,18 @@ class StorageHandler(GlobeOperation, ZoneManager):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear(STORAGE_CHECK, offset=(20, 20), interval=3): if self.appear(STORAGE_CHECK, offset=(20, 20), interval=5):
self.device.click(button) self.device.click(button)
continue continue
if self.appear_then_click(STORAGE_USE, offset=(180, 30), interval=3): if self.appear_then_click(STORAGE_USE, offset=(180, 30), interval=5):
self.interval_reset(STORAGE_CHECK)
continue continue
if self.appear_then_click(GET_ITEMS_1, interval=3): if self.appear_then_click(GET_ITEMS_1, interval=5):
self.interval_reset(STORAGE_CHECK)
success = True success = True
continue continue
if self.appear_then_click(GET_ITEMS_2, interval=3): if self.appear_then_click(GET_ITEMS_2, interval=5):
self.interval_reset(STORAGE_CHECK)
success = True success = True
continue continue
@@ -113,10 +116,13 @@ class StorageHandler(GlobeOperation, ZoneManager):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear(STORAGE_CHECK, offset=(30, 30), interval=3): if self.appear(STORAGE_CHECK, offset=(30, 30), interval=5):
self.device.click(button) self.device.click(button)
if self.appear_then_click(STORAGE_COORDINATE_CHECKOUT, offset=(30, 30), interval=3): if self.appear_then_click(STORAGE_COORDINATE_CHECKOUT, offset=(30, 30), interval=5):
self.interval_reset(STORAGE_CHECK)
continue continue
# End
if self.is_zone_pinned(): if self.is_zone_pinned():
break break