整合 og 模组，优化战斗检查与自动移动任务的事件处理

Author: BnanZ0

src/combat/CombatCheck.py

@@ -1,5 +1,5 @@
 import time
-
+from ok import og
 from src.tasks.BaseDNATask import BaseDNATask
 
 class CombatCheck(BaseDNATask):
@@ -21,19 +21,21 @@ def in_combat(self):
         if self._in_combat:
             now = time.time()
             if now - self.last_combat_check > self.combat_check_interval:
-                in_combat = self.manual_in_combat and self.in_team()
+                in_combat = self.manual_in_combat and self.in_team() and og.device_manager.hwnd_window.is_foreground()
                 self.last_combat_check = now
                 if in_combat:
                     return True
                 return self.reset_to_false(recheck=True, reason='on user stop')
             return True
         else:
-            in_combat = getattr(self, "manual_in_combat", False)
+            in_combat = self.manual_in_combat and self.in_team() and og.device_manager.hwnd_window.is_foreground()
             if in_combat:
                 from src.tasks.AutoCombatTask import AutoCombatTask
                 if isinstance(self, AutoCombatTask):
                     self.load_char()
                 self._in_combat = True
+            else:
+                self.reset_to_false(recheck=True, reason='on user stop')
         return self._in_combat
 
     def reset_to_false(self, recheck=False, reason=""):

src/globals.py

@@ -1,14 +1,49 @@
-from PySide6.QtCore import QObject
+from PySide6.QtCore import QObject, Signal
+from pynput import mouse, keyboard
 
-from ok import Logger
+from ok import Logger, og
 
 logger = Logger.get_logger(__name__)
 
 
 class Globals(QObject):
+    clicked = Signal(int, int, object, bool)
+    pressed = Signal(object)
 
     def __init__(self, exit_event):
         super().__init__()
+        self.pynput_mouse = None
+        self.pynput_keyboard = None
+        exit_event.bind_stop(self)
+        self.init_pynput()
+
+    def stop(self):
+        logger.info("pynput stop")
+        self.reset_pynput()
+
+    def init_pynput(self):
+        logger.info("pynput start")
+        if self.pynput_mouse is None:
+            self.pynput_mouse = mouse.Listener(on_click=self.on_click)
+            self.pynput_mouse.start()
+        if self.pynput_keyboard is None:
+            self.pynput_keyboard = keyboard.Listener(on_press=self.on_press)
+            self.pynput_keyboard.start()
+
+    def reset_pynput(self):
+        if self.pynput_mouse:
+            self.pynput_mouse.stop()
+            self.pynput_mouse = None
+        if self.pynput_keyboard:
+            self.pynput_keyboard.stop()
+            self.pynput_keyboard = None
+
+    def on_click(self, x, y, button, pressed):
+        self.clicked.emit(x, y, button, pressed)
+    
+    def on_press(self, key):
+        self.pressed.emit(key)
+        
 
 
 if __name__ == "__main__":

src/tasks/AutoCombatTask.py

@@ -1,4 +1,4 @@
-from ok import TriggerTask, Logger
+from ok import TriggerTask, Logger, og
 from src.tasks.BaseCombatTask import BaseCombatTask, NotInCombatException, CharDeadException
 
 from pynput import mouse
@@ -17,35 +17,14 @@ def __init__(self, *args, **kwargs):
         self.config_description.update({
             '激活键': '鼠标侧键',
         })
-        self.listener = None
-        self.manual_in_combat = False
-        self._executor.exit_event.bind_stop(self)
-
-    def disable(self):
-        super().disable()
-        self.stop()
-
-    def pause(self):
-        super().pause()
-        self.stop()
-
-    def stop(self):
-        self.manual_activate = False
-        if self.listener:
-            self.listener.stop()
-            self.listener = None
+        self.connected = False
 
     def run(self):
-        ret = False
-        if not self.in_team():
-            return ret
-        
-        if not self.listener:
-            self.listener = mouse.Listener(on_click=self.on_click)
-            self.listener.start()
+        if not self.connected:
+            self.connected = True
+            og.my_app.clicked.connect(self.on_global_click)
 
