sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 09:17:22 +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-09-20 18:02:52 +08:00
parent 4fd1147a40 fb33dfb884
commit 9f47fb9bc2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/combat/auto_search_combat.py
View File

@@ -130,6 +130,8 @@ class AutoSearchCombat(MapOperation, Combat):
if auto != 'combat_auto' and self.auto_mode_checked and self.is_combat_executing(): if auto != 'combat_auto' and self.auto_mode_checked and self.is_combat_executing():
if self.handle_combat_weapon_release(): if self.handle_combat_weapon_release():
continue continue
if self.handle_popup_confirm('AUTO_SEARCH_COMBAT_EXECUTE'):
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():

2
module/combat/combat.py
View File

@@ -231,6 +231,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
else: else:
if self.handle_submarine_call(): if self.handle_submarine_call():
continue continue
if self.handle_popup_confirm('COMBAT_EXECUTE'):
continue
# End # End
if self.handle_battle_status(drop=drop) \ if self.handle_battle_status(drop=drop) \