优化获取轮次信息

Author: BnanZ0

src/tasks/AutoDefence.py

@@ -70,7 +70,7 @@ def do_run(self):
             _status = self.handle_mission_interface(stop_func=self.stop_func)
             if _status == Mission.START:
                 self.wait_until(self.in_team, time_out=30)
-                self.log_info_notify("任务完成")
+                self.log_info_notify("任务开始")
                 self.soundBeep()
                 self.init_param()
             elif _status == Mission.STOP:

src/tasks/AutoExcavation.py

@@ -82,12 +82,12 @@ def stop_func(self):
         if self.current_round >= self.config.get("轮次", 3):
             return True
 
-    def find_target_health_bar(self, threshold: float = 0.5):
+    def find_target_health_bar(self, threshold: float = 0.6):
         health_bar_box = self.box_of_screen_scaled(2560, 1440, 131, 488, 406, 501, name="health_bar", hcenter=True)
         self.draw_boxes("health_bar", health_bar_box, color="blue")
         min_width = self.width_of_screen(200 / 2560)
         min_height = self.height_of_screen(8 / 1440)
-        health_bar = find_color_rectangles(self.frame, green_health_bar_color, min_width, min_height, box=health_bar_box, threshold=0.6)
+        health_bar = find_color_rectangles(self.frame, green_health_bar_color, min_width, min_height, box=health_bar_box, threshold=threshold)
         self.draw_boxes(boxes=health_bar)
         return health_bar
 

src/tasks/AutoExpulsion.py

@@ -47,24 +47,27 @@ def do_run(self):
         while True:
             if self.in_team():
                 if _start_time == 0:
+                    _count += 1
                     self.move_on_begin()
                     _start_time = time.time()
                 _skill_time = self.use_skill(_skill_time)
                 if time.time() - _start_time >= self.config.get("任务超时时间", 120):
                     logger.info("已经超时，重开任务...")
                     self.give_up_mission()
+                    self.sleep(1)
                     self.wait_until(lambda: not self.in_team(), time_out=30)
 
             _status = self.handle_mission_interface()
             if _status == Mission.START:
-                self.log_info("任务完成")
-                _count += 1
+                self.wait_until(self.in_team, time_out=30)
                 if _count >= self.config.get("刷几次", 999):
+                    self.sleep(1)
+                    self.open_in_mission_menu()
+                    self.log_info("任务终止")
                     return
-                self.wait_until(self.in_team, time_out=30)
+                self.log_info("任务开始")
                 self.sleep(2.5)
-                _start_time = time.time()
-                self.move_on_begin()
+                _start_time = 0
             self.sleep(0.2)
 
     def move_on_begin(self):

src/tasks/CommissionsTask.py

@@ -27,7 +27,7 @@ def setup_commission_config(self):
         self.default_config.update({
             "委托手册": "不使用",
             "使用技能": "不使用",
-            "技能释放频率": 5,
+            "技能释放频率": 5.0,
             "启用自动穿引共鸣": True,
             "发出声音提醒": True,
             "自动选择首个密函和密函奖励": True,
@@ -75,7 +75,7 @@ def find_drop_rate_btn(self, threshold=0):
     def find_esc_menu(self, threshold=0):
         return self.find_one("quit_big_icon", threshold=threshold)
 
-    def open_in_mission_menu(self, time_out=10, raise_if_not_found=True):
+    def open_in_mission_menu(self, time_out=20, raise_if_not_found=True):
         if self.find_esc_menu():
             return True
         found = False
@@ -114,7 +114,7 @@ def quit_mission(self, timeout=10):
         )
         self.sleep(0.5)
         self.click_until(
-            click_func=lambda: self.click_box(quit_btn),
+            click_func=lambda: self.click_box(quit_btn, after_sleep=0.25),
             check_func=lambda: not self.find_quit_btn(),
             time_out=action_timeout,
         )
@@ -150,7 +150,7 @@ def continue_mission(self, timeout=10):
             self.find_continue_btn, time_out=action_timeout, raise_if_not_found=True
         )
         self.click_until(
-            click_func=lambda: self.click_box(continue_btn),
+            click_func=lambda: self.click_box(continue_btn, after_sleep=0.25),
             check_func=lambda: not self.find_continue_btn(),
             time_out=action_timeout,
         )
@@ -159,13 +159,12 @@ def continue_mission(self, timeout=10):
 
     def choose_drop_rate(self, timeout=10):
         action_timeout = self.safe_get("action_timeout", timeout)
+        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_start_btn(box=box),
+            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(),
             time_out=action_timeout,
         )
 
@@ -244,19 +243,26 @@ def use_skill(self, skill_time):
         return skill_time
 
     def get_round_info(self):
+        """获取并更新当前轮次信息。"""
         if self.in_team():
             return
-        self.sleep(0.5)
+
+        self.sleep(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)
-        if texts:
-            prev_round = self.current_round
-            try:
-                self.current_round = int(texts[0].name)
-            except:
-                return
-            if prev_round != self.current_round:
-                self.info_set("当前轮次", self.current_round)
+
+        prev_round = self.current_round
+        new_round_from_ocr = None
+        if texts and texts[0].name.isdigit():
+            new_round_from_ocr = int(texts[0].name)
+
+        if new_round_from_ocr is not None:
+            self.current_round = new_round_from_ocr
+        elif self.current_round != -1:  # OCR失败，但之前已有轮次记录，则递增
+            self.current_round += 1
+
+        if prev_round != self.current_round:
+            self.info_set("当前轮次", self.current_round)
 
     def get_wave_info(self):
         if not self.in_team():