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

Fix: Retirement failed to confirm ships after being used by GemsFarming

Browse Source
This commit is contained in:
LmeSzinc
2022-11-09 22:38:10 +08:00
parent e2822b8cde
commit 8c4d6c770f
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/retire/retirement.py
View File

@@ -77,6 +77,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
backup, self._popup_offset = self._popup_offset, (20, 50) backup, self._popup_offset = self._popup_offset, (20, 50)
for button in [SHIP_CONFIRM, SHIP_CONFIRM_2, EQUIP_CONFIRM, EQUIP_CONFIRM_2, GET_ITEMS_1, SR_SSR_CONFIRM]: for button in [SHIP_CONFIRM, SHIP_CONFIRM_2, EQUIP_CONFIRM, EQUIP_CONFIRM_2, GET_ITEMS_1, SR_SSR_CONFIRM]:
self.interval_clear(button) self.interval_clear(button)
timeout = Timer(10, count=10).start()
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -84,9 +85,18 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
self.device.screenshot() self.device.screenshot()
# End # End
if executed and self.appear(IN_RETIREMENT_CHECK): if timeout.reached():
self.handle_info_bar() # Ships being used by GemsFarming have no equipment to disassemble
# So `executed` is never set to True, causing infinite loop
# Handled with dirty timeout, a better fix is required
logger.warning('Wait _retirement_confirm timeout, assume finished')
break break
if self.appear(IN_RETIREMENT_CHECK):
if executed:
self.handle_info_bar()
break
else:
timeout.reset()
# Click # Click
if self.appear(SHIP_CONFIRM, offset=(30, 30), interval=2) \ if self.appear(SHIP_CONFIRM, offset=(30, 30), interval=2) \
@@ -108,7 +118,6 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
if self.appear(GET_ITEMS_1, offset=(30, 30), interval=2): if self.appear(GET_ITEMS_1, offset=(30, 30), interval=2):
self.device.click(GET_ITEMS_1_RETIREMENT_SAVE) self.device.click(GET_ITEMS_1_RETIREMENT_SAVE)
self.interval_reset(SHIP_CONFIRM) self.interval_reset(SHIP_CONFIRM)
executed = True
continue continue
if self._unable_to_enhance \ if self._unable_to_enhance \
or self.config.Retirement_OldRetireSR \ or self.config.Retirement_OldRetireSR \