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

Fix: Wait disappearing scroll in retirement_get_common_rarity_cv()

Browse Source
This commit is contained in:
LmeSzinc
2024-12-09 23:25:45 +08:00
parent 97f8367a00
commit 26943697cb
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
module/retire/retirement.py
View File

@@ -451,6 +451,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
""" """
count = 0 count = 0
RETIRE_COIN.load_color(self.device.image) RETIRE_COIN.load_color(self.device.image)
RETIRE_COIN._match_init = True
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
@@ -459,7 +460,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
self.device.screenshot() self.device.screenshot()
# End # End
if not self.appear(RETIRE_COIN, similarity=0.97): if not RETIRE_COIN.match(self.device.image, offset=(20, 20), similarity=0.97):
return True return True
if count > 3: if count > 3:
logger.warning('_retire_select_one failed after 3 trial') logger.warning('_retire_select_one failed after 3 trial')
@@ -501,25 +502,56 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
return None return None
def retirement_get_common_rarity_cv(self, skip_first_screenshot=False): def retirement_get_common_rarity_cv(self, skip_first_screenshot=False):
button = self.retirement_get_common_rarity_cv_in_page() """
if button is not None: Args:
return button skip_first_screenshot:
for _ in range(7): Returns:
if not RETIRE_CONFIRM_SCROLL.appear(main=self): Button: Button to click to remove ship from retire list
logger.info('Scroll bar disappeared, stop') """
break swipe_count = 0
RETIRE_CONFIRM_SCROLL.next_page(main=self) disappear_confirm = Timer(2, count=6)
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
# Try to get CV
button = self.retirement_get_common_rarity_cv_in_page() button = self.retirement_get_common_rarity_cv_in_page()
if button is not None: if button is not None:
return button return button
# Wait scroll bar
if RETIRE_CONFIRM_SCROLL.appear(main=self):
disappear_confirm.clear()
else:
disappear_confirm.start()
if disappear_confirm.reached():
logger.warning('Scroll bar disappeared, stop')
break
else:
continue
if RETIRE_CONFIRM_SCROLL.at_bottom(main=self): if RETIRE_CONFIRM_SCROLL.at_bottom(main=self):
logger.info('Scroll bar reached end, stop') logger.info('Scroll bar reached end, stop')
break break
# Swipe next page
if swipe_count >= 7:
logger.info('Reached maximum swipes to find common CV')
break
RETIRE_CONFIRM_SCROLL.next_page(main=self)
swipe_count += 1
return button return button
def keep_one_common_cv(self): def keep_one_common_cv(self):
"""
Returns:
"""
logger.info('Keep one common CV')
button = self.retirement_get_common_rarity_cv() button = self.retirement_get_common_rarity_cv()
if button is not None: if button is not None:
self._retire_select_one(button) self._retire_select_one(button)