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

Fix: Detect auto search menu in every steps of auto search

Browse Source 
- Fix: Increase timer in mission submit
This commit is contained in:
LmeSzinc
2021-05-04 14:54:45 +08:00
parent 98d1085f67
commit ae570058bd
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/combat/auto_search_combat.py
View File

@@ -78,9 +78,7 @@ class AutoSearchCombat(Combat):
# End
if self.is_combat_loading():
break
if self.is_in_auto_search_menu():
raise CampaignEnd
if self._handle_auto_search_menu_missing():
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
raise CampaignEnd
def auto_search_combat_execute(self, emotion_reduce, fleet_index):
@@ -101,6 +99,9 @@ class AutoSearchCombat(Combat):
if self.handle_combat_automation_confirm():
continue
# End
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
raise CampaignEnd
if self.is_combat_executing():
break
@@ -116,6 +117,9 @@ class AutoSearchCombat(Combat):
continue
# End
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
self.device.screenshot_interval_set(0)
raise CampaignEnd
if self.is_combat_executing():
continue
if self.appear(BATTLE_STATUS_S) or self.appear(BATTLE_STATUS_A) or self.appear(BATTLE_STATUS_B) \
@@ -143,9 +147,7 @@ class AutoSearchCombat(Combat):
# End
if self.is_auto_search_running():
break
if self.is_in_auto_search_menu():
raise CampaignEnd
if self._handle_auto_search_menu_missing():
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
raise CampaignEnd
def auto_search_combat(self, emotion_reduce=None, fleet_index=1):