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

Merge pull request #1738 from Wuuuuulin/agent/fix-budokai-search-wait-v2

fix(BudokaiTournament): avoid repeated search clicks
huangrunheng 3 месяцев назад
Родитель
Сommit
b77b6150de
1 измененных файлов с 13 добавлено и 5 удалено
  1. 13 5
      tasks/BudokaiTournament/script_task.py

+ 13 - 5
tasks/BudokaiTournament/script_task.py

@@ -328,10 +328,19 @@ class ScriptTask(Foot):
                 # self.put_status()
                 # self.put_status()
                 if cnt_scout >= self.conf.daily_training.limit_cultivation_drills:
                 if cnt_scout >= self.conf.daily_training.limit_cultivation_drills:
                     raise LimitCountOut
                     raise LimitCountOut
-                if self.ui_click(self.I_IMG1, stop=self.I_IMG3, interval=1.5, timeout=10):
-                    logger.info(f'Cultivation drill done, for next time {cnt_scout}')
-                    cnt_scout += 1
-                    pass
+                # Click search once, then wait for the boss-detail page without
+                # sending another input during the page transition.
+                if self.appear_then_click(self.I_IMG1, interval=1.5):
+                    transition_timer = Timer(10).start()
+                    while 1:
+                        self.screenshot()
+                        if self.appear(self.I_IMG3) or self.appear(self.I_IMG4):
+                            logger.info(f'Cultivation drill done, for next time {cnt_scout}')
+                            cnt_scout += 1
+                            break
+                        if transition_timer.reached():
+                            logger.warning('Wait cultivation drill boss detail timeout, retry search')
+                            break
                 continue
                 continue
             if not (self.appear(self.I_IMG3) or self.appear(self.I_IMG4)):
             if not (self.appear(self.I_IMG3) or self.appear(self.I_IMG4)):
                 continue
                 continue
@@ -389,4 +398,3 @@ if __name__ == '__main__':
 
 
     t.run()
     t.run()
 
 
-