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

perf(tasks): optimize existing page switch methods

runhey 3 лет назад
Родитель
Сommit
ebf89c10f4
3 измененных файлов с 39 добавлено и 30 удалено
  1. 1 1
      script.py
  2. 23 18
      tasks/AreaBoss/script_task.py
  3. 15 11
      tasks/RealmRaid/script_task.py

+ 1 - 1
script.py

@@ -445,4 +445,4 @@ if __name__ == "__main__":
     script = Script("oas1")
     # print(script.get_next_task())
     # script.run("ActivityShikigami")
-    script.run('AreaBoss')
+    script.run('RealmRaid')

+ 23 - 18
tasks/AreaBoss/script_task.py

@@ -5,12 +5,14 @@ import time
 
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_area_boss
 from tasks.AreaBoss.assets import AreaBossAssets
 from module.logger import logger
 from module.exception import TaskEnd
 
 
-class ScriptTask(GeneralBattle, AreaBossAssets):
+class ScriptTask(GeneralBattle, GameUi, AreaBossAssets):
 
     def run(self) -> bool:
         """
@@ -20,23 +22,26 @@ class ScriptTask(GeneralBattle, AreaBossAssets):
         # 直接手动关闭这个锁定阵容的设置
         self.config.area_boss.general_battle.lock_team_enable = False
 
-        # 点击探索
-        logger.info("Click explore")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_EXPLORE, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_AREA_BOSS, threshold=0.6):
-                break
-
-        # 点击地狱鬼王
-        logger.info("Click area boss")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_AREA_BOSS, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_FILTER, threshold=0.6):
-                break
+        self.ui_get_current_page()
+        self.ui_goto(page_area_boss)
+
+        # # 点击探索
+        # logger.info("Click explore")
+        # while 1:
+        #     self.screenshot()
+        #     if self.appear_then_click(self.I_EXPLORE, threshold=0.6, interval=2):
+        #         continue
+        #     if self.appear(self.I_AREA_BOSS, threshold=0.6):
+        #         break
+        #
+        # # 点击地狱鬼王
+        # logger.info("Click area boss")
+        # while 1:
+        #     self.screenshot()
+        #     if self.appear_then_click(self.I_AREA_BOSS, threshold=0.6, interval=2):
+        #         continue
+        #     if self.appear(self.I_FILTER, threshold=0.6):
+        #         break
 
         # 点击右上角的鬼王选择
         logger.info("Click filter")

+ 15 - 11
tasks/RealmRaid/script_task.py

@@ -6,6 +6,7 @@ import time
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_realm_raid, page_main
 from tasks.RealmRaid.assets import RealmRaidAssets
 from tasks.RealmRaid.config import RealmRaid, RaidMode, AttackNumber
 from module.logger import logger
@@ -24,7 +25,8 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
         config = self.config.realm_raid
         self.medal_grid = ImageGrid([self.I_MEDAL_5, self.I_MEDAL_4, self.I_MEDAL_3,
                                      self.I_MEDAL_2, self.I_MEDAL_1, self.I_MEDAL_0])
-        self.home_explore()
+        self.ui_get_current_page()
+        self.ui_goto(page_realm_raid)
 
         # 点击突破
         while 1:
@@ -72,16 +74,18 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
                     break
 
         # 点击 右上角的关闭
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BACK_RED, interval=1):
-                continue
-            if self.appear(self.I_REALM_RAID, threshold=0.6):
-                break
-        logger.info(f'Click {self.I_BACK_RED.name}')
-
-        # 点击左上角的关闭
-        self.explore_home()
+        # while 1:
+        #     self.screenshot()
+        #     if self.appear_then_click(self.I_BACK_RED, interval=1):
+        #         continue
+        #     if self.appear(self.I_REALM_RAID, threshold=0.6):
+        #         break
+        # logger.info(f'Click {self.I_BACK_RED.name}')
+        #
+        # # 点击左上角的关闭
+        # self.explore_home()
+        self.ui_current = page_realm_raid
+        self.ui_goto(page_main)
 
         self.set_next_run(task='RealmRaid', success=True)
         raise TaskEnd