refactor(commissions): 适配1.2

Author: BnanZ0

src/tasks/BaseDNATask.py

@@ -214,6 +214,8 @@ def find_drop_item(self, rates=2000, threshold: float = 0, box: Box | None = Non
     def find_not_use_letter_icon(self, threshold: float = 0, box: Box | None = None, template=None) -> Box | None:
         if isinstance(box, Box):
             self.draw_boxes(box.name, box, "blue")
+        else:
+            box = self.box_of_screen(0.4552, 0.3954, 0.4927, 0.4648, name="not_use_letter", hcenter=True)
         return self.find_one('not_use_letter', threshold=threshold, box=box, template=template)
 
     def safe_get(self, key, default=None):

src/tasks/CommissionsTask.py

@@ -68,7 +68,7 @@ def find_big_bottom_start_btn(self, threshold=0):
 
     def find_letter_btn(self, threshold=0):
         return self.find_start_btn(
-            threshold=threshold, box=self.box_of_screen_scaled(2560, 1440, 1630, 852, 1884, 920, name="letter_btn",
+            threshold=threshold, box=self.box_of_screen(0.6328, 0.6229, 0.7417, 0.6667, name="letter_btn",
                                                                hcenter=True))
 
     def find_letter_reward_btn(self, threshold=0):
@@ -215,14 +215,12 @@ def choose_letter(self, timeout=0):
         action_timeout = self.action_timeout if timeout == 0 else timeout
         if self.commission_config.get("自动处理密函", False):
             if self.find_letter_interface():
-                box = self.box_of_screen_scaled(2560, 1440, 1170, 610, 2450, 820, name="letter_drag_area", hcenter=True)
-                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)
+                box = self.box_of_screen(0.4432, 0.3556, 0.9750, 0.6037, name="letter_drag_area", hcenter=True)
+                not_use_edge = self.box_of_screen(0.4443, 0.3630, 0.4526, 0.4991, name="not_use_edge", hcenter=True)
                 self.sleep(0.1)
-
                 for _ in range(2):
-                    self.click_relative_random(0.533, 0.444, 0.575, 0.547, use_safe_move=True, safe_move_box=box, down_time=0.02, after_sleep=0.1)
-                    if self.wait_until(lambda: not self.find_one(template=letter_snapshot, box=letter_roi, threshold=0.7), time_out=1):
+                    self.click_relative_random(0.5120, 0.3815, 0.5531, 0.4667, use_safe_move=True, safe_move_box=box, down_time=0.02, after_sleep=0.1)
+                    if self.wait_until(lambda: self.calculate_color_percentage(white_color, not_use_edge) < 0.05, time_out=1):
                         break
                 else:
                     self.log_info_notify("密函已耗尽")
@@ -511,9 +509,10 @@ def reset_and_transport(self):
         safe_box = self.box_of_screen_scaled(2560, 1440, 125, 207, 1811, 1234, name="safe_box", hcenter=True)
         self.wait_until(
             condition=lambda: self.find_start_btn(box=confirm_box),
-            post_action=lambda: self.click_relative_random(0.500, 0.349, 0.691, 0.382, use_safe_move=True, safe_move_box=safe_box),
+            post_action=lambda: self.click_relative_random(0.5016, 0.4074, 0.6906, 0.4380, use_safe_move=True, safe_move_box=safe_box),
             time_out=10,
         )
+        self.sleep(0.25)
         safe_box = self.box_of_screen_scaled(2560, 1440, 1298, 772, 1735, 846, name="safe_box", hcenter=True)
         if not self.wait_until(condition=self.in_team, post_action=lambda: self.click_relative_random(0.531, 0.547, 0.671, 0.578, after_sleep=0.5, use_safe_move=True, safe_move_box=safe_box),
                                time_out=10):
@@ -594,5 +593,11 @@ def ocr_normalize(cv_image):
     'b': (200, 255)  # Blue range
 }
 
+white_color = {
+    'r': (245, 255),  # Red range
+    'g': (245, 255),  # Green range
+    'b': (245, 255)  # Blue range
+}
+
 def _default_movement():
     pass