⚡️ perf(tasks): 优化任务执行效率

  - 减少点击操作后固定等待时间，提高任务响应速度
  - 缩短选择密函奖励后的等待时间，加速任务流程
  - 移除任务重置与传送流程中的冗余等待
  - 在获取轮次信息时，使用条件等待替代固定延时，增强健壮性

♻️ refactor(tasks): 重构任务相关通用方法
  - 重写窗口置顶逻辑，提升稳定性及执行效率
  - 移除不再使用的 TaskDisabledException 导入
  - 删除 CommissionsTask 中已废弃的技能释放方法
  - 清理 choose_letter_reward 方法中冗余的配置检查

Author: BnanZ0

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, TaskDisabledException
+from ok import BaseTask, Box, Logger, color_range_to_bound, run_in_new_thread, og, GenshinInteraction, PyDirectInteraction
 
 logger = Logger.get_logger(__name__)
 f_black_color = {
@@ -336,7 +336,7 @@ def _perform_random_click(self, x_abs, y_abs, use_safe_move=False, safe_move_box
 
         self.sleep(after_sleep)
 
-    def click_box_random(self, box: Box, down_time=0.0, post_sleep=1.5, after_sleep=0.0, use_safe_move=False, safe_move_box=None, left_extend=0.0, right_extend=0.0, up_extend=0.0, down_extend=0.0):
+    def click_box_random(self, box: Box, down_time=0.0, post_sleep=1.0, after_sleep=0.0, use_safe_move=False, safe_move_box=None, left_extend=0.0, right_extend=0.0, up_extend=0.0, down_extend=0.0):
         le_px = left_extend * self.width
         re_px = right_extend * self.width
         ue_px = up_extend * self.height
@@ -351,7 +351,7 @@ def click_box_random(self, box: Box, down_time=0.0, post_sleep=1.5, after_sleep=
             down_time, post_sleep, after_sleep
         )
 
-    def click_relative_random(self, x1, y1, x2, y2, down_time=0.02, post_sleep=1.5, after_sleep=0.0, use_safe_move=False, safe_move_box=None):
+    def click_relative_random(self, x1, y1, x2, y2, down_time=0.02, post_sleep=1.0, after_sleep=0.0, use_safe_move=False, safe_move_box=None):
         r_x = random.uniform(x1, x2)
         r_y = random.uniform(y1, y2)
 
@@ -506,22 +506,21 @@ 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):
-        deadline = time.perf_counter() + 10
-        while time.perf_counter() < deadline:
+        if not self.hwnd.is_foreground():
+            def key_press(key, after_sleep=0):
+                win32api.keybd_event(key, 0, 0, 0)
+                win32api.keybd_event(key, 0, win32con.KEYEVENTF_KEYUP, 0)
+                self.sleep(after_sleep)
+
+            key_press(win32con.VK_MENU)
             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.")
+                self.hwnd.bring_to_front()
+            except Exception:
+                key_press(win32con.VK_LWIN, 0.1)
+                key_press(win32con.VK_LWIN, 0.1)
+                key_press(win32con.VK_MENU)
+                self.hwnd.bring_to_front()
+            self.sleep(0.5)
 
     def setup_jitter(self):
         def _jitter_loop_task():

src/tasks/CommissionsTask.py

@@ -313,8 +313,6 @@ def get_rewards():
             self.click_box_random(target_item['reward_obj'], left_extend=0.015, right_extend=0.015, up_extend=0.03, down_extend=0.03, down_time=0.02, after_sleep=0.5)
 
     def choose_letter_reward(self, timeout=0):
-        if not hasattr(self, "config"):
-            return
         action_timeout = self.action_timeout if timeout == 0 else timeout
         if self.config.get("自动选择首个密函和密函奖励", False):
             if self.config.get("优先选择密函奖励", "不使用") != "不使用":
@@ -333,20 +331,7 @@ def choose_letter_reward(self, timeout=0):
                 time_out=300,
                 raise_if_not_found=True,
             )
-        self.sleep(3)
-
-    def use_skill(self, skill_time):
-        if not hasattr(self, "config"):
-            return
-        if self.config.get("使用技能", "不使用") != "不使用" and time.time() - skill_time >= self.config.get("技能释放频率", 5):
-            skill_time = time.time()
-            if self.config.get("使用技能") == "战技":
-                self.get_current_char().send_combat_key()
-            elif self.config.get("使用技能") == "终结技":
-                self.get_current_char().send_ultimate_key()
-            elif self.config.get("使用技能") == "魔灵支援":
-                self.get_current_char().send_geniemon_key()
-        return skill_time
+        self.sleep(0.1)
 
     def create_skill_ticker(self):
 
@@ -366,8 +351,8 @@ def get_round_info(self):
         """获取并更新当前轮次信息。"""
         if self.in_team():
             return
-
-        self.sleep(1)
+        box = self.box_of_screen(0.241, 0.361, 0.259, 0.394, name="green_mark", hcenter=True)
+        self.wait_until(lambda: self.calculate_color_percentage(green_mark_color, box) > 0.135, time_out=1)
         round_info_box = self.box_of_screen_scaled(2560, 1440, 531, 517, 618, 602, name="round_info", hcenter=True)
         texts = self.ocr(box=round_info_box)
 
@@ -477,24 +462,23 @@ def find_next_hint(self, x1, y1, x2, y2, s, box_name="hint_text"):
 
     def reset_and_transport(self):
         self.open_in_mission_menu()
-        self.sleep(0.8)
         self.wait_until(
             condition=lambda: not self.find_esc_menu(),
-            post_action=self.click_relative_random(0.688, 0.875, 0.770, 0.956, after_sleep=0.5),
+            post_action=self.click_relative_random(0.688, 0.875, 0.770, 0.956),
             time_out=10,
         )
         setting_box = self.box_of_screen_scaled(2560, 1440, 738, 4, 1123, 79, name="other_section", hcenter=True)
         setting_other = self.wait_until(lambda: self.find_one("setting_other", box=setting_box), time_out=10,
                                         raise_if_not_found=True)
         self.wait_until(
             condition=lambda: self.calculate_color_percentage(setting_menu_selected_color, setting_other) > 0.24,
-            post_action=lambda: self.click_box_random(setting_other, after_sleep=0.5),
+            post_action=lambda: self.click_box_random(setting_other),
             time_out=10,
         )
         confirm_box = self.box_of_screen_scaled(2560, 1440, 1298, 776, 1368, 843, name="confirm_btn", hcenter=True)
         self.wait_until(
             condition=lambda: self.find_start_btn(box=confirm_box),
-            post_action=lambda: self.click_relative_random(0.501, 0.294, 0.690, 0.325, use_safe_move=True, after_sleep=0.5),
+            post_action=lambda: self.click_relative_random(0.501, 0.294, 0.690, 0.325, use_safe_move=True),
             time_out=10,
         )
         if not self.wait_until(condition=self.in_team, post_action=lambda: self.click_relative_random(0.514, 0.547, 0.671, 0.578, after_sleep=0.5),
@@ -543,6 +527,12 @@ def reset(self):
     'b': (79, 89)  # Blue range
 }
 
+green_mark_color = {
+    'r': (40, 55),  # Red range
+    'g': (165, 170),  # Green range
+    'b': (120, 130)  # Blue range
+}
+
 
 def _default_movement():
     pass