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

Merge branch 'master' into app

Browse Source 
# Conflicts:
#	module/combat/auto_search_combat.py
This commit is contained in:
LmeSzinc
2021-10-14 20:49:04 +08:00
parent 15d1aae6b3 e3b9761043
commit a70bef7efa
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/combat/auto_search_combat.py
View File

@@ -79,6 +79,8 @@ class AutoSearchCombat(MapOperation, Combat):
continue continue
if self.handle_map_cat_attack(): if self.handle_map_cat_attack():
continue continue
if self.handle_vote_popup():
continue
# End # End
if self.is_combat_loading(): if self.is_combat_loading():
@@ -103,6 +105,8 @@ class AutoSearchCombat(MapOperation, Combat):
if self.handle_combat_automation_confirm(): if self.handle_combat_automation_confirm():
continue continue
if self.handle_vote_popup():
continue
# End # End
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing(): if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
@@ -132,6 +136,8 @@ class AutoSearchCombat(MapOperation, Combat):
continue continue
if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_EXECUTE'): if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_EXECUTE'):
continue continue
if self.handle_vote_popup():
continue
# End # End
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing(): if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():