mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-18 01:01:29 +08:00
Merge branch 'dev' into dockScanner
This commit is contained in:
@@ -8,6 +8,7 @@ from module.logger import logger
|
||||
from module.retire.assets import *
|
||||
from module.retire.dock import DockScanner
|
||||
from module.retire.enhancement import Enhancement
|
||||
from module.retire.setting import QuickRetireSettingHandler
|
||||
|
||||
CARD_GRIDS = ButtonGrid(
|
||||
origin=(93, 76), delta=(164 + 2 / 3, 227), button_shape=(138, 204), grid_shape=(7, 2), name='CARD')
|
||||
@@ -23,7 +24,7 @@ CARD_RARITY_COLORS = {
|
||||
}
|
||||
|
||||
|
||||
class Retirement(Enhancement):
|
||||
class Retirement(Enhancement, QuickRetireSettingHandler):
|
||||
_unable_to_enhance = False
|
||||
_have_kept_cv = True
|
||||
|
||||
@@ -162,6 +163,7 @@ class Retirement(Enhancement):
|
||||
self.handle_info_bar()
|
||||
|
||||
skip_first_screenshot = True
|
||||
click_count = 0
|
||||
while 1:
|
||||
if skip_first_screenshot:
|
||||
skip_first_screenshot = False
|
||||
@@ -174,8 +176,17 @@ class Retirement(Enhancement):
|
||||
logger.info('No more ships to retire.')
|
||||
end = True
|
||||
break
|
||||
|
||||
# Click
|
||||
if self.appear_then_click(ONE_CLICK_RETIREMENT, interval=2):
|
||||
if click_count >= 3:
|
||||
logger.warning('Failed to select ships using ONE_CLICK_RETIREMENT after 3 trial, '
|
||||
'probably because game bugged, a re-enter should fix it')
|
||||
# Mark as retire finished, higher level will call retires
|
||||
end = True
|
||||
total = 10
|
||||
break
|
||||
elif self.appear_then_click(ONE_CLICK_RETIREMENT, interval=2):
|
||||
click_count += 1
|
||||
continue
|
||||
|
||||
if end:
|
||||
@@ -362,9 +373,22 @@ class Retirement(Enhancement):
|
||||
if gems_farming_enable and self.config.GemsFarming_FlagshipChange:
|
||||
total += self.retire_gems_farming_flagships()
|
||||
flagships_retired = True
|
||||
if self.server_support_quick_retire_setting_fallback():
|
||||
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')
|
||||
total = self.retire_ships_one_click()
|
||||
# Not determined
|
||||
# if not total:
|
||||
# logger.warning('No ship retired, trying to reset quick retire settings to "all"')
|
||||
# self.quick_retire_setting_set('all')
|
||||
# total = self.retire_ships_one_click()
|
||||
if gems_farming_enable and self.config.GemsFarming_FlagshipChange:
|
||||
total += self.retire_gems_farming_flagships()
|
||||
flagships_retired = True
|
||||
if not total:
|
||||
logger.critical('No ship retired')
|
||||
logger.critical('Please configure your one-click-retire in game, '
|
||||
logger.critical('Please configure your "Quick Retire Options" in game, '
|
||||
'make sure it can select ships to retire')
|
||||
raise RequestHumanTakeover
|
||||
elif mode == 'old_retire':
|
||||
|
||||
Reference in New Issue
Block a user