修复各种卡住问题, 加快执行速度

Author: ok-oldking

config.py

@@ -5,10 +5,9 @@
     'use_gui': True,
     'config_folder': 'configs',
     'gui_icon': 'icon.png',
-    # 'auth': {
-    #     'app_id': 'ok-ls',
-    #     'trial': True
-    # },
+    'wait_until_before_delay': 0,  # default 1 , for wait_until() function
+    'wait_until_check_delay': 0,
+    'wait_until_settle_time': 0.5,
     'ocr': {
         'lib': 'rapidocr_openvino',
         'target_height': 540
@@ -27,7 +26,6 @@
         'require_bg': True
     },
     'start_timeout': 120,  # default 60
-    'wait_until_before_delay': 2,  # default 1 , for wait_until() function
     'window_size': {
         'width': 1200,
         'height': 800,

requirements.txt

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

src/tasks/BaseGfTask.py

@@ -44,7 +44,7 @@ def skip_dialogs(self, end_match, end_box=None, time_out=120, has_dialog=True):
             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.back()
                 self.sleep(2)
             else:
                 if has_dialog:
@@ -98,9 +98,13 @@ def auto_battle(self, end_match=None, end_box=None, has_dialog=False):
         if results[0].name != '战斗失败':
             self.wait_click_ocr(match='确认', box='bottom_right', raise_if_not_found=False, time_out=5)
         if end_match:
-            match = self.wait_ocr(match=end_match, box=end_box, raise_if_not_found=True, time_out=30)
-            if match:
-                self.log_info(f'battle end matched: {match}')
+            while True:
+                match = self.wait_ocr(match=end_match + pop_ups, box=end_box, raise_if_not_found=True, time_out=30)
+                if match[0].name in pop_ups:
+                    self.back(after_sleep=2)
+                    continue
+                if match:
+                    self.log_info(f'battle end matched: {match}')
         self.sleep(2)
 
     def is_main(self, recheck_time=0, esc=True):
@@ -118,7 +122,7 @@ def is_main(self, recheck_time=0, esc=True):
             return False
         if esc:
             self.back()
-            self.sleep(1)
+            self.sleep(4)
             # self.do_handle_alert()
         self.next_frame()
 
@@ -201,8 +205,6 @@ def wait_pop_up(self, time_out=15, other=None, box='bottom'):
                 check += other
             else:
                 check.append(other)
-        while self.wait_click_ocr(match=pop_ups, box=box, time_out=(time_out - (time.time() - start)),
-                                  after_sleep=2,
-                                  recheck_time=1,
-                                  raise_if_not_found=False):
-            pass
+        while self.wait_ocr(match=pop_ups, box=box, time_out=(time_out - (time.time() - start)),
+                            raise_if_not_found=False):
+            self.back(after_sleep=2)

src/tasks/DailyTask.py

@@ -110,8 +110,10 @@ def activity(self):
             if activities := self.wait_ocr(match=[re.compile(r'^\d+天\d+小时')], box='bottom_left',
                                            raise_if_not_found=False, time_out=4):
                 self.click(activities[0])
-                if self.wait_click_ocr(match=['活动战役', '物资模式'], box='bottom', after_sleep=0.5,
-                                       raise_if_not_found=False, time_out=4, log=True):
+                if to_click := self.wait_ocr(match=['活动战役', '物资模式'], box='bottom',
+                                             raise_if_not_found=False, time_out=4, log=True):
+                    self.sleep(2)
+                    self.click(to_click)
                     battles = self.wait_ocr(match=map_re, time_out=4)
                     if battles:
                         self.click(battles[-1])
@@ -150,7 +152,7 @@ def arena(self):
         self.wait_click_ocr(match=['战役推进'], box='right', after_sleep=0.5, raise_if_not_found=True)
         self.wait_click_ocr(match=['模拟作战'], box='top_right', after_sleep=0.5, raise_if_not_found=True)
         self.wait_click_ocr(match=['实兵演习'], box='bottom', after_sleep=0.5, raise_if_not_found=True)
-        self.wait_pop_up(time_out=4)
+        self.wait_pop_up(time_out=10)
         remaining_count = self.arena_remaining()
         count = 0
         if remaining_count > 1:
@@ -187,7 +189,7 @@ def bingqi(self):
     def guild(self):
         self.info_set('current_task', 'guild')
         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', after_sleep=0.5, raise_if_not_found=True)
+        self.wait_click_ocr(match=['要务'], box='bottom_right', after_sleep=0.5, raise_if_not_found=True, settle_time=2)
         result = self.wait_ocr(match=['开始作战', '每日要务已完成'], box='bottom_right',
                                raise_if_not_found=True, log=True)
         if result[0].name == '开始作战':
@@ -267,8 +269,8 @@ def wait_click_ocr_with_pop_up(self, match, box=None):
 
     def do_wait_pop_up_and_click(self, match, box):
         boxes = self.ocr()
-        if pop_up := find_boxes_by_name(boxes, pop_ups):
-            self.click(pop_up)
+        if find_boxes_by_name(boxes, pop_ups):
+            self.back(after_sleep=2)
             return False
         elif click := find_boxes_by_name(boxes, match):
             if click := find_boxes_within_boundary(click, self.get_box_by_name(box)):
@@ -284,8 +286,8 @@ def wait_ocr_with_possible_pop_up(self, match, box=None, raise_if_not_found=True
 
     def do_wait_ocr_with_possible_pop_up(self, match, box):
         boxes = self.ocr()
-        if pop_up := find_boxes_by_name(boxes, pop_ups):
-            self.click(pop_up)
+        if find_boxes_by_name(boxes, pop_ups):
+            self.back(after_sleep=2)
             return False
         elif click := find_boxes_by_name(boxes, match):
             if box:
@@ -324,9 +326,7 @@ def challenge_arena_opponent(self):
                         self.click(box)
                         self.wait_click_ocr(match=['进攻'], box='bottom_right', after_sleep=0.5,
                                             raise_if_not_found=True)
-                        self.auto_battle()
-                        self.wait_ocr_with_possible_pop_up(match='刷新', box='bottom_right', raise_if_not_found=True,
-                                                           time_out=30)
+                        self.auto_battle(end_match='刷新')
                         self.sleep(3)
                         challenged += 1
                         continue