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

Fix: Confirm equipment dissemble but nothing is selected

Browse Source
This commit is contained in:
LmeSzinc
2023-05-07 20:37:04 +08:00
parent 0a0c0ffc20
commit 0f936f89d7
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/storage/storage.py
View File

@@ -233,12 +233,22 @@ class StorageHandler(StorageUI):
return 0
skip_first_screenshot = True
click_count = 0
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if click_count >= 3:
# Probably because no item is selected,
# _storage_disassemble_equipment_execute() will retry selecting
logger.warning('Failed to confirm disassemble after 3 trial')
disassembled = 0
break
if self.appear_then_click(DISASSEMBLE_CONFIRM, offset=(20, 20), interval=5):
click_count += 1
continue
if self.appear_then_click(DISASSEMBLE_POPUP_CONFIRM, offset=(-15, -5, 5, 70), interval=5):
continue
@@ -256,6 +266,7 @@ class StorageHandler(StorageUI):
if success and self.appear(DISASSEMBLE_CANCEL, offset=(20, 20)):
self.wait_until_stable(MATERIAL_STABLE_CHECK)
break
return disassembled
def _storage_disassemble_equipment_execute(self, rarity=1, amount=40):