优化 CombatCheck 和 AutoMoveTask

Author: BnanZ0

src/combat/CombatCheck.py

@@ -10,6 +10,7 @@ def __init__(self, *args, **kwargs):
         self.last_combat_check = 0
         self.combat_check_interval = 0.5
         self.out_of_combat_reason = ""
+        self.manual_in_combat = False
 
     def in_combat(self):
         """检查当前是否处于战斗状态。
@@ -20,7 +21,7 @@ def in_combat(self):
         if self._in_combat:
             now = time.time()
             if now - self.last_combat_check > self.combat_check_interval:
-                in_combat = getattr(self, "manual_in_combat", False)
+                in_combat = self.manual_in_combat and self.in_team()
                 self.last_combat_check = now
                 if in_combat:
                     return True
@@ -41,4 +42,5 @@ def reset_to_false(self, recheck=False, reason=""):
         return False
 
     def do_reset_to_false(self):
-        self._in_combat = False
+        self._in_combat = False
+        self.manual_in_combat = False

src/tasks/AutoMoveTask.py

@@ -27,6 +27,7 @@ def __init__(self, *args, **kwargs):
         })
         self.listener = None
         self.manual_activate = False
+        self.signal = False
         self.is_down = False
         self._executor.exit_event.bind_stop(self)
 
@@ -40,14 +41,20 @@ def pause(self):
 
     def stop(self):
         self.manual_activate = False
+        self.signal = False
         if self.listener:
             self.listener.stop()
             self.listener = None
 
     def run(self):
+        if self.signal:
+            self.signal = False
+            if self.in_team() and og.device_manager.hwnd_window.is_foreground():
+                self.switch_state()
+        
         if not self.in_team():
             return
-        
+
         if not self.listener:
             self.listener = mouse.Listener(on_click=self.on_click)
             # self.listener = keyboard.Listener(on_press=self.on_press)
@@ -81,24 +88,28 @@ def sleep_check(self, sec):
             s = step if remaining > step else remaining
             self.sleep(s)
             remaining -= s
+            if self.signal:
+                self.switch_state()
             if not self.manual_activate:
                 raise TriggerDeactivateException()
+            
+    def switch_state(self):
+        self.signal = False
+        self.manual_activate = not self.manual_activate
+        if self.manual_activate:
+            logger.info("激活快速移动")
+        else:
+            logger.info("关闭快速移动")
 
     def on_click(self, x, y, button, pressed):
         if self._executor.paused:
             return
-        if not self.in_team() or not og.device_manager.hwnd_window.is_foreground():
-            return
         if self.config.get('激活键', 'x2') == 'x1':
             btn = mouse.Button.x1
         else:
             btn = mouse.Button.x2
         if pressed and button == btn:
-            self.manual_activate = not self.manual_activate
-            if self.manual_activate:
-                logger.info("激活快速移动")
-            else:
-                logger.info("关闭快速移动")
+            self.signal = True
 
     # def on_press(self, key):
     #     if self._executor.paused: