Переглянути джерело

feat(Dokan): optimize cheer

Azure 1 рік тому
батько
коміт
118a60fb57
1 змінених файлів з 11 додано та 2 видалено
  1. 11 2
      tasks/Dokan/script_task.py

+ 11 - 2
tasks/Dokan/script_task.py

@@ -770,7 +770,6 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
         return res_list
 
     def start_cheering(self):
-        logger.info("start cheering")
         cd_text = self.O_DOKEN_FAIL_CD.detect_text(self.device.image)
         match = re.search(r'\d+', cd_text)
         remain_seconds = int(match.group()) if match else None
@@ -778,30 +777,40 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
             logger.info(f'No remain seconds, exit cheering, cd_text[{cd_text}]')
             return
         cheering_timer = Timer(remain_seconds).start()
+        logger.info(f"start cheering, remain seconds:{remain_seconds}s")
         while not cheering_timer.reached():
             self.screenshot()
             # 出现观战标志点击观战
             if self.appear_then_click(self.I_RYOU_DOKAN_CD, interval=0.8):
+                sleep(0.3)  # 等待一下寮排名展示动画
                 continue
             # 寻找前往按钮并点击
             if self.list_appear_click(self.L_GOTO_CHEERING):
                 break
             # 没有找到前往(全军覆没or没人上)则随机点击其他位置关闭弹窗
-            self.click(random_click(), interval=0.8)
+            self.click(random_click(), interval=1.5)
         logger.info('Enter battle to cheer')
+        cheer_cnt = 0
+        self.device.stuck_record_add('PAUSE')
         while not cheering_timer.reached():
             self.screenshot()
             # 道馆成员战斗成功或失败或馆主战结束出现排名, 交给上层处理
             if self.appear(self.I_RYOU_DOKAN_WIN, interval=1) or self.appear(self.I_FALSE) or self.appear(self.I_RYOU_DOKAN_TOPPA_RANK):
+                self.click(random_click(), interval=1)
+                logger.info(f'Cheer finish, count[{cheer_cnt}]')
+                self.device.stuck_record_clear()
                 return
             # 灰色助威
             if self.is_in_battle(False) and self.appear(self.I_RYOU_DOKAN_CHEERING_GRAY, interval=1):
                 continue
             # 亮色助威
             if self.is_in_battle(False) and self.appear_then_click(self.I_RYOU_DOKAN_CHEERING, interval=1.5):
+                cheer_cnt += 1
+                logger.attr(cheer_cnt, f'cheer, count time[{cheering_timer.current():.1f}s]')
                 continue
         # 助威时间到了且道馆还未结束, 则退出观战交给上层重新挑战
         self.exit_battle()
+        self.device.stuck_record_clear()
         return
 
     def update_remain_attack_count(self) -> int: