Merge branch 'master' into app

2026-03-19 06:03:34 +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/auto_search_combat.py
+++ b/module/combat/auto_search_combat.py
@@ -188,6 +188,8 @@ class AutoSearchCombat(MapOperation, Combat):
                    continue
                if self.handle_guild_popup_cancel():
                    continue
+                if self.handle_vote_popup():
+                    continue

            # End
            if self.is_auto_search_running():