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

Fix: Resolve merge conflict ui/ui.py and ui/assets.py

Browse Source
This commit is contained in:
nEEtdo0d
2021-07-18 10:05:21 -04:00
parent 7f6fcaf508 96e388d7ab
commit 0477870c41
59 changed files with 225 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/retire/retirement.py
View File

@@ -143,8 +143,8 @@ class Retirement(Enhancement):
def retirement_appear(self):
return self.appear(RETIRE_APPEAR_1, offset=30) \
and self.appear(RETIRE_APPEAR_2, offset=30) \
and self.appear(RETIRE_APPEAR_3, offset=30)
and self.appear(RETIRE_APPEAR_2, offset=30) \
and self.appear(RETIRE_APPEAR_3, offset=30)
def _retirement_quit_check_func(self):
return not self.appear(IN_RETIREMENT_CHECK)
@@ -270,6 +270,11 @@ class Retirement(Enhancement):
self.handle_dock_cards_loading()
total = self.retire_ships()
if not total:
logger.warning('No ship retired, trying to reset dock filter and disable favourite, then retire again')
self.dock_filter_set_faster()
self.dock_favourite_set(enable=False)
total = self.retire_ships()
self._retirement_quit()
self.config.DOCK_FULL_TRIGGERED = True