Просмотр исходного кода

fix(task): Can not swipe while window control method

runhey 3 лет назад
Родитель
Сommit
b3cf3a3c20
2 измененных файлов с 20 добавлено и 8 удалено
  1. 15 5
      tasks/CollectiveMissions/script_task.py
  2. 5 3
      tasks/base_task.py

+ 15 - 5
tasks/CollectiveMissions/script_task.py

@@ -2,6 +2,7 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+import random
 import re
 from cached_property import cached_property
 from enum import Enum
@@ -232,21 +233,30 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
             3: self.I_CM_ADD_4,
         }
         # 滑动到最多的材料
+        random_click = [self.I_CM_ADD_1, self.I_CM_ADD_2, self.I_CM_ADD_3, self.I_CM_ADD_4]
+        window_control = self.config.script.device.control_method == 'window_message'
         swipe_count = 0
+        click_count = 0
         while 1:
             self.screenshot()
             if self.appear(self.I_CM_MATTER):
                 break
-            if self.swipe(match_swipe[max_index], interval=2.5):
+            if not window_control and self.swipe(match_swipe[max_index], interval=2.5):
                 swipe_count += 1
                 time.sleep(1.5)
                 continue
-            # if self.appear_then_click(match_image[max_index], interval=1):
-            #     self.device.click_record_clear()
-            #     continue
 
             # 为什么使用window_message无法滑动
-            if swipe_count >= 5:
+            if window_control and click_count > 30:
+                logger.info('Swipe to the most matter failed')
+                logger.info('Please check your game resolution')
+                break
+            if window_control and self.click(random.choice(random_click), interval=0.7):
+                click_count += 1
+                continue
+
+
+            if not window_control and swipe_count >= 5:
                 logger.info('Swipe to the most matter failed')
                 logger.info('Please check your game resolution')
                 raise RequestHumanTakeover

+ 5 - 3
tasks/base_task.py

@@ -283,7 +283,7 @@ class BaseTask(GlobalGameAssets):
             # logger.info(f'Swipe {swipe.name}')
             self.interval_timer[swipe.name].reset()
 
-    def click(self, click: Union[RuleClick, RuleLongClick] = None, interval: float = None) -> None:
+    def click(self, click: Union[RuleClick, RuleLongClick] = None, interval: float = None) -> bool:
         """
         点击或者长按
         :param interval:
@@ -291,7 +291,7 @@ class BaseTask(GlobalGameAssets):
         :return:
         """
         if not click:
-            return
+            return False
 
         if interval:
             if click.name in self.interval_timer:
@@ -303,7 +303,7 @@ class BaseTask(GlobalGameAssets):
                 self.interval_timer[click.name] = Timer(interval)
             # 如果时间还没到达,则不执行
             if not self.interval_timer[click.name].reached():
-                return
+                return False
 
         x, y = click.coord()
         if isinstance(click, RuleLongClick):
@@ -314,6 +314,8 @@ class BaseTask(GlobalGameAssets):
         # 执行后,如果有限制时间,则重置限制时间
         if interval:
             self.interval_timer[click.name].reset()
+            return True
+        return False
 
     def ocr_appear(self, target: RuleOcr, interval: float = None) -> bool:
         """