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

Fix: change check order in _retirement_confirm

Browse Source 
- put handle_popup_confirm after other buttom's checks (#571)
This commit is contained in:
Ray
2021-08-14 13:27:02 +08:00
parent c3683a5cb2
commit d6a4fa4ced
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/retire/retirement.py
View File

@@ -121,12 +121,6 @@ class Retirement(Enhancement):
else: else:
self.device.screenshot() self.device.screenshot()
if self.config.RETIRE_SR or self.config.RETIRE_SSR or self.config.RETIREMENT_METHOD == 'one_click_retire':
if self.handle_popup_confirm('RETIRE_SR_SSR'):
continue
if (self.config.SERVER == 'en' or self.config.SERVER == 'jp') and \
self.appear_then_click(SR_SSR_CONFIRM, offset=self._popup_offset, interval=2):
continue
if self.appear_then_click(SHIP_CONFIRM, offset=(30, 30), interval=2): if self.appear_then_click(SHIP_CONFIRM, offset=(30, 30), interval=2):
continue continue
if self.appear_then_click(SHIP_CONFIRM_2, offset=(30, 30), interval=2): if self.appear_then_click(SHIP_CONFIRM_2, offset=(30, 30), interval=2):
@@ -140,6 +134,12 @@ class Retirement(Enhancement):
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)
continue continue
if self.config.RETIRE_SR or self.config.RETIRE_SSR or self.config.RETIREMENT_METHOD == 'one_click_retire':
if self.handle_popup_confirm('RETIRE_SR_SSR'):
continue
if (self.config.SERVER == 'en' or self.config.SERVER == 'jp') and \
self.appear_then_click(SR_SSR_CONFIRM, offset=self._popup_offset, interval=2):
continue
# End # End
if executed and self.appear(IN_RETIREMENT_CHECK): if executed and self.appear(IN_RETIREMENT_CHECK):