Merge pull request #175 from carzer299/feature/add-sensitivity-calculate

添加设置游戏内灵敏度功能，不需要再根据脚本更改游戏内灵敏度了

Author: BnanZ0

.gitignore

@@ -74,3 +74,6 @@ mod/*
 # 但不忽略这个特定的文件夹
 !mod/示例-无巧手30火突破素材(1080p) by望目/
 !mod/builtin/
+
+# 忽略vscode插件文件
+.history/

i18n/en_US/LC_MESSAGES/ok.mo

@@ -581,3 +581,18 @@ msgstr "Lowest owned count"
 
 msgid "最大轮数"
 msgstr "Max Rounds"
+
+msgid "Game Sensitivity Config"
+msgstr "In Game Sensitivity Config"
+
+msgid "Game Sensitivity Description"
+msgstr "When using a script of the rotation perspective type, there is no longer a need to adjust the in-game sensitivity"
+
+msgid "Game Sensitivity Switch"
+msgstr "Switch"
+
+msgid "X-axis sensitivity"
+msgstr "In-game horizontal sensitivity"
+
+msgid "Y-axis sensitivity"
+msgstr "In-game vertical sensitivity"

i18n/en_US/LC_MESSAGES/ok.po

@@ -656,3 +656,18 @@ msgstr ""
 
 msgid "最大轮数"
 msgstr ""
+
+msgid "Game Sensitivity Config"
+msgstr "游戏灵敏度设置"
+
+msgid "Game Sensitivity Description"
+msgstr "使用转动视角类型脚本时不再需要修改游戏内灵敏度"
+
+msgid "Game Sensitivity Switch"
+msgstr "开关"
+
+msgid "X-axis sensitivity"
+msgstr "游戏内水平灵敏度"
+
+msgid "Y-axis sensitivity"
+msgstr "游戏内垂直灵敏度"

i18n/zh_CN/LC_MESSAGES/ok.mo

@@ -17,6 +17,11 @@
     'Interact Key': {'type': 'drop_down', 'options': ['f', 'e']}
 })
 
+sensitivity_config_option = ConfigOption('Game Sensitivity Config', { #全局配置示例
+    'Game Sensitivity Switch': False,
+    'X-axis sensitivity': 1.0,
+    'Y-axis sensitivity': 1.0
+}, description='Game Sensitivity Description')
 
 afk_config_option = ConfigOption('挂机设置', { #全局配置示例
     '提示音': 2,
@@ -74,7 +79,7 @@ def make_bottom_right_black(frame): #可选. 某些游戏截图时遮挡UID使
     'debug': False,  # Optional, default: False
     'use_gui': True, # 目前只支持True
     'config_folder': 'configs', #最好不要修改
-    'global_configs': [key_config_option, afk_config_option, monthly_card_config_option],
+    'global_configs': [key_config_option, sensitivity_config_option, afk_config_option, monthly_card_config_option],
     'screenshot_processor': make_bottom_right_black, # 在截图的时候对frame进行修改, 可选
     'gui_icon': 'icons/icon.png', #窗口图标, 最好不需要修改文件名
     'wait_until_before_delay': 0,

i18n/zh_CN/LC_MESSAGES/ok.po

@@ -7,8 +7,9 @@
 import win32con
 from datetime import datetime, timedelta
 from concurrent.futures import ThreadPoolExecutor
+from functools import cached_property
 
-from ok import BaseTask, Box, Logger, color_range_to_bound, run_in_new_thread, og
+from ok import BaseTask, Box, Logger, color_range_to_bound, run_in_new_thread, og, GenshinInteraction
 
 logger = Logger.get_logger(__name__)
 f_black_color = {
@@ -73,6 +74,7 @@ def __init__(self, *args, **kwargs):
         self.old_mouse_pos = None
         self.next_monthly_card_start = 0
         self._logged_in = False
+        self.sensitivity_config = self.get_global_config('Game Sensitivity Config')  # 游戏灵敏度配置
 
     @property
     def f_search_box(self) -> Box:
@@ -87,6 +89,15 @@ def f_search_box(self) -> Box:
     @property
     def thread_pool_executor(self) -> ThreadPoolExecutor:
         return og.my_app.get_thread_pool_executor()
+    
+    @cached_property
+    def genshin_interaction(self):
+        """
+        缓存 Interaction 实例，避免每次鼠标移动都重新创建对象。
+        需要确保 self.executor.interaction 和 self.hwnd 在此类初始化时可用。
+        """
+        # 确保引用的是正确的类
+        return GenshinInteraction(self.executor.interaction.capture, self.hwnd)
 
     def in_team(self) -> bool:
         frame = self.frame
@@ -380,7 +391,39 @@ def get_spiral_dive_key(self):
             str: 螺旋飞跃的按键字符串。
         """
         return self.key_config['HelixLeap Key']
-    
+        
+    def calculate_sensitivity(self, dx, dy, original_Xsensitivity=1.0, original_Ysensitivity=1.0):
+        """计算玩家水平鼠标移动值和垂直鼠标移动值,并且移动鼠标.
+
+        Returns:
+            int: 玩家水平鼠标移动值
+            int: 玩家垂直鼠标移动值
+
+        """
+        # 判断设置中灵敏度开关是否打开
+        if self.sensitivity_config['Game Sensitivity Switch']:
+            # 获取设置中的游戏灵敏度
+            game_Xsensitivity = round(self.sensitivity_config['X-axis sensitivity'], 1)
+            game_Ysensitivity = round(self.sensitivity_config['Y-axis sensitivity'], 1)
+
+            # 判断和计算
+            if original_Xsensitivity == game_Xsensitivity and original_Ysensitivity == game_Ysensitivity:
+                calculate_dx = dx
+                calculate_dy = dy
+            else:
+                calculate_dx = dx / round(game_Xsensitivity / original_Xsensitivity, 10)
+                calculate_dy = dy / round(game_Ysensitivity / original_Ysensitivity, 10)
+        else:
+            calculate_dx = dx
+            calculate_dy = dy
+
+        return calculate_dx, calculate_dy
+
+    def move_mouse_relative(self, dx, dy, original_Xsensitivity=1.0, original_Ysensitivity=1.0):
+        dx, dy = self.calculate_sensitivity(dx, dy, original_Xsensitivity, original_Ysensitivity)
+        self.try_bring_to_front()
+        self.genshin_interaction.move_mouse_relative(int(dx), int(dy))
+
     def try_bring_to_front(self):
         if not self.hwnd.is_foreground():
             win32api.keybd_event(win32con.VK_MENU, 0, 0, 0)

src/config.py

@@ -551,24 +551,6 @@ def execute_mouse_rotation(self, action):
         else:
             logger.warning(f"未知的鼠标方向: {direction}")
             return
-
-        # 使用 GenshinInteraction 的 move_mouse_relative 方法
-        interaction = self.executor.interaction
-        if isinstance(interaction, GenshinInteraction):
-            # 直接使用当前的 GenshinInteraction
-            # 确保窗口在前台，move_mouse_relative 需要窗口处于前台
-            self.executor.device_manager.hwnd_window.bring_to_front()
-            interaction.move_mouse_relative(int(dx), int(dy))
-        else:
-            # PostMessageInteraction 不支持相对移动，需要使用 GenshinInteraction
-            # 使用缓存的实例，避免重复创建
-            if self._genshin_interaction is None:
-                logger.debug("创建 GenshinInteraction 实例用于相对鼠标移动")
-                self._genshin_interaction = GenshinInteraction(
-                    interaction.capture, self.executor.device_manager.hwnd_window
-                )
-            # 确保窗口在前台
-            self.executor.device_manager.hwnd_window.bring_to_front()
-            self._genshin_interaction.move_mouse_relative(int(dx), int(dy))
-
+        
+        self.move_mouse_relative(dx, dy)
         logger.debug(f"鼠标视角旋转: {direction}, 角度: {angle}, 像素: {pixels}")

src/tasks/BaseDNATask.py

@@ -376,6 +376,13 @@ def genshin_interaction(self):
     def play_macro_actions(self, map_index):
         actions = self.script[map_index]["actions"]
 
+        if "original_x_sensitivity" and "original_y_sensitivity" in self.script[map_index] :
+            self.original_Xsensitivity = self.script[map_index]["original_x_sensitivity"]
+            self.original_Ysensitivity = self.script[map_index]["original_y_sensitivity"]
+        else:
+            self.original_Xsensitivity = 1.0
+            self.original_Ysensitivity = 1.0
+      
         # 使用 perf_counter 获得更高精度的时间
         start_time = time.perf_counter()
 
@@ -411,7 +418,7 @@ def execute_action(self, action):
 
         try:
             if action_type == "mouse_move":
-                self.execute_mouse_move(action['dx'], action['dy'])
+                self.move_mouse_relative(action['dx'], action['dy'], self.original_Xsensitivity, self.original_Ysensitivity)
 
             elif action_type == "mouse_rotation":
                 self.execute_mouse_rotation(action)
@@ -506,18 +513,9 @@ def execute_mouse_rotation(self, action):
             return
 
         dx, dy = direction_map[direction]
-        self.execute_mouse_move(dx, dy)
+        self.move_mouse_relative(dx, dy, self.original_Xsensitivity, self.original_Ysensitivity)
         logger.debug(f"鼠标视角旋转: {direction}, 角度: {angle}, 像素: {pixels}")
 
-    def execute_mouse_move(self, dx, dy):
-        """
-        优化：复用 genshin_interaction 实例，避免频繁创建对象。
-        """
-        self.try_bring_to_front()
-
-        # 使用缓存的实例
-        self.genshin_interaction.move_mouse_relative(int(dx), int(dy))
-
 
 def normalize_key(key: str) -> str:
     """