From 63d2f1ff4aa1b9e85064ea66ea86d91c92c1b127 Mon Sep 17 00:00:00 2001
From: "firedcto@gmail.com" <firedcto@gmail.com>
Date: Thu, 26 Sep 2024 11:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=9C=BA?=
 =?UTF-8?q?=E5=99=A8=E5=8F=AF=E8=83=BD=E5=90=8E=E5=8F=B0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements.txt           |  2 +-
 src/task/BaseCombatTask.py | 43 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1c28705..6cbcb60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-ok-script==0.0.270
+ok-script==0.0.271
 #rapidocr_onnxruntime
 rapidocr_openvino
 pySide6-Fluent-Widgets>=1.5.5
diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py
index 2c17d46..660d587 100644
--- a/src/task/BaseCombatTask.py
+++ b/src/task/BaseCombatTask.py
@@ -1,9 +1,7 @@
-import math
 import time
 
 import cv2
 import numpy as np
-import win32api
 
 import re
 from ok.color.Color import get_connected_area_by_color, color_range_to_bound
@@ -469,26 +467,27 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck):
         # Function to check if a component forms a ring
 
     def mouse_reset(self):
-        # logger.debug("mouse_reset")
-        try:
-            current_position = win32api.GetCursorPos()
-            if self.mouse_pos:
-                distance = math.sqrt(
-                    (current_position[0] - self.mouse_pos[0]) ** 2
-                    + (current_position[1] - self.mouse_pos[1]) ** 2
-                )
-                if distance > 400:
-                    logger.debug(f'move mouse back {self.mouse_pos}')
-                    win32api.SetCursorPos(self.mouse_pos)
-                    self.mouse_pos = None
-                    if self.enabled:
-                        self.handler.post(self.mouse_reset, 1)
-                    return
-            self.mouse_pos = current_position
-            if self.enabled:
-                return self.handler.post(self.mouse_reset, 0.005)
-        except Exception as e:
-            logger.error('mouse_reset exception', e)
+        # # logger.debug("mouse_reset")
+        # try:
+        #     current_position = win32api.GetCursorPos()
+        #     if self.mouse_pos:
+        #         distance = math.sqrt(
+        #             (current_position[0] - self.mouse_pos[0]) ** 2
+        #             + (current_position[1] - self.mouse_pos[1]) ** 2
+        #         )
+        #         if distance > 400:
+        #             logger.debug(f'move mouse back {self.mouse_pos}')
+        #             win32api.SetCursorPos(self.mouse_pos)
+        #             self.mouse_pos = None
+        #             if self.enabled:
+        #                 self.handler.post(self.mouse_reset, 1)
+        #             return
+        #     self.mouse_pos = current_position
+        #     if self.enabled:
+        #         return self.handler.post(self.mouse_reset, 0.005)
+        # except Exception as e:
+        #     logger.error('mouse_reset exception', e)
+        pass
 
     def count_rings(self, image, color_range, min_area):
         # Define the color range