修复各种卡住问题

Author: ok-oldking

requirements.txt

@@ -53,7 +53,7 @@ numpy==2.1.3
     #   rapidocr-openvino
     #   shapely
 pydirectinput==1.0.4
-ok-script==0.0.458
+ok-script==0.0.460
     # via -r .\requirements.in
 opencv-contrib-python==4.10.0.84
     # via -r .\requirements.in

src/tasks/BaseGfTask.py

@@ -25,13 +25,13 @@ def ensure_main(self, recheck_time=1, time_out=30, esc=True):
         if not self.wait_until(lambda: self.is_main(recheck_time=recheck_time, esc=esc), time_out=time_out):
             raise Exception("请从游戏主页进入")
 
-    def skip_dialogs(self, end_match, end_box=None, time_out=120):
+    def skip_dialogs(self, end_match, end_box=None, time_out=120, has_dialog=True):
         self.info_set('current_task', 'skip_dialogs')
         self.sleep(5)
         start = time.time()
         while time.time() - start < time_out:
             boxes = self.ocr()
-            if skip := self.find_boxes(boxes, match=['跳过'] + pop_ups):
+            if skip := self.find_boxes(boxes, match=['跳过']):
                 self.click(skip)
                 self.sleep(2)
             elif no_alert := self.find_boxes(boxes, match='今日不再提示'):
@@ -43,15 +43,20 @@ def skip_dialogs(self, end_match, end_box=None, time_out=120):
                 return result
             elif self.find_boxes(boxes, match=re.compile(r'回合$'), boundary='top_left'):
                 self.sleep(3)
+            elif pop_up := self.find_boxes(boxes, match=pop_ups):
+                self.click(pop_up)
+                self.sleep(2)
             else:
-                self.click_relative(0.95, 0.04)
+                if has_dialog:
+                    self.click_relative(0.95, 0.04)
                 self.sleep(2)
             self.next_frame()
         raise Exception('跳过剧情超时!')
 
-    def auto_battle(self, end_match=None, end_box=None):
+    def auto_battle(self, end_match=None, end_box=None, has_dialog=False):
         self.info_set('current_task', 'auto battle')
-        result = self.skip_dialogs(end_match=['作战开始', '行动结束'], end_box='bottom', time_out=120)
+        result = self.skip_dialogs(end_match=['作战开始', '行动结束'], end_box='bottom', time_out=120,
+                                   has_dialog=has_dialog)
         if result[0].name == '作战开始':
             self.sleep(2)
             self.click_box(result, after_sleep=1)
@@ -76,7 +81,8 @@ def auto_battle(self, end_match=None, end_box=None):
 
         results = []
         while results := self.skip_dialogs(
-                end_match=['任务完成', '任务失败', '战斗失败', '对战胜利', '对战失败', '确认'], time_out=900):
+                end_match=['任务完成', '任务失败', '战斗失败', '对战胜利', '对战失败', '确认'], time_out=900,
+                has_dialog=has_dialog):
             for result in results:
                 if result.name == '确认':
                     self.click_box(result, after_sleep=2)
@@ -118,14 +124,17 @@ def is_main(self, recheck_time=0, esc=True):
 
     def click(self, x=0, y=0, move_back=False, name=None, interval=-1, move=True,
               down_time=0.01, after_sleep=0):
