Merge branch 'master' into app

2026-06-21 12:13:49 +08:00 · 2021-10-14 17:48:12 +08:00
parent 5b1362cdf8 6e2b418ddd
commit 01d49bb752
13 changed files with 18 additions and 2 deletions
--- a/module/combat/combat.py
+++ b/module/combat/combat.py
@@ -395,6 +395,10 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
                continue
            if self.handle_guild_popup_cancel():
                continue
+            if self.handle_vote_popup():
+                continue
+            if self.handle_auto_search_exit():
+                continue

            # End
            if self.handle_in_stage():