优化CommissionsTask

Author: BnanZ0

src/tasks/BaseDNATask.py

@@ -43,15 +43,6 @@ def find_drop_item(self, rates = 2000, threshold: float = 0, box: Box | None = N
         if isinstance(box, Box):
             self.draw_boxes(box.name, box, "blue")
         return self.find_one(f'drop_item_{str(rates)}', threshold=threshold, box=box, template=template)
-    
-    def click_until(self, click_func: callable, check_func: callable, check_interval: float = 2, time_out: float = 10):
-        start = time.time()
-        while time.time() - start < time_out:
-            click_func()
-            if self.wait_until(check_func, time_out=check_interval, raise_if_not_found=False):
-                break
-        else:
-            raise Exception("click_until timeout")
 
     def safe_get(self, key, default=None):
         if hasattr(self, key):

src/tasks/CommissionsTask.py

@@ -113,10 +113,11 @@ def quit_mission(self, timeout=10):
             self.find_quit_btn, time_out=action_timeout, raise_if_not_found=True
         )
         self.sleep(0.5)
-        self.click_until(
-            click_func=lambda: self.click_box(quit_btn, after_sleep=0.25),
-            check_func=lambda: not self.find_quit_btn(),
+        self.wait_until(
+            condition=lambda: not self.find_quit_btn(),
+            post_action=lambda: self.click_box(quit_btn, after_sleep=0.25),
             time_out=action_timeout,
+            raise_if_not_found=True,
         )
         self.sleep(1)
         self.wait_until(
@@ -128,18 +129,18 @@ def give_up_mission(self, timeout=10):
         box = self.box_of_screen_scaled(2560, 1440, 1310, 788, 1352, 830, name="start_mission", hcenter=True)
         self.open_in_mission_menu()
 
-        self.click_until(
-            click_func=lambda: self.click_relative(0.95, 0.91),
-            check_func=lambda: self.find_start_btn(box=box),
+        self.wait_until(
+            condition=lambda: self.find_start_btn(box=box),
+            post_action=lambda: self.click_relative(0.95, 0.91, after_sleep=0.25),
             time_out=action_timeout,
+            raise_if_not_found=True,
         )
         self.sleep(0.5)
-        self.click_until(
-            click_func=lambda: self.wait_click_box(
-                lambda: self.find_start_btn(box=box), time_out=0.25
-            ),
-            check_func=lambda: not self.find_start_btn(box=box),
+        self.wait_until(
+            condition=lambda: not self.find_start_btn(box=box),
+            post_action=lambda: self.click_box(self.find_start_btn(box=box), after_sleep=0.25),
             time_out=action_timeout,
+            raise_if_not_found=True,
         )
 
     def continue_mission(self, timeout=10):
@@ -149,10 +150,11 @@ def continue_mission(self, timeout=10):
         continue_btn = self.wait_until(
             self.find_continue_btn, time_out=action_timeout, raise_if_not_found=True
         )
-        self.click_until(
-            click_func=lambda: self.click_box(continue_btn, after_sleep=0.25),
-            check_func=lambda: not self.find_continue_btn(),
+        self.wait_until(
+            condition=lambda: not self.find_continue_btn(),
+            post_action=lambda: self.click_box(continue_btn, after_sleep=0.25),
             time_out=action_timeout,
+            raise_if_not_found=True,
         )
         self.sleep(0.5)
         return True
@@ -162,10 +164,11 @@ def choose_drop_rate(self, timeout=10):
         self.sleep(0.5)
         self.choose_drop_rate_item()
         box = self.box_of_screen_scaled(2560, 1440, 1067, 940, 1415, 992, name="drop_rate_btn", hcenter=True)
-        self.click_until(
-            click_func=lambda: self.wait_click_box(lambda: self.find_start_btn(box=box), time_out=0.25),
-            check_func=lambda: not self.find_drop_item(),
+        self.wait_until(
+            condition=lambda: not self.find_drop_item(),
+            post_action=lambda: self.click_box(self.find_start_btn(box=box), after_sleep=0.25),
             time_out=action_timeout,
+            raise_if_not_found=True,
         )
 
     def choose_drop_rate_item(self):
@@ -195,11 +198,11 @@ def choose_letter(self, timeout=10):
                 self.click(0.56, 0.5)
                 self.move_back_from_safe_position()
                 self.sleep(0.5)
-                self.click(0.56, 0.5, after_sleep=0.5)
-                self.click_until(
-                    click_func=lambda: self.click(0.79, 0.61),
-                    check_func=lambda: not self.find_letter_btn(),
+                self.wait_until(
+                    condition=lambda: not self.find_letter_btn(),
+                    post_action=lambda: self.click(0.79, 0.61, after_sleep=0.25),
                     time_out=action_timeout,
+                    raise_if_not_found=True,
                 )
         else:
             self.log_info("需自行选择密函", True)
@@ -215,10 +218,11 @@ def choose_letter_reward(self, timeout=10):
             return
         action_timeout = self.safe_get("action_timeout", timeout)
         if self.config.get("自动选择首个密函和密函奖励", False):
-            self.click_until(
-                click_func=lambda: self.click(0.50, 0.83),
-                check_func=lambda: not self.find_letter_reward_btn(),
+            self.wait_until(
+                condition=lambda: not self.find_letter_reward_btn(),
+                post_action=lambda: self.click(0.50, 0.83, after_sleep=0.25),
                 time_out=action_timeout,
+                raise_if_not_found=True,
             )
         else:
             self.log_info("需自行选择密函奖励", True)