-        super().click(x, y, move_back=move_back, name=name, move=move, down_time=0.02, after_sleep=after_sleep,
+        frame = self.frame
+        super().click(x, y, move_back=move_back, name=name, move=move, down_time=0.04, after_sleep=after_sleep,
                       interval=interval)
-
-    # def back(self, after_sleep=0):
-    #     if not self.is_adb() and not self.hwnd.visible:
-    #         self.click_relative(0.03, 0.04, after_sleep=after_sleep)
-    #     else:
-    #         super().back(after_sleep=after_sleep)
+        if self.debug:
+            self.screenshot('click', frame=frame)
+
+    def back(self, after_sleep=0):
+        frame = self.frame
+        super().back(after_sleep=after_sleep)
+        if self.debug:
+            self.screenshot('back', frame=frame)
 
     def find_top_right_count(self):
         result = self.ocr(0.89, 0.01, 0.99, 0.1, match=re.compile(r"^\d+/\d+$"), box='top_right')

src/tasks/ClearMapTask.py

@@ -41,7 +41,7 @@ def run(self):
                     self.click(text)
                     count += 1
                     if text[0].name == '挑战':
-                        self.auto_battle(end_match=map_re)
+                        self.auto_battle(end_match=map_re, has_dialog=True)
                     else:
                         self.skip_dialogs(end_match=map_re)
                 else:

src/tasks/DailyTask.py

@@ -14,6 +14,7 @@ def __init__(self, *args, **kwargs):
         self.name = "一键日常"
         self.description = "收菜"
         self.default_config.update({
+            '活动情报补给': True,
             '活动自律': True,
             '公共区': True,
             '购买免费礼包': True,
@@ -36,6 +37,8 @@ def run(self):
         # user32.BlockInput(False)
         # return self.choose_chenyan()
         self.ensure_main(recheck_time=2, time_out=90)
+        if self.config.get('活动情报补给'):
+            self.activity_stamina()
         if self.config.get('活动自律'):
             self.activity()
         if self.config.get('公共区'):
@@ -58,13 +61,24 @@ def run(self):
             self.mail()
         self.log_info('少前2日常完成!', notify=True)
 
+    def activity_stamina(self):
+        self.info_set('current_task', 'activity_stamina')
+        self.wait_click_ocr(match=['活动'], box='bottom_right', after_sleep=0.5, raise_if_not_found=True)
+        if self.wait_click_ocr(match=['情报补给'], box='left', time_out=3,
+                               raise_if_not_found=False, after_sleep=1):
+            while self.wait_click_ocr(match=['领取'], box='bottom_right', time_out=3,
+                                      raise_if_not_found=False, after_sleep=1):
+                self.wait_pop_up(time_out=6)
+        self.ensure_main()
+
     def claim_quest(self):
         self.info_set('current_task', 'claim_quest')
         self.wait_click_ocr(match=['委托'], box='bottom_right', after_sleep=0.5, raise_if_not_found=True)
-        self.wait_click_ocr(match=['一键领取', '无可领取报酬', '已全部领取'], box='bottom_right', time_out=4,
-                            raise_if_not_found=False, after_sleep=1)
+        self.wait_click_ocr(match=['一键领取'], box='bottom', time_out=4,
+                            raise_if_not_found=False, after_sleep=2)
+        # if results and results[0].name == '一键领取':
         results = self.ocr(match=['领取全部', '无可领取报酬', '已全部领取'], box='bottom_left')
-        if results[0] == '领取全部':
+        if results[0].name == '领取全部':
             self.click(results[0])
             self.wait_pop_up(time_out=4)
         self.ensure_main()
@@ -199,9 +213,10 @@ def guild(self):
     def chenyan(self):
         if not self.config.get('尘烟'):
             return
-        end = self.ocr(match=re.compile('后结束'), box='bottom_right')
-        if end:
-            self.click(end, after_sleep=1)
+        end = self.ocr(match=re.compile('后结束$'), box='bottom_right')
+        if not end:
+            return
+        self.click(end, after_sleep=1)
         result = self.ocr(0.89, 0.01, 0.99, 0.1, match=stamina_re, box='top_right')
         if not result:
             raise Exception('找不到尘烟票')
@@ -289,7 +304,7 @@ def challenge_arena_opponent(self):
             if remaining_count <= 1:
                 self.log_info(f'challenge arena complete {remaining_count}')
                 break
-            boxes = self.ocr(0, 0.55, 0.94, 0.62, match=re.compile(r"^[1-9]\d*$"))
+            boxes = self.ocr(0, 0.51, 0.94, 0.59, match=re.compile(r"^[1-9]\d*$"))
             if len(boxes) != 5:
                 if not waited_pop_up:
                     waited_pop_up = True
@@ -312,7 +327,7 @@ def challenge_arena_opponent(self):
                         self.auto_battle()
                         self.wait_ocr_with_possible_pop_up(match='刷新', box='bottom_right', raise_if_not_found=True,
                                                            time_out=30)
-                        self.sleep(1)
+                        self.sleep(3)
                         challenged += 1
                         continue
             if self.ocr(match=['刷新消耗'], box='bottom_right'):