mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 15:36:59 +08:00
Merge branch 'master' into app
# Conflicts: # module/combat/auto_search_combat.py
This commit is contained in:
@@ -79,6 +79,8 @@ class AutoSearchCombat(MapOperation, Combat):
|
||||
continue
|
||||
if self.handle_map_cat_attack():
|
||||
continue
|
||||
if self.handle_vote_popup():
|
||||
continue
|
||||
|
||||
# End
|
||||
if self.is_combat_loading():
|
||||
@@ -103,6 +105,8 @@ class AutoSearchCombat(MapOperation, Combat):
|
||||
|
||||
if self.handle_combat_automation_confirm():
|
||||
continue
|
||||
if self.handle_vote_popup():
|
||||
continue
|
||||
|
||||
# End
|
||||
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
|
||||
@@ -132,6 +136,8 @@ class AutoSearchCombat(MapOperation, Combat):
|
||||
continue
|
||||
if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_EXECUTE'):
|
||||
continue
|
||||
if self.handle_vote_popup():
|
||||
continue
|
||||
|
||||
# End
|
||||
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
|
||||
|
||||
Reference in New Issue
Block a user