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: equipment disassemble should endswith EQUIP_CONFIRM_2 clicked

Browse Source
This commit is contained in:
LmeSzinc 2025-05-23 15:37:06 +08:00
parent ad5de4e2ed
commit a42235e3ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/storage/storage.py
View File

@ -132,7 +132,7 @@ class StorageHandler(StorageUI):
for _ in self.loop():
# End
if success and self._storage_in_material():
if success and self._storage_in_material() and not self.appear(EQUIP_CONFIRM_2, offset=(20, 20)):
break
# use
@ -146,13 +146,11 @@ class StorageHandler(StorageUI):
logger.info(f'{GET_ITEMS_1} -> {MATERIAL_ENTER}')
self.device.click(MATERIAL_ENTER)
self.interval_reset(MATERIAL_CHECK)
success = True
continue
if self.appear(GET_ITEMS_2, offset=(5, 5), interval=5):
logger.info(f'{GET_ITEMS_2} -> {MATERIAL_ENTER}')
self.device.click(MATERIAL_ENTER)
self.interval_reset(MATERIAL_CHECK)
success = True
continue
# use match_template_color on BOX_AMOUNT_CONFIRM
# a long animation that opens a box, will be on the top of BOX_AMOUNT_CONFIRM
@ -169,6 +167,9 @@ class StorageHandler(StorageUI):
# GET_ITEMS_* don't appear that fast
self.interval_reset(MATERIAL_CHECK)
self.interval_clear([GET_ITEMS_1, GET_ITEMS_2])
# EQUIP_CONFIRM_2 -> GET_ITEMS -> _storage_in_material
# mark EQUIP_CONFIRM_2 as the last
success = True
continue
# Storage full