Merge pull request #54 from li-zheng-hao/master

修复问题
AcademicDog · Mar 8, 2020 · 857c79f · 857c79f
2 parents e02dfc3 + 019de83
commit 857c79f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/explore/explore_leader.py b/explore/explore_leader.py
@@ -105,10 +105,10 @@ def start(self):
             self.log.info('结束本轮探索')
             # 点击退出探索
             self.click_until('退出按钮', 'img/QUE-REN.png',
-                             *TansuoPos.quit_btn, 2)
+                             *TansuoPos.quit_btn, 1)
             # 点击确认
             self.click_until('确认按钮', 'img/QUE-REN.png',
-                             *TansuoPos.confirm_btn, 2, False)
+                             *TansuoPos.confirm_btn, 1, False)
 
             # 等待司机退出1s
             if self.delay:

diff --git a/explore/explore_passenger.py b/explore/explore_passenger.py
@@ -61,8 +61,8 @@ def start(self):
                 self.check_exp_full()
 
                 # 点击准备，直到进入战斗
-                self.click_until_knn('准备按钮', 'img/ZI-DONG.png', *
-                                 TansuoPos.ready_btn, mood.get1mood()/1000, False, 30)
+                self.click_until('准备按钮', 'img/ZI-DONG.png', *
+                                 TansuoPos.ready_btn, mood.get1mood()/1000, True)
 
                 # 检测是否打完
                 state = self.check_end()

diff --git a/gameLib/game_scene.py b/gameLib/game_scene.py
@@ -92,11 +92,11 @@ def switch_to_scene(self, scene):
             if scene == 3:
                 # 点击退出探索
                 self.click_until_multi('退出按钮', 'img/QUE-REN.png', 'img/TAN-SUO.png',
-                                 pos=TansuoPos.quit_btn[0], pos_end=TansuoPos.quit_btn[1], step_time=2)
+                                 pos=TansuoPos.quit_btn[0], pos_end=TansuoPos.quit_btn[1], step_time=0.5)
 
                 # 点击确认
                 self.click_until('确认按钮', 'img\\QUE-REN.png',
-                                 *TansuoPos.confirm_btn, 2, False)
+                                 *TansuoPos.confirm_btn, 1, False)
                 # 递归
                 self.switch_to_scene(scene)