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

Refactor: Standardize the use of match_template_color()

Browse Source
This commit is contained in:
LmeSzinc
2024-12-09 16:09:34 +08:00
parent 164db6f4da
commit ba5b853cb9
22 changed files with 79 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/retire/retirement.py
View File

@@ -110,12 +110,9 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
timeout.reset()
# Click
if self.appear(SHIP_CONFIRM, offset=(30, 30), interval=2):
if SHIP_CONFIRM.match_appear_on(self.device.image):
self.device.click(SHIP_CONFIRM)
continue
else:
self.interval_clear(SHIP_CONFIRM)
if self.match_template_color(SHIP_CONFIRM, offset=(30, 30), interval=2):
self.device.click(SHIP_CONFIRM)
continue
if self.appear(SHIP_CONFIRM_2, offset=(30, 30), interval=2):
if self.retire_keep_common_cv and not self._have_kept_cv:
self.keep_one_common_cv()
@@ -259,7 +256,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
if selected == 0:
break
self.device.screenshot()
if not (self.appear(SHIP_CONFIRM, offset=(30, 30)) and SHIP_CONFIRM.match_appear_on(self.device.image)):
if not self.match_template_color(SHIP_CONFIRM, offset=(30, 30)):
logger.warning('No ship selected, retrying')
continue