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

fix(GameUi): Restore touch fish page navigation
- register the touch fish page in the shared page definitions
- export the page through the GameUi page facade
- migrate WeeklyTrifles touch fish navigation to goto_page

neptine 1 месяц назад
Родитель
Сommit
5260808165
3 измененных файлов с 20 добавлено и 4 удалено
  1. 14 0
      tasks/GameUi/default_pages.py
  2. 2 0
      tasks/GameUi/page.py
  3. 4 4
      tasks/WeeklyTrifles/script_task.py

+ 14 - 0
tasks/GameUi/default_pages.py

@@ -21,6 +21,7 @@ from tasks.GameUi.page_definition import Page
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
 from tasks.Restart.assets import RestartAssets
 from tasks.RyouToppa.assets import RyouToppaAssets
+from tasks.WeeklyTrifles.assets import WeeklyTriflesAssets
 
 
 def random_click(
@@ -113,6 +114,19 @@ page_guild.add_enter_failure_hooks(conditional_action(condition=GameUiAssets.I_C
 page_guild.connect(page_main, GlobalGameAssets.I_UI_BACK_YELLOW, key="page_guild->page_main")
 page_main.connect(page_guild, GameUiAssets.I_MAIN_GOTO_GUILD, key="page_main->page_guild")
 
+# 摸鱼行动页面。
+page_touch_fish = Page(WeeklyTriflesAssets.I_CHECK_TOUCH_FISH, category="global")
+page_guild.connect(
+    page_touch_fish,
+    WeeklyTriflesAssets.I_GUILD_GOTO_TF,
+    key="page_guild->page_touch_fish",
+)
+page_touch_fish.connect(
+    page_main,
+    WeeklyTriflesAssets.I_WT_TF_GOTO_MAIN,
+    key="page_touch_fish->page_main",
+)
+
 page_shirin = Page(GameUiAssets.I_CHECK_SHRIN, category="global")
 page_guild.connect(page_shirin, GameUiAssets.I_GUILD_TO_SHRIN, key="page_guild->page_shirin")
 page_shirin.connect(page_guild, GlobalGameAssets.I_UI_BACK_YELLOW, key="page_shirin->page_guild")

+ 2 - 0
tasks/GameUi/page.py

@@ -38,6 +38,7 @@ from tasks.GameUi.default_pages import (
     page_mall,
     page_mall_recommend,
     page_onmyodo,
+    page_touch_fish,
     page_realm_raid,
     page_reward,
     page_secret_zones,
@@ -104,6 +105,7 @@ __all__ = [
     "page_mall",
     "page_mall_recommend",
     "page_onmyodo",
+    "page_touch_fish",
     "page_realm_raid",
     "page_reward",
     "page_secret_zones",

+ 4 - 4
tasks/WeeklyTrifles/script_task.py

@@ -76,8 +76,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         :return:
         """
         logger.hr('Touch fish start')
-        self.ui_get_current_page()
-        self.ui_goto(page_guild)
+        self.goto_page(page_guild)
         # 防止入口被折叠
         while 1:
             # 等个折叠窗口展开动画
@@ -88,7 +87,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
             if self.appear(self.I_WT_FOLD_WINDOW):
                 break
         # 保存次数,后续做了也会邮件返还福运御守
-        self.ui_goto(page_touch_fish)
+        self.goto_page(page_touch_fish)
         self.screenshot()
         if self.appear(self.I_WT_SAVE_ALL):
             cu_tickts, _, _ = self.O_WT_LUCKY_TICKETS.ocr(self.device.image)
@@ -126,7 +125,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
                     logger.warning('Touch fish timeout, exit!')
                     break
         logger.hr('Touch fish finished')
-        self.ui_goto(page_main)
+        self.goto_page(page_main)
 
     def _share_collect(self):
         """
@@ -369,6 +368,7 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
+    t.run()
     # t._share_collect()
     t._share_area_boss()
     # t.click_share(t.I_WT_SE_WECHAT)