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

feat(GameUI): auto register page

Azure 1 год назад
Родитель
Сommit
86fb2078c4
3 измененных файлов с 103 добавлено и 73 удалено
  1. 53 0
      tasks/ActivityShikigami/page.py
  2. 33 21
      tasks/GameUi/game_ui.py
  3. 17 52
      tasks/GameUi/page.py

+ 53 - 0
tasks/ActivityShikigami/page.py

@@ -0,0 +1,53 @@
+from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
+from tasks.GameUi.page import Page, page_main, page_act_list_climb_act, page_reward, random_click, page_failed
+from tasks.GlobalGame.assets import GlobalGameAssets as gga
+from tasks.GameUi.assets import GameUiAssets as G
+from tasks.base_task import BaseTask as BT
+
+# 爬塔活动界面
+page_climb_act = Page(asa.I_BATTLE)
+page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT, asa.I_RED_EXIT_2]
+page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
+page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
+# 爬塔活动副界面
+page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
+page_climb_act_2.additional = [asa.I_ACT_MAP_SWITCH, asa.I_PASS_ACT_LOCAT, asa.I_SKIP_BUTTON, asa.I_RED_EXIT,
+                               asa.I_RED_EXIT_2]
+page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
+page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
+# 门票爬塔活动界面
+page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
+page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT, ]
+page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+page_climb_act_2.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
+# 体力爬塔活动界面
+page_climb_act_ap = Page(asa.I_AP)
+page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD,
+                                asa.I_RED_EXIT]
+page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
+# 体力, 门票互相跳转
+# page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
+# page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
+# 100体爬塔活动界面
+page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
+page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
+page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+# 爬塔活动boss战界面
+page_climb_act_boss = Page(asa.I_CHECK_BOSS)
+page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
+page_climb_act_boss.link(button=G.I_BACK_Y, destination=page_climb_act)
+page_climb_act.link(button=asa.I_BOSS, destination=page_climb_act_boss)
+# 爬塔活动加成界面
+page_climb_act_buff = Page(asa.I_CHECK_BUFF)
+page_climb_act_buff.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
+page_climb_act_buff.link(button=G.I_BACK_Y, destination=page_climb_act)
+page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_buff)
+
+page_reward.link(button=random_click(), destination=page_climb_act_pass)
+page_reward.link(button=random_click(), destination=page_climb_act_ap)
+page_reward.link(button=random_click(), destination=page_climb_act_boss)
+
+page_failed.link(button=random_click(), destination=page_climb_act_pass)
+page_failed.link(button=random_click(), destination=page_climb_act_ap)
+page_failed.link(button=random_click(), destination=page_climb_act_boss)

+ 33 - 21
tasks/GameUi/game_ui.py

@@ -2,11 +2,17 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+
+import importlib
+import pkgutil
+from pathlib import Path
+
 from datetime import datetime
 from time import sleep
 
 import random
 from collections import deque
+from module.atom.click import RuleClick
 from module.atom.gif import RuleGif
 from module.atom.image import RuleImage
 from module.atom.list import RuleList
@@ -15,8 +21,9 @@ from module.base.decorator import run_once
 from module.base.timer import Timer
 from module.exception import (GameNotRunningError, GamePageUnknownError)
 from module.logger import logger
+from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
 from tasks.GameUi.assets import GameUiAssets
-from tasks.GameUi.page import *
+from tasks.GameUi.page import Page, PageRegistry, page_main
 from tasks.Restart.assets import RestartAssets
 from tasks.SixRealms.assets import SixRealmsAssets
 from tasks.base_task import BaseTask
@@ -25,26 +32,6 @@ from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 
 class GameUi(BaseTask, GameUiAssets):
     ui_current: Page = None
