sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: Sync bunch of popup handlers to all combat

Browse Source
This commit is contained in:
LmeSzinc 2025-05-15 15:42:54 +08:00
parent 191bfe6568
commit 1d617abb20
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/combat/auto_search_combat.py
View File

@ -268,12 +268,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():
@ -316,11 +323,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 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():
continue
if self.handle_story_skip():

13
module/combat/combat.py
View File

@ -325,8 +325,17 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
continue
if self.handle_submarine_call(submarine):
continue
# bunch of popup handlers
if self.handle_popup_confirm('COMBAT_EXECUTE'):
continue
if self.handle_urgent_commission():
continue
if self.handle_guild_popup_cancel():
continue
if self.handle_vote_popup():
continue
if self.handle_mission_popup_ack():
continue
# End
if self.handle_battle_status(drop=drop) \
@ -532,6 +541,9 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
if not exp_info and self.handle_battle_status(drop=drop):
battle_status = True
continue
# bunch of popup handlers
if self.handle_popup_confirm('COMBAT_STATUS'):
continue
if self.handle_urgent_commission(drop=drop):
continue
if self.handle_guild_popup_cancel():
@ -540,6 +552,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
continue
if self.handle_mission_popup_ack():
continue
# additional handlers in combat
if self.handle_auto_search_exit(drop=drop):
continue
if self.handle_combat_mis_click():

12
module/exercise/combat.py
View File

@ -115,6 +115,18 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
show_hp_timer.reset()
self._show_hp()
# bunch of popup handlers
if self.handle_popup_confirm('EXERCISE_COMBAT_EXECUTE'):
continue
if self.handle_urgent_commission():
continue
if self.handle_guild_popup_cancel():
continue
if self.handle_vote_popup():
continue
if self.handle_mission_popup_ack():
continue
return success
def _choose_opponent(self, index, skip_first_screenshot=True):