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

Fix: Add retry interval in handle_retirement() (#1005)

Browse Source 
To avoid retiring again after exiting from retire page
This commit is contained in:
LmeSzinc
2022-04-14 00:19:27 +08:00
parent d2f56c5af8
commit dda16cf16a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/retire/retirement.py
View File

@@ -250,27 +250,33 @@ class Retirement(Enhancement):
if self._unable_to_enhance: if self._unable_to_enhance:
if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3): if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3):
self.interval_clear(IN_RETIREMENT_CHECK)
return False return False
if self.appear(IN_RETIREMENT_CHECK, offset=(20, 20)): if self.appear(IN_RETIREMENT_CHECK, offset=(20, 20), interval=10):
self._retire_handler(mode='one_click_retire') self._retire_handler(mode='one_click_retire')
self._unable_to_enhance = False self._unable_to_enhance = False
self.interval_reset(IN_RETIREMENT_CHECK)
return True return True
elif self.config.Retirement_RetireMode == 'enhance': elif self.config.Retirement_RetireMode == 'enhance':
if self.appear_then_click(RETIRE_APPEAR_3, offset=(20, 20), interval=3): if self.appear_then_click(RETIRE_APPEAR_3, offset=(20, 20), interval=3):
self.interval_clear(DOCK_CHECK)
return False return False
if self.appear(DOCK_CHECK, offset=(20, 20)): if self.appear(DOCK_CHECK, offset=(20, 20), interval=10):
self.handle_dock_cards_loading() self.handle_dock_cards_loading()
total = self._enhance_handler() total = self._enhance_handler()
if not total: if not total:
logger.info('No ship to enhance, but dock full, will try retire') logger.info('No ship to enhance, but dock full, will try retire')
self._unable_to_enhance = True self._unable_to_enhance = True
self.interval_reset(DOCK_CHECK)
return True return True
else: else:
if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3): if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3):
self.interval_clear(IN_RETIREMENT_CHECK)
return False return False
if self.appear(IN_RETIREMENT_CHECK, offset=(20, 20)): if self.appear(IN_RETIREMENT_CHECK, offset=(20, 20), interval=10):
self._retire_handler() self._retire_handler()
self._unable_to_enhance = False self._unable_to_enhance = False
self.interval_reset(IN_RETIREMENT_CHECK)
return True return True
return False return False