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

Fix: EQUIP_CONFIRM_2 may be detected as popup confirm

Browse Source 
causing early stop of _retirement_confirm()
This commit is contained in:
LmeSzinc
2025-05-29 23:05:13 +08:00
parent 9612f84a0f
commit dcc86a8b02
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/retire/retirement.py
View File

@@ -119,11 +119,17 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
or self.config.OldRetire_SSR \ or self.config.OldRetire_SSR \
or self.config.Retirement_RetireMode == 'one_click_retire': or self.config.Retirement_RetireMode == 'one_click_retire':
if self.handle_popup_confirm(name='RETIRE_SR_SSR', offset=(20, 50)): if self.handle_popup_confirm(name='RETIRE_SR_SSR', offset=(20, 50)):
# Avoid clicking the undelying SHIP_CONFIRM again
self.interval_reset([SHIP_CONFIRM, SHIP_CONFIRM_2]) self.interval_reset([SHIP_CONFIRM, SHIP_CONFIRM_2])
# EQUIP_CONFIRM_2 may be detected as popup confirm
self.interval_reset([EQUIP_CONFIRM, EQUIP_CONFIRM_2])
continue continue
if self.config.SERVER in ['cn', 'jp', 'tw'] and \ if self.config.SERVER in ['cn', 'jp', 'tw'] and \
self.appear_then_click(SR_SSR_CONFIRM, offset=(20, 50), interval=2): self.appear_then_click(SR_SSR_CONFIRM, offset=(20, 50), interval=2):
# Avoid clicking the undelying SHIP_CONFIRM again
self.interval_reset([SHIP_CONFIRM, SHIP_CONFIRM_2]) self.interval_reset([SHIP_CONFIRM, SHIP_CONFIRM_2])
# EQUIP_CONFIRM_2 may be detected as popup confirm
self.interval_reset([EQUIP_CONFIRM, EQUIP_CONFIRM_2])
continue continue
if self.match_template_color(SHIP_CONFIRM_2, offset=(30, 30), interval=2): if self.match_template_color(SHIP_CONFIRM_2, offset=(30, 30), interval=2):
if self.retire_keep_common_cv and not self._have_kept_cv: if self.retire_keep_common_cv and not self._have_kept_cv:
@@ -147,6 +153,8 @@ 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)
# equipment confirms are the next to appear
self.interval_clear([EQUIP_CONFIRM, EQUIP_CONFIRM_2])
continue continue
def retirement_appear(self): def retirement_appear(self):