-    ui_pages = [
-        # 登录
-        page_login,
-        # 主页
-        page_main, page_summon, page_exploration, page_town,
-        # 探索的
-        page_awake_zones, page_soul_zones, page_realm_raid, page_goryou_realm, page_delegation,
-        page_secret_zones, page_area_boss, page_heian_kitan, page_six_gates, page_bondling_fairyland,
-        page_kekkai_toppa,
-        # 町中的
-        page_duel, page_demon_encounter, page_hunt, page_hunt_kirin, page_draft_duel, page_hyakkisen,
-        # 庭院里面的
-        page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team,
-        page_collection, page_act_list,
-        # 爬塔活动
-        page_act_list_climb_act, page_climb_act, page_climb_act_2, page_climb_act_pass, page_climb_act_ap,
-        page_climb_act_boss, page_climb_act_buff, page_climb_act_ap100,
-        # 战斗
-        page_battle, page_reward, page_failed
-    ]
     ui_close = [GameUiAssets.I_BACK_MALL, GeneralBattleAssets.I_CONFIRM,
                 BaseTask.I_UI_BACK_RED, BaseTask.I_UI_BACK_YELLOW,
                 GameUiAssets.I_BACK_FRIENDS, GameUiAssets.I_BACK_DAILY,
@@ -53,6 +40,31 @@ class GameUi(BaseTask, GameUiAssets):
                 ActivityShikigamiAssets.I_SKIP_BUTTON, ActivityShikigamiAssets.I_RED_EXIT, BaseTask.I_UI_BACK_BLUE,
                 ActivityShikigamiAssets.I_RED_EXIT_2]
 
