1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 15:19:29 +08:00

Merge branch 'master_lme'

# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
This commit is contained in:
Zuosizhu
2023-07-15 20:24:33 +08:00
123 changed files with 630 additions and 288 deletions

View File

@@ -61,6 +61,7 @@ class StorageHandler(GlobeOperation, ZoneManager):
out: STORAGE_CHECK
"""
success = False
get_mission_counter = 0
self.interval_clear(STORAGE_CHECK)
self.interval_clear(STORAGE_USE)
self.interval_clear(GET_ITEMS_1)
@@ -79,6 +80,10 @@ class StorageHandler(GlobeOperation, ZoneManager):
logger.info(f'_storage_item_use item info -> {GET_MISSION}')
self.device.click(GET_MISSION)
self.interval_reset(STORAGE_CHECK)
get_mission_counter += 1
if get_mission_counter >= 3:
logger.warning('Possibly stuck on energy storage device, redetecting logger items.')
break
continue
# Item rewards
if self.appear_then_click(STORAGE_USE, offset=(180, 30), interval=5):