-        if not self.listener.running:
-            self.listener.run()
+        ret = False
 
         while self.in_combat():
             ret = True
@@ -62,7 +41,7 @@ def run(self):
             self.combat_end()
         return ret
 
-    def on_click(self, x, y, button, pressed):
+    def on_global_click(self, x, y, button, pressed):
         if self._executor.paused:
             return
         if self.config.get('激活键', 'x2') == 'x1':
@@ -71,6 +50,3 @@ def on_click(self, x, y, button, pressed):
             btn = mouse.Button.x2
         if pressed and button == btn:
             self.manual_in_combat = not self.manual_in_combat
-
-
-

src/tasks/AutoMoveTask.py

@@ -5,15 +5,15 @@
 logger = Logger.get_logger(__name__)
 
 class TriggerDeactivateException(Exception):
-    """未处于战斗状态异常。"""
+    """停止激活异常。"""
     pass
 
 class AutoMoveTask(BaseCombatTask, TriggerTask):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.name = "自动穿引共鸣"
-        self.description = "需使用鼠标侧键主动激活"
+        self.description = "需使用鼠标侧键主动激活，运行中也可使用左键打断"
         self.default_config.update({
             '激活键': 'x1',
             '按下时间': 0.50,
@@ -25,28 +25,17 @@ def __init__(self, *args, **kwargs):
             '按下时间': '左键按住多久',
             '间隔时间': '左键释放后等待多久',
         })
-        self.listener = None
         self.manual_activate = False
         self.signal = False
+        self.signal_left = False
         self.is_down = False
-        self._executor.exit_event.bind_stop(self)
-
-    def disable(self):
-        super().disable()
-        self.stop()
-
-    def pause(self):
-        super().pause()
-        self.stop()
-
-    def stop(self):
-        self.manual_activate = False
-        self.signal = False
-        if self.listener:
-            self.listener.stop()
-            self.listener = None
+        self.connected = False
 
     def run(self):
+        if not self.connected:
+            self.connected = True
+            og.my_app.clicked.connect(self.on_global_click)
+
         if self.signal:
             self.signal = False
             if self.in_team() and og.device_manager.hwnd_window.is_foreground():
@@ -55,11 +44,6 @@ def run(self):
         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)
-            self.listener.start()
-
         while self.manual_activate:
             try:
                 self.do_move()
@@ -76,53 +60,41 @@ def run(self):
     def do_move(self):
         self.mouse_down()
         self.is_down = True
-        self.sleep(self.config.get('按下时间', 0.50))
+        self.sleep_check(self.config.get('按下时间', 0.50), False)
         self.mouse_up()
         self.is_down = False
         self.sleep_check(self.config.get('间隔时间', 0.45))
 
-    def sleep_check(self, sec):
+    def sleep_check(self, sec, check_signal_flag=True):
         remaining = sec
         step = 0.2
         while remaining > 0:
             s = step if remaining > step else remaining
             self.sleep(s)
             remaining -= s
-            if self.signal:
+            if (self.signal and check_signal_flag) or self.signal_left:
                 self.switch_state()
             if not self.manual_activate:
                 raise TriggerDeactivateException()
 
     def switch_state(self):
+        self.signal_left = False
         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):
+    def on_global_click(self, x, y, button, pressed):
         if self._executor.paused:
             return
         if self.config.get('激活键', 'x2') == 'x1':
             btn = mouse.Button.x1
         else:
             btn = mouse.Button.x2
-        if pressed and button == btn:
-            self.signal = True
-
-    # def on_press(self, key):
-    #     if self._executor.paused:
-    #         return
-    #     if not self.in_team() or not og.device_manager.hwnd_window.is_foreground():
-    #         return
-    #     active_key = getattr(keyboard.Key, self.config.get('激活键').lower())
-    #     if key == active_key:
-    #         self.manual_activate = not self.manual_activate
-    #         if self.manual_activate:
-    #             logger.info("激活快速移动")
-    #         else:
-    #             logger.info("关闭快速移动")
-
-
-
+        if pressed:
+            if button == btn:
+                self.signal = True
+            elif button == mouse.Button.left and self.manual_activate:
+                self.signal_left = True