♻️ refactor(auto_tasks): 适配1.1

- 【修复】 调整自动拾取的偏移与尺寸
- 【修复】 1600x900下探险找不到血清
- 【调整】 探险/无尽电梯，解密后将原地开始挂机

Author: BnanZ0

src/tasks/AutoExploration.py

@@ -147,5 +147,9 @@ def stop_func(self):
             return True
 
     def find_serum(self):
-        box = self.box_of_screen(0.022, 0.392, 0.032, 0.422, name="serum_icon", hcenter=True)
-        return bool(self.find_one("serum_icon", box=box))
+        box = self.box_of_screen(0.022, 0.385, 0.032, 0.422, name="serum_icon", hcenter=True)
+        if self.width < 1920 and self.height < 1080:
+            threshold = 0.7
+        else:
+            threshold = 0
+        return bool(self.find_one("serum_icon", box=box, threshold=threshold))

src/tasks/BaseDNATask.py

@@ -86,10 +86,10 @@ def __init__(self, *args, **kwargs):
     @property
     def f_search_box(self) -> Box:
         f_search_box = self.get_box_by_name('pick_up_f')
-        f_search_box = f_search_box.copy(x_offset=f_search_box.width * 3.3,
+        f_search_box = f_search_box.copy(x_offset=f_search_box.width * 3.25,
                                          width_offset=f_search_box.width * 0.65,
-                                         height_offset=f_search_box.height * 8.3,
-                                         y_offset=-f_search_box.height * 1.3,
+                                         height_offset=f_search_box.height * 8.7,
+                                         y_offset=-f_search_box.height * 1.7,
                                          name='search_dialog')
         return f_search_box
 

src/tasks/CommissionsTask.py

@@ -216,9 +216,8 @@ def choose_letter(self, timeout=0):
                 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)
-                    self.sleep(0.3)
-                    if not self.find_one(template=letter_snapshot, box=letter_roi, threshold=0.7):
+                    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):
                         break
                 else:
                     self.log_info_notify("密函已耗尽")

src/tasks/fullauto/Auto70jjbTask.py

@@ -171,8 +171,8 @@ def _path_no_elevator(self):
             self.send_key_down('a')
             self.sleep(0.2)
             self.send_key_down(self.get_dodge_key())
-            self.sleep(1)
-            self.send_key('space', down_time=0.2, after_sleep=1.8)
+            self.sleep(1.5)
+            self.send_key('space', down_time=0.2, after_sleep=1.4)
             self.send_key_up(self.get_dodge_key())
             self.sleep(0.1)
             self.send_key_up('a')

src/tasks/fullauto/AutoExploration_Fast.py

@@ -155,18 +155,18 @@ def execute_elevator_map(self):
         self.send_key(self.get_interact_key(), down_time=0.1,after_sleep=0.8)
         if not self.try_solving_puzzle():
             return True
-        self.send_key_down("a")
-        self.sleep(0.1)
-        self.send_key(self.get_dodge_key(), down_time=0.2,after_sleep=0.6)
-        self.send_key_down(self.get_dodge_key())
-        self.sleep(0.9)
-        self.send_key_down("w")
-        self.sleep(0.2)
-        self.send_key_up("a")
-        self.sleep(0.1)
-        self.send_key_up(self.get_dodge_key())
-        self.send_key_up("w")
-        self.sleep(0.2)
+        # self.send_key_down("a")
+        # self.sleep(0.1)
+        # self.send_key(self.get_dodge_key(), down_time=0.2,after_sleep=0.6)
+        # self.send_key_down(self.get_dodge_key())
+        # self.sleep(0.9)
+        # self.send_key_down("w")
+        # self.sleep(0.2)
+        # self.send_key_up("a")
+        # self.sleep(0.1)
+        # self.send_key_up(self.get_dodge_key())
+        # self.send_key_up("w")
+        # self.sleep(0.2)
         self.send_key_up("lalt")
         return True