Explorar el Código

fix(TalismanPass): cannot switch to talismanPass when update

Azure hace 1 año
padre
commit
19f1a582d3
Se han modificado 2 ficheros con 3 adiciones y 28 borrados
  1. 0 23
      tasks/GameUi/game_ui.py
  2. 3 5
      tasks/TalismanPass/script_task.py

+ 0 - 23
tasks/GameUi/game_ui.py

@@ -382,29 +382,6 @@ class GameUi(BaseTask, GameUiAssets):
             operated = self.click(target, interval=interval)
         return operated
 
-    # ------------------------------------------------------------------------------------------------------------------
-    # 下面的这些是一些特殊的页面,需要额外处理
-    # ------------------------------------------------------------------------------------------------------------------
-
-    def main_goto_daily(self):
-        """
-        无法直接一步到花合战,需要先到主页,然后再到花合战
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_CHECK_DAILY):
-                break
-            if self.appear_then_click(self.I_MAIN_GOTO_DAILY, interval=1):
-                continue
-            if self.ocr_appear_click(self.O_CLICK_CLOSE_1, interval=1):
-                continue
-            if self.ocr_appear_click(self.O_CLICK_CLOSE_2, interval=1):
-                continue
-        logger.info('Page arrive: Daily')
-        time.sleep(1)
-        return
-
 
 if __name__ == '__main__':
     from module.config.config import Config

+ 3 - 5
tasks/TalismanPass/script_task.py

@@ -12,12 +12,11 @@ from module.logger import logger
 from module.exception import TaskEnd
 from module.base.timer import Timer
 
+
 class ScriptTask(GameUi, TalismanPassAssets):
 
     def run(self):
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
-        self.main_goto_daily()
+        self.ui_goto_page(page_daily)
         con: TalismanConfig = self.config.talisman_pass.talisman
 
         # 收取全部奖励
@@ -27,12 +26,11 @@ class ScriptTask(GameUi, TalismanPassAssets):
         self.get_flower(con.level_reward)
         # 收取1500签御魂
         if con.harvest_soul:
-            self.ui_goto(page_main)
+            self.ui_goto_page(page_main)
             self.harvest_soul()
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         raise TaskEnd('TalismanPass')
 
-
     def get_all(self):
         """
         一键收取所有的