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

Merge branch 'dev' into dockScanner

Browse Source
This commit is contained in:
Horizon101011
2022-10-10 23:06:27 +08:00
committed by GitHub
parent b2712d81d2 b2a1448b0d
commit 12e04ebaab
224 changed files with 6993 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/retire/dock.py
View File

@@ -146,13 +146,18 @@ class Dock(Equipment):
return current > 0
def dock_select_confirm(self, check_button, skip_first_screenshot=True):
"""
Args:
check_button (callable, Button):
skip_first_screenshot:
"""
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.appear(check_button, offset=(30, 30)):
if self.ui_process_check_button(check_button):
break
if self.appear_then_click(SHIP_CONFIRM, offset=(200, 50), interval=5):

9
module/retire/retirement.py
View File

@@ -371,11 +371,16 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
self.dock_favourite_set(False)
total = self.retire_ships_one_click()
if self.server_support_quick_retire_setting_fallback():
# Some users may have already set filter_5='all', try with it first
if not total:
logger.warning('No ship retired, trying to reset the first 4 quick retire settings')
self.quick_retire_setting_set(filter_5=None)
total = self.retire_ships_one_click()
if not total:
logger.warning('No ship retired, trying to reset quick retire settings to "keep_limit_break"')
self.quick_retire_setting_set('keep_limit_break')
self.quick_retire_setting_set(filter_5='keep_limit_break')
total = self.retire_ships_one_click()
# Not determined
# Not determined, this may cause user loss
# if not total:
# logger.warning('No ship retired, trying to reset quick retire settings to "all"')
# self.quick_retire_setting_set('all')

5
module/retire/setting.py
View File

@@ -29,7 +29,7 @@ class QuickRetireSettingHandler(UI):
offset=(30, 100), retry_wait=3, skip_first_screenshot=True)
@cached_property
def retire_setting(self):
def retire_setting(self) -> QuickRetireSetting:
setting = QuickRetireSetting(name='RETIRE', main=self)
setting.reset_first = False
setting.add_setting(
@@ -76,11 +76,12 @@ class QuickRetireSettingHandler(UI):
Don't Keep
Args:
filter_5 (str): The fifth option in quick retire options.
filter_5 (str, None): The fifth option in quick retire options.
"If you own multiple copies of a ship that has not been fully Limit
Broken, this option determines what you want to do with those copies."
'keep_limit_break' for "Keep Enough to Max LB",
'all' for "Don't Keep"
None for don't change
Pages:
in: IN_RETIREMENT_CHECK, RETIRE_SETTING_ENTER