♻️ refactor(config, afk, task): 统一管理提示音配置

BnanZ0 · BnanZ0 · commit ed4e8a56d6cc · 2025-12-02T16:32:48.000+08:00
diff --git a/src/config.py b/src/config.py
@@ -24,13 +24,15 @@
 }, description='Game Sensitivity Description')
 
 afk_config_option = ConfigOption('挂机设置', { #全局配置示例
-    '提示音': 2,
+    "提示音": True,
+    '提示音次数': 2,
     '弹出通知': True,
     '防止鼠标干扰': True,
     '鼠标抖动': True,
     '鼠标抖动锁定在窗口范围': True,
 }, description='挂机相关设置', config_description={
-    '提示音': '单次提示响几次',
+    "提示音": "在需要时发出声音提醒",
+    '提示音次数': '单次提示响几次',
     '弹出通知': '是否弹出windows通知',
     '防止鼠标干扰': '启动任务时和特定场景下会将鼠标移动到安全位置',
     '鼠标抖动': '建议启用',
diff --git a/src/tasks/BaseDNATask.py b/src/tasks/BaseDNATask.py
@@ -11,7 +11,7 @@
 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, GenshinInteraction, PyDirectInteraction
+from ok import BaseTask, Box, Logger, color_range_to_bound, run_in_new_thread, og, GenshinInteraction, PyDirectInteraction, TaskDisabledException
 
 logger = Logger.get_logger(__name__)
 f_black_color = {
@@ -183,10 +183,10 @@ def safe_get(self, key, default=None):
         return default
 
     def soundBeep(self, _n=None):
-        if hasattr(self, "config") and not self.config.get("发出声音提醒", True):
+        if not self.afk_config.get("提示音", True):
             return
         if _n is None:
-            n = max(1, self.afk_config.get("提示音", 1))
+            n = max(1, self.afk_config.get("提示音次数", 1))
         else:
             n = _n
         run_in_new_thread(
@@ -505,11 +505,22 @@ def move_mouse_relative(self, dx, dy, original_Xsensitivity=1.0, original_Ysensi
         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)
-            win32api.keybd_event(win32con.VK_MENU, 0, win32con.KEYEVENTF_KEYUP, 0)
-            self.hwnd.bring_to_front()
-            self.sleep(0.5)
+        deadline = time.perf_counter() + 10
+        while time.perf_counter() < deadline:
+            try:
+                if not self.hwnd.is_foreground():
+                    win32api.keybd_event(win32con.VK_MENU, 0, 0, 0)
+                    win32api.keybd_event(win32con.VK_MENU, 0, win32con.KEYEVENTF_KEYUP, 0)
+                    self.hwnd.bring_to_front()
+                    self.sleep(0.5)
+                break
+            except TaskDisabledException:
+                raise
+            except Exception as e:
+                logger.error('try_bring_to_front error', e)
+                self.sleep(1)
+        else:
+            raise Exception("Failed to bring window to front after multiple retries.")
 
 track_point_color = {
     "r": (121, 255),  # Red range
diff --git a/src/tasks/CommissionsTask.py b/src/tasks/CommissionsTask.py
@@ -32,7 +32,6 @@ def setup_commission_config(self):
             "使用技能": "不使用",
             "技能释放频率": 5.0,
             "启用自动穿引共鸣": True,
-            "发出声音提醒": True,
             "自动选择首个密函和密函奖励": True,
             "优先选择密函奖励": "不使用",
         })
@@ -41,7 +40,6 @@ def setup_commission_config(self):
             "超时时间": "超时后将重启任务",
             "技能释放频率": "毎几秒释放一次技能",
             "启用自动穿引共鸣": "在需要跑图时时启用触发任务的自动穿引共鸣",
-            "发出声音提醒": "在需要时发出声音提醒",
             "自动选择首个密函和密函奖励": "刷武器密函时推荐同时开启下一选项",
             "优先选择密函奖励": "在上一选项启用时生效",
         })
@@ -227,7 +225,7 @@ def choose_letter(self, timeout=0):
                 letter_roi = self.box_of_screen_scaled(2560, 1440, 565, 651, 732, 805, name="letter_roi", hcenter=True)
                 letter_snapshot = letter_roi.crop_frame(self.frame)
                 self.sleep(0.1)
-                self.click_relative_random(0.531, 0.441, 0.577, 0.551, use_safe_move=True, safe_move_box=box, down_time=0.02)
+                self.click_relative_random(0.531, 0.441, 0.577, 0.551, use_safe_move=True, safe_move_box=box, down_time=0.05)
                 self.sleep(0.3)
                 if self.find_one(template=letter_snapshot, box=letter_roi, threshold=0.7):
                     self.log_info_notify("密函已耗尽")
diff --git a/src/tasks/fullauto/AutoEscortTask.py b/src/tasks/fullauto/AutoEscortTask.py
@@ -36,7 +36,6 @@ def __init__(self, *args, **kwargs):
             "启用自动穿引共鸣",
             "使用技能",
             "技能释放频率",
-            "发出声音提醒",
         ]
         for key in keys_to_remove:
             self.default_config.pop(key, None)
