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

Fix: Reset DOCK_CHECK interval after select_suitable_ship()

Browse Source
This commit is contained in:
LmeSzinc
2025-04-07 00:45:25 +08:00
parent 7a782138b6
commit 6462e68a16
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/tactical/tactical_class.py
View File

@@ -422,11 +422,11 @@ class RewardTacticalClass(Dock):
# Tactical page, has empty position # Tactical page, has empty position
if self.appear_then_click(ADD_NEW_STUDENT, offset=(800, 20), interval=1): if self.appear_then_click(ADD_NEW_STUDENT, offset=(800, 20), interval=1):
self.interval_reset([TACTICAL_CHECK, RAPID_TRAINING]) self.interval_reset([TACTICAL_CHECK, RAPID_TRAINING])
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION]) self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION, DOCK_CHECK, SKILL_CONFIRM])
continue continue
if self.handle_rapid_training(): if self.handle_rapid_training():
self.interval_reset(TACTICAL_CHECK) self.interval_reset(TACTICAL_CHECK)
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION]) self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION, DOCK_CHECK, SKILL_CONFIRM])
continue continue
# Get finish time # Get finish time
@@ -496,6 +496,7 @@ class RewardTacticalClass(Dock):
# so we need click BACK_ARROW to clear selected state # so we need click BACK_ARROW to clear selected state
logger.info('Having pre-selected ship in dock, re-enter') logger.info('Having pre-selected ship in dock, re-enter')
self.device.click(BACK_ARROW) self.device.click(BACK_ARROW)
self.interval_reset([BOOK_EMPTY_POPUP, DOCK_CHECK], interval=3)
continue continue
# If not enable or can not fina a suitable ship # If not enable or can not fina a suitable ship
if self.config.AddNewStudent_Enable: if self.config.AddNewStudent_Enable:
@@ -508,7 +509,7 @@ class RewardTacticalClass(Dock):
logger.info('Not going to learn skill but in dock, close it') logger.info('Not going to learn skill but in dock, close it')
study_finished = True study_finished = True
self.device.click(BACK_ARROW) self.device.click(BACK_ARROW)
self.interval_reset([BOOK_EMPTY_POPUP]) self.interval_reset([BOOK_EMPTY_POPUP, DOCK_CHECK], interval=3)
continue continue
if self.appear(SKILL_CONFIRM, offset=(20, 20), interval=3): if self.appear(SKILL_CONFIRM, offset=(20, 20), interval=3):
# If not enable or can not find a skill # If not enable or can not find a skill
@@ -522,7 +523,7 @@ class RewardTacticalClass(Dock):
logger.info('Not going to learn skill but having SKILL_CONFIRM, close it') logger.info('Not going to learn skill but having SKILL_CONFIRM, close it')
study_finished = True study_finished = True
self.device.click(BACK_ARROW) self.device.click(BACK_ARROW)
self.interval_reset([BOOK_EMPTY_POPUP]) self.interval_reset([BOOK_EMPTY_POPUP, SKILL_CONFIRM], interval=3)
continue continue
if self.appear(TACTICAL_META, offset=(200, 20), interval=3): if self.appear(TACTICAL_META, offset=(200, 20), interval=3):
# If meta's skill page, it's inappropriate # If meta's skill page, it's inappropriate