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

Fix: Actively clear stuck records in combat

Browse Source
This commit is contained in:
LmeSzinc
2023-10-14 21:01:11 +08:00
parent e8b96eb55b
commit f23c960b97
7 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/combat/auto_search_combat.py
View File

@@ -217,6 +217,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
out: combat status
"""
logger.info('Auto search combat loading')
self.device.stuck_record_clear()
self.device.click_record_clear()
self.device.screenshot_interval_set('combat')
while 1:
self.device.screenshot()
@@ -241,6 +243,7 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
submarine_mode = self.config.Submarine_Mode
self.combat_auto_reset()
self.combat_manual_reset()
self.device.stuck_record_clear()
self.device.click_record_clear()
if emotion_reduce:
self.emotion.reduce(fleet_index)
@@ -286,6 +289,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
out: is_auto_search_running()
"""
logger.info('Auto Search combat status')
self.device.stuck_record_clear()
self.device.click_record_clear()
exp_info = False # This is for the white screen bug in game
while 1:
@@ -344,7 +349,6 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
"""
emotion_reduce = emotion_reduce if emotion_reduce is not None else self.emotion.is_calculate
self.device.stuck_record_clear()
self.auto_search_combat_execute(emotion_reduce=emotion_reduce, fleet_index=fleet_index)
self.auto_search_combat_status()

5
module/combat/combat.py
View File

@@ -99,6 +99,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
fleet_index (int):
"""
logger.info('Combat preparation.')
self.device.stuck_record_clear()
self.device.click_record_clear()
skip_first_screenshot = True
interval_set = False
@@ -225,6 +227,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
self.submarine_call_reset()
self.combat_auto_reset()
self.combat_manual_reset()
self.device.stuck_record_clear()
self.device.click_record_clear()
confirm_timer = Timer(10)
confirm_timer.start()
@@ -401,6 +404,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
"""
logger.info('Combat status')
logger.attr('expected_end', expected_end.__name__ if callable(expected_end) else expected_end)
self.device.stuck_record_clear()
self.device.click_record_clear()
battle_status = False
exp_info = False # This is for the white screen bug in game
while 1: