sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-24 06:45:57 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
sui-feng-cb
2025-05-30 09:58:56 +08:00
parent 8665c3969a 91ee055386
commit f6fa5683d3
9 changed files with 200 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/retire/retirement.py
View File

@@ -146,11 +146,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:
@@ -174,6 +180,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):
@@ -410,6 +418,9 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
Returns:
bool: If retired.
"""
# 2025.05.29 game tips that infos skin feature when you enter dock
if self.handle_game_tips():
return True
if self._unable_to_enhance:
if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3):
self.interval_clear(IN_RETIREMENT_CHECK)