+    def __init__(self, config, device):
+        super().__init__(config, device)
+        # 初始化时动态导入所有 page 模块
+        self._import_all_pages()
+
+    @staticmethod
+    def _import_all_pages():
+        """动态加载 tasks/**/page.py"""
+        base_dir = Path(__file__).resolve().parent.parent  # tasks 目录
+        for task_dir in base_dir.iterdir():
+            if not task_dir.is_dir():
+                continue
+            page_file = task_dir / "page.py"
+            if not page_file.exists():
+                continue
+            module_name = f"tasks.{task_dir.name}.page"
+            spec = importlib.util.spec_from_file_location(module_name, page_file)
+            if spec and spec.loader:
+                module = importlib.util.module_from_spec(spec)
+                spec.loader.exec_module(module)
+
+    @property
+    def ui_pages(self) -> list[Page]:
+        return PageRegistry.all()
+
     def home_explore(self) -> bool:
         """
         使用ocr识别到探索按钮并点击

+ 17 - 52
tasks/GameUi/page.py

@@ -2,7 +2,7 @@ import random
 
 import traceback
 from module.atom.click import RuleClick
-
+from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
 from tasks.Restart.assets import RestartAssets
@@ -10,6 +10,18 @@ from tasks.base_task import BaseTask as BT
 from tasks.RyouToppa.assets import RyouToppaAssets
 
 
+class PageRegistry:
+    _registry = []
+
+    @classmethod
+    def register(cls, page):
+        cls._registry.append(page)
+
+    @classmethod
+    def all(cls):
+        return list(cls._registry)
+
+
 class Page:
     def __init__(self, check_button, links=None):
         if links is None:
@@ -19,6 +31,7 @@ class Page:
         self.additional: list = None  # 附加按钮或者是ocr检测按钮
         (filename, line_number, function_name, text) = traceback.extract_stack()[-2]
         self.name = text[:text.find('=')].strip()
+        PageRegistry.register(self)
 
     def __eq__(self, other):
         return self.name == other.name
@@ -52,10 +65,6 @@ page_town = Page(G.I_CHECK_TOWN)
 page_town.link(button=G.I_TOWN_GOTO_MAIN, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_TOWN, destination=page_town)
 
-# Unknown
-# page_unknown = Page(None)
-# page_unknown.link(button=G.I_CHECK_MAIN, destination=page_main)
-
 # ************************************* 探索部分 *****************************************#
 # 觉醒 awake zones
 page_awake_zones = Page(G.I_CHECK_AWAKE)
@@ -133,7 +142,6 @@ page_hyakkiyakou = Page(G.I_CHECK_KYAKKIYAKOU)
 page_hyakkiyakou.link(button=G.I_HYAKKIYAKOU_CLOSE, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_HYAKKIYAKOU, destination=page_hyakkiyakou)
 
-
 # ************************************* 庭院部分 *****************************************#
 # 式神录 shikigami_records
 page_shikigami_records = Page(G.I_CHECK_RECORDS)
@@ -162,6 +170,7 @@ page_mall.link(button=G.I_BACK_BLUE, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 # 阴阳寮 guild
 page_guild = Page(G.I_CHECK_GUILD)
+page_guild.additional = [KekkaiUtilizeAssets.I_PLANT_TREE_CLOSE]
 page_guild.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_GUILD, destination=page_guild)
 # 组队 team
@@ -192,51 +201,11 @@ page_dokan.link(button=G.I_BACK_Y, destination=page_main)
 
 # ************************************* 活动部分 *****************************************#
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
-from tasks.GlobalGame.assets import GlobalGameAssets as gga
 
 # 活动列表页爬塔活动
 page_act_list_climb_act = Page(asa.I_CHECK_ACT_LIST_CLIMB_ACT)
 page_act_list.link(button=G.L_ACT_LIST_OCR, destination=page_act_list_climb_act)
 page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
-# 爬塔活动界面
-page_climb_act = Page(asa.I_BATTLE)
-page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT, asa.I_RED_EXIT_2]
-page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
-page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
-# 爬塔活动副界面
-page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
-page_climb_act_2.additional = [asa.I_ACT_MAP_SWITCH, asa.I_PASS_ACT_LOCAT, asa.I_SKIP_BUTTON, asa.I_RED_EXIT,
-                               asa.I_RED_EXIT_2]
-page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
-# 门票爬塔活动界面
-page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
-page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT, ]
-page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
-# 体力爬塔活动界面
-page_climb_act_ap = Page(asa.I_AP)
-page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD,
-                                asa.I_RED_EXIT]
-page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
-# 体力, 门票互相跳转
-# page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
-# page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
-# 100体爬塔活动界面
-page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
-page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
-page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-# 爬塔活动boss战界面
-page_climb_act_boss = Page(asa.I_CHECK_BOSS)
-page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
-page_climb_act_boss.link(button=G.I_BACK_Y, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BOSS, destination=page_climb_act_boss)
-# 爬塔活动加成界面
-page_climb_act_buff = Page(asa.I_CHECK_BUFF)
-page_climb_act_buff.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
-page_climb_act_buff.link(button=G.I_BACK_Y, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_buff)
 
 # ************************************* 战斗部分 *****************************************#
 # 战斗界面
@@ -260,12 +229,8 @@ page_reward = Page(check_button=[GeneralBattleAssets.I_REWARD_PURPLE_SNAKE_SKIN,
                                  GeneralBattleAssets.I_REWARD_EXP_SOUL_4, GeneralBattleAssets.I_WIN,
                                  GeneralBattleAssets.I_REWARD_GOLD, GeneralBattleAssets.I_REWARD_GOLD_SNAKE_SKIN,
                                  GeneralBattleAssets.I_REWARD_SOUL_5, GeneralBattleAssets.I_REWARD_SOUL_6,
-                                 gga.I_UI_REWARD, ],
-                   links={page_climb_act_pass: random_click(), page_climb_act_ap: random_click(),
-                          page_area_boss: random_click(), page_climb_act_boss: random_click()})
+                                 GGA.I_UI_REWARD, ])
 page_reward.additional = [random_click()]
 # 失败界面
-page_failed = Page(check_button=GeneralBattleAssets.I_FALSE,
-                   links={page_climb_act_pass: random_click(), page_climb_act_ap: random_click(),
-                          page_area_boss: random_click(), page_climb_act_boss: random_click()})
+page_failed = Page(GeneralBattleAssets.I_FALSE)
 page_failed.additional = [random_click()]