sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 20:58:19 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
sui-feng-cb
2025-05-18 16:29:37 +08:00
parent b77f906dc3 b6dc151320
commit 090128c26b
15 changed files with 133 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/combat/auto_search_combat.py
View File

@@ -273,12 +273,19 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
if auto != 'combat_auto' and self.auto_mode_checked and self.is_combat_executing():
if self.handle_combat_weapon_release():
continue
# bunch of popup handlers
if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_EXECUTE'):
continue
if self.handle_urgent_commission():
continue
if self.handle_story_skip():
continue
if self.handle_guild_popup_cancel():
continue
if self.handle_vote_popup():
continue
if self.handle_mission_popup_ack():
continue
# End
if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
@@ -342,11 +349,12 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
# Combat status
if self.handle_get_ship():
continue
if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_STATUS'):
continue
if not self._withdraw and self.handle_auto_search_map_option():
self._auto_search_status_confirm = False
continue
# bunch of popup handlers
if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_STATUS'):
continue
if self.handle_urgent_commission():
get_urgent_commission = True
continue