mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-07-13 10:58:02 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -307,6 +307,12 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
|
||||
self.config.Scheduler_Enable = False
|
||||
self.config.task_stop()
|
||||
|
||||
def auto_search_combat_end(self):
|
||||
"""
|
||||
A custom combat end that used in coalition
|
||||
"""
|
||||
return False
|
||||
|
||||
def auto_search_combat_execute(self, emotion_reduce, fleet_index, battle=None, expected_end=None):
|
||||
"""
|
||||
Args:
|
||||
@@ -414,6 +420,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
|
||||
if expected_end():
|
||||
self.device.screenshot_interval_set()
|
||||
break
|
||||
if self.auto_search_combat_end():
|
||||
break
|
||||
|
||||
def auto_search_combat_status(self, emotion_reduce, fleet_index):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user