From dcc86a8b029b733853ffee8e23519ac5f90eadb2 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 29 May 2025 23:05:13 +0800 Subject: [PATCH] Fix: EQUIP_CONFIRM_2 may be detected as popup confirm causing early stop of _retirement_confirm() --- module/retire/retirement.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/module/retire/retirement.py b/module/retire/retirement.py index 406f74d70..19e08df25 100644 --- a/module/retire/retirement.py +++ b/module/retire/retirement.py @@ -119,11 +119,17 @@ class Retirement(Enhancement, QuickRetireSettingHandler): or self.config.OldRetire_SSR \ or self.config.Retirement_RetireMode == 'one_click_retire': 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]) + # EQUIP_CONFIRM_2 may be detected as popup confirm + self.interval_reset([EQUIP_CONFIRM, EQUIP_CONFIRM_2]) continue if self.config.SERVER in ['cn', 'jp', 'tw'] and \ 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]) + # EQUIP_CONFIRM_2 may be detected as popup confirm + self.interval_reset([EQUIP_CONFIRM, EQUIP_CONFIRM_2]) continue 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: @@ -147,6 +153,8 @@ class Retirement(Enhancement, QuickRetireSettingHandler): if self.appear(GET_ITEMS_1, offset=(30, 30), interval=2): self.device.click(GET_ITEMS_1_RETIREMENT_SAVE) self.interval_reset(SHIP_CONFIRM) + # equipment confirms are the next to appear + self.interval_clear([EQUIP_CONFIRM, EQUIP_CONFIRM_2]) continue def retirement_appear(self):