Merge branch 'master' into app

# Conflicts: # module/combat/auto_search_combat.py
2026-03-11 23:18:22 +08:00 · 2021-09-20 18:02:52 +08:00
parent 4fd1147a40 fb33dfb884
commit 9f47fb9bc2
2 changed files with 4 additions and 0 deletions
--- a/module/combat/combat.py
+++ b/module/combat/combat.py
@@ -231,6 +231,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
            else:
                if self.handle_submarine_call():
                    continue
+            if self.handle_popup_confirm('COMBAT_EXECUTE'):
+                continue

            # End
            if self.handle_battle_status(drop=drop) \