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

remove changes about ui_click_until_disappear

ChengRanORZ 2 лет назад
Родитель
Сommit
e81caa8bf1
2 измененных файлов с 11 добавлено и 27 удалено
  1. 4 7
      tasks/Restart/login.py
  2. 7 20
      tasks/base_task.py

+ 4 - 7
tasks/Restart/login.py

@@ -1,15 +1,12 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
-import time
 
 
-from tasks.Restart.config_scheduler import Scheduler
-from module.logger import logger
 from module.base.timer import Timer
 from module.base.timer import Timer
-
+from module.exception import RequestHumanTakeover, GameTooManyClickError, GameStuckError
+from module.logger import logger
 from tasks.Restart.assets import RestartAssets
 from tasks.Restart.assets import RestartAssets
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
-from module.exception import TaskEnd, RequestHumanTakeover, GameTooManyClickError, GameStuckError
 
 
 
 
 class LoginHandler(BaseTask, RestartAssets):
 class LoginHandler(BaseTask, RestartAssets):
@@ -101,8 +98,8 @@ class LoginHandler(BaseTask, RestartAssets):
             # 点击屏幕进入游戏
             # 点击屏幕进入游戏
             if self.appear(self.I_LOGIN_SPECIFIC_SERVE, interval=0.6) \
             if self.appear(self.I_LOGIN_SPECIFIC_SERVE, interval=0.6) \
                     and self.ocr_appear_click(self.O_LOGIN_SPECIFIC_SERVE, interval=0.6):
                     and self.ocr_appear_click(self.O_LOGIN_SPECIFIC_SERVE, interval=0.6):
-                self.ui_click_until_disappear(self.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR,
-                                              stop=self.I_LOGIN_SPECIFIC_SERVE, interval=2)
+                self.ui_click(self.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR,
+                              stop=self.I_LOGIN_SPECIFIC_SERVE, interval=2)
                 logger.info('login specific user')
                 logger.info('login specific user')
                 continue
                 continue
             # 点击’进入游戏‘
             # 点击’进入游戏‘

+ 7 - 20
tasks/base_task.py

@@ -584,31 +584,18 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
             elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
                 continue
                 continue
 
 
-    def ui_click_until_disappear(self, click, interval: float = 1, stop: RuleImage | RuleGif = None):
+    def ui_click_until_disappear(self, click, interval: float =1):
         """
         """
-        点击一个按钮直到stop消失
-        如果click为RuleOcr ,直接当作RuleClick点击,不会进行ocr识别,
-        @param interval:
-        @param click:
-        @param stop:
-        @type stop:
-        @return:
+        点击一个按钮直到消失
+        :param interval:
+        :param click:
+        :return:
         """
         """
-        if (isinstance(click, RuleImage) or isinstance(click, RuleGif)) and (stop is None):
-            stop = click
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if not self.appear(stop):
+            if not self.appear(click):
                 break
                 break
-            if isinstance(click, RuleImage) or isinstance(click, RuleGif):
-                self.appear_then_click(click, interval=interval)
-                continue
-            elif isinstance(click, RuleClick):
-                self.click(click, interval)
+            elif self.appear_then_click(click, interval=interval):
                 continue
                 continue
-            elif isinstance(click, RuleOcr):
-                self.click(click)
-                continue
-