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

Merge pull request #553 from yEs1do/feat(GoldYoukai)

金币妖怪等待超时即单刷&打两次
huangrunheng 1 год назад
Родитель
Сommit
0635b45538
1 измененных файлов с 33 добавлено и 26 удалено
  1. 33 26
      tasks/GoldYoukai/script_task.py

+ 33 - 26
tasks/GoldYoukai/script_task.py

@@ -44,32 +44,38 @@ class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul,
             if con.buff_gold_100_click:
             if con.buff_gold_100_click:
                 self.gold_100()
                 self.gold_100()
             self.close_buff()
             self.close_buff()
-        self.ui_get_current_page()
-        self.ui_goto(page_team)
-        self.check_zones('金币妖怪')
-        # 开始
-        if not self.create_room():
-            self.gold_exit(con)
-        self.ensure_public()
-        self.create_ensure()
-        # 进入到了房间里面
-        wait_timer = Timer(60)
-        wait_timer.start()
-        while 1:
-            self.screenshot()
-
-            if not self.is_in_room():
-                continue
-            if wait_timer.reached():
-                logger.warning('Wait for too long, exit')
-                self.exit_room()
-                break
-            if not self.appear(self.I_ADD_5_1):
-                # 有人进来了,可以进行挑战
-                logger.info('There is someone in the room and start the challenge')
-                self.click_fire()
-                self.run_general_battle()
-                break
+        count = 0
+        while count < 2:
+            self.ui_get_current_page()
+            self.ui_goto(page_team)
+            self.check_zones('金币妖怪')
+            # 开始
+            if not self.create_room():
+                self.gold_exit(con)
+            self.ensure_public()
+            self.create_ensure()
+            # 进入到了房间里面
+            wait_timer = Timer(50)
+            wait_timer.start()
+            while 1:
+                self.screenshot()
+
+                if not self.is_in_room():
+                    continue
+                if wait_timer.reached():
+                    # 超过时间依然挑战
+                    logger.warning('Wait for too long and start the challenge')
+                    self.click_fire()
+                    count += 1
+                    self.run_general_battle()
+                    break
+                if not self.appear(self.I_ADD_5_1):
+                    # 有人进来了,可以进行挑战
+                    logger.info('There is someone in the room and start the challenge')
+                    self.click_fire()
+                    count += 1
+                    self.run_general_battle()
+                    break
         # 退出 (要么是在组队界面要么是在庭院)
         # 退出 (要么是在组队界面要么是在庭院)
         self.gold_exit(con)
         self.gold_exit(con)
 
 
@@ -114,6 +120,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul,
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
+
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)