优化

Author: BnanZ0

src/tasks/Auto65ArtifactTask_Fast.py

@@ -130,38 +130,6 @@ def do_run(self):
             # 短暂休眠
             self.sleep(0.2)
 
-    def reset_and_transport(self):
-        """
-        搬运自70皎皎币的重置位置方法
-        """
-        self.open_in_mission_menu()
-        self.sleep(0.8)
-        self.wait_until(
-            lambda: self.find_next_hint(0.05, 0.01, 0.09, 0.05, r"设置"),
-            post_action=self.click(0.73, 0.92, after_sleep=0.5),
-            time_out=2,
-        )
-        self.wait_until(
-            lambda: self.find_next_hint(0.06, 0.29, 0.12, 0.33, r"重置位置"),
-            post_action=self.click(0.35, 0.03, after_sleep=0.5),
-            time_out=2,
-        )
-        self.wait_until(
-            lambda: self.find_next_hint(0.57, 0.54, 0.62, 0.58, r"确定"),
-            post_action=lambda: (
-                self.move_mouse_to_safe_position(),
-                self.click(0.60, 0.32),
-                self.move_back_from_safe_position(),
-                self.sleep(1),
-            ),
-            time_out=4,
-        )
-        self.wait_until(
-            self.in_team,
-            post_action=self.click(0.59, 0.56, after_sleep=0.5),
-            time_out=2,
-        )
-
     def walk_to_aim(self):
         """
         从起点走到目标位置的路径

src/tasks/Auto70jjbTask.py

@@ -131,28 +131,6 @@ def wait_hint(self, x1, y1, x2, y2, hint, timeout=2):
             self.sleep(0.2)
             return True
         return False
-    
-    def reset_and_transport(self):
-        self.open_in_mission_menu()
-        self.sleep(0.8)
-        self.wait_until(lambda: self.find_next_hint(0.05, 0.01, 0.09, 0.05, r'设置'),
-                        post_action=self.click(0.73, 0.92, after_sleep=0.5),
-                        time_out=2)
-        self.wait_until(lambda: self.find_next_hint(0.06, 0.29, 0.12, 0.33, r'重置位置'),
-                        post_action=self.click(0.35, 0.03, after_sleep=0.5),
-                        time_out=2)
-        self.wait_until(lambda: self.find_next_hint(0.57, 0.54, 0.62, 0.58, r'确定'),
-                        post_action=lambda: (
-                            self.move_mouse_to_safe_position(),
-                            self.click(0.60, 0.32),
-                            self.move_back_from_safe_position(),
-                            self.sleep(1)
-                        ),
-                        time_out=4)
-        self.wait_until(self.in_team,
-                        post_action=self.click(0.59, 0.56, after_sleep=0.5),
-                        time_out=2)
-        
 
     def walk_to_aim(self):   
         if self.find_next_hint(0.18,0.52,0.23,0.55,r'保护目标'):

src/tasks/CommissionsTask.py

@@ -335,6 +335,27 @@ def find_next_hint(self, x1, y1, x2, y2, s, box_name="hint_text"):
         fps_text = find_boxes_by_name(texts, re.compile(s, re.IGNORECASE))
         if fps_text:
             return True
+        
+    def reset_and_transport(self):
+        self.open_in_mission_menu()
+        self.sleep(0.8)
+        self.wait_until(lambda: self.find_next_hint(0.05, 0.01, 0.09, 0.05, r'设置'),
+                        post_action=self.click(0.73, 0.92, after_sleep=0.5),
+                        time_out=2)
+        self.wait_until(lambda: self.find_next_hint(0.06, 0.29, 0.12, 0.33, r'重置位置'),
+                        post_action=self.click(0.35, 0.03, after_sleep=0.5),
+                        time_out=2)
+        self.wait_until(lambda: self.find_next_hint(0.57, 0.54, 0.62, 0.58, r'确定'),
+                        post_action=lambda: (
+                            self.move_mouse_to_safe_position(),
+                            self.click(0.60, 0.32),
+                            self.move_back_from_safe_position(),
+                            self.sleep(1)
+                        ),
+                        time_out=4)
+        self.wait_until(self.in_team,
+                        post_action=self.click(0.59, 0.56, after_sleep=0.5),
+                        time_out=2)
 
 
 class QuickMoveTask: