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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2022-09-03 14:59:36 +08:00
parent 12c68155c5 bb6898266f
commit d8f4986d64
15 changed files with 259 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/retire/retirement.py
View File

@@ -152,7 +152,6 @@ class Retirement(Enhancement):
amount = self._retire_amount
end = False
total = 0
click_count = 0
if self.config.RETIRE_KEEP_COMMON_CV:
self._have_kept_cv = False
@@ -161,6 +160,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
@@ -173,14 +173,16 @@ class Retirement(Enhancement):
logger.info('No more ships to retire.')
end = True
break
# Click
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
# Click
if self.appear_then_click(ONE_CLICK_RETIREMENT, interval=2):
elif self.appear_then_click(ONE_CLICK_RETIREMENT, interval=2):
click_count += 1
continue