1
0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-07-11 10:20:28 +08:00

Fix: coalition battle ends at BATTLE_STATUS

This commit is contained in:
LmeSzinc
2026-07-08 23:30:19 +08:00
parent 6c28a517c1
commit f16e0b9ead
2 changed files with 13 additions and 0 deletions

View File

@@ -54,6 +54,11 @@ class CoalitionCombat(CoalitionUI, CampaignBase):
self.device.click(BATTLE_STATUS)
click_timer.reset()
def auto_search_combat_end(self):
if self.appear(BATTLE_STATUS, offset=(80, 20)):
return True
return False
def coalition_combat(self):
"""
Pages:

View File

@@ -199,6 +199,12 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
raise CampaignEnd
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):
"""
Args:
@@ -281,6 +287,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
or self.is_auto_search_running():
self.device.screenshot_interval_set()
break
if self.auto_search_combat_end():
break
def auto_search_combat_status(self):
"""