diff --git a/src/tasks/fullauto/AutoExploration_Fast.py b/src/tasks/fullauto/AutoExploration_Fast.py
@@ -32,7 +32,7 @@ def __init__(self, *args, **kwargs):
             '轮次': 3,
             '超时时间': 120,
             '解密失败自动重开': True,
-            '地图选择': '全部地图',
+            '地图选择': ["探险电梯", "探险高台", "探险平地"],
         })
         self.config_description.update({
             '轮次': '打几个轮次',
@@ -47,8 +47,8 @@ def __init__(self, *args, **kwargs):
         
         # 设置地图选择为下拉选择
         self.config_type["地图选择"] = {
-            "type": "drop_down",
-            "options": ["全部地图", "探险电梯", "探险高台", "探险平地"],
+            "type": "multi_selection",
+            "options": ["探险电梯", "探险高台", "探险平地"],
         }
         self.action_timeout = DEFAULT_ACTION_TIMEOUT
         self.quick_move_task = QuickMoveTask(self)
@@ -89,7 +89,7 @@ def run(self):
             raise
 
     def walk_to_aim(self):
-        map_selection = self.config.get("地图选择", "全部地图")
+        map_selection = self.config.get("地图选择", [])
         
         # 检测当前地图类型
         current_map = self.detect_current_map()
@@ -99,16 +99,16 @@ def walk_to_aim(self):
             raise MapDetectionError("无法识别当前地图类型")
         
         # 如果选择了特定地图，但当前不是该地图，抛出地图识别错误
-        if map_selection != "全部地图" and current_map != map_selection:
-            raise MapDetectionError(f"当前地图({current_map})不匹配选择的地图({map_selection})")
+        if len(map_selection) != 0 and current_map not in map_selection:
+            raise MapDetectionError(f"当前地图[{current_map}]不匹配选择的地图{map_selection}")
         
         # 执行对应地图的移动逻辑
         if current_map in self.map_configs:
             self.log_info(f"识别到地图类型：{current_map}，开始执行移动逻辑")
             return self.map_configs[current_map]["execute_func"]()
         else:
             # 这种情况理论上不应该发生，因为current_map是从map_configs中检测出来的
-            raise MapDetectionError(f"地图配置不一致，检测到地图({current_map})但找不到对应的执行函数")
+            raise MapDetectionError(f"地图配置不一致，检测到地图[{current_map}]但找不到对应的执行函数")
     
     def detect_current_map(self):
         """检测当前地图类型"""
diff --git a/src/tasks/fullauto/AutoFishTask.py b/src/tasks/fullauto/AutoFishTask.py
@@ -32,7 +32,6 @@ def __init__(self, *args, **kwargs):
             "MAX_START_SEC": 20.0,
             "MAX_FIGHT_SEC": 60.0,
             "MAX_END_SEC": 20.0,
-            "发出声音提醒": True,
         })
 
         # ROI 配置（鱼条和鱼标搜索区域，基于 1920x1080）
@@ -45,7 +44,6 @@ def __init__(self, *args, **kwargs):
             "MAX_START_SEC": "开始阶段超时(秒)",
             "MAX_FIGHT_SEC": "溜鱼阶段超时(秒)",
             "MAX_END_SEC": "结束阶段超时(秒)",
-            "发出声音提醒": "完成时播放提示音",
         })
 
         # runtime

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ def __init__(self, args, *kwargs):`
`36`	`36`	`"启用自动穿引共鸣",`
`37`	`37`	`"使用技能",`
`38`	`38`	`"技能释放频率",`
`39`		`- "发出声音提醒",`
`40`	`39`	`]`
`41`	`40`	`for key in keys_to_remove:`
`42`	`41`	`self.default_config.pop(key, None)`