Pārlūkot izejas kodu

fix(Dokan): cheering fail

Azure 1 gadu atpakaļ
vecāks
revīzija
e396fd2319
2 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
  1. 4 4
      tasks/Dokan/script_task.py
  2. 2 2
      tasks/base_task.py

+ 4 - 4
tasks/Dokan/script_task.py

@@ -781,14 +781,14 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
         while not cheering_timer.reached():
             self.screenshot()
             # 出现观战标志点击观战
-            if self.appear_then_click(self.I_RYOU_DOKAN_CD, interval=0.8):
-                sleep(0.3)  # 等待一下寮排名展示动画
+            if self.appear_then_click(self.I_RYOU_DOKAN_CD, interval=2.5):
+                sleep(1)  # 等待一下寮排名展示动画
                 continue
             # 寻找前往按钮并点击
-            if self.list_appear_click(self.L_GOTO_CHEERING):
+            if self.list_appear_click(self.L_GOTO_CHEERING, interval=3, max_swipe=3):
                 break
             # 没有找到前往(全军覆没or没人上)则随机点击其他位置关闭弹窗
-            self.click(random_click(), interval=1.5)
+            self.click(random_click(), interval=5)
         logger.info('Enter battle to cheer')
         cheer_cnt = 0
         self.device.stuck_record_add('PAUSE')

+ 2 - 2
tasks/base_task.py

@@ -516,7 +516,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             return result
         return False
 
-    def list_appear_click(self, target: RuleList, interval: float = None) -> bool:
+    def list_appear_click(self, target: RuleList, interval: float = None, max_swipe: int = 10) -> bool:
         if interval:
             if target.name in self.interval_timer:
                 # 如果传入的限制时间不一样,则替换限制新的传入的时间
@@ -528,7 +528,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             # 如果时间还没到达,则不执行
             if not self.interval_timer[target.name].reached():
                 return False
-        appear = self.list_find(target, name=target.array[0])
+        appear = self.list_find(target, name=target.array[0], max_swipe=max_swipe)
         if isinstance(appear, tuple) and interval:
             x, y = appear
             self.device.click(x, y)