ChengRanORZ 2 лет назад
Родитель
Сommit
b50f3ca4f4
3 измененных файлов с 25 добавлено и 11 удалено
  1. 15 11
      tasks/GameUi/game_ui.py
  2. 2 0
      tasks/GameUi/page.py
  3. 8 0
      tasks/GameUi/page/page_img.json

+ 15 - 11
tasks/GameUi/game_ui.py

@@ -20,17 +20,21 @@ from module.exception import (GameNotRunningError, GamePageUnknownError, Request
 
 class GameUi(BaseTask, GameUiAssets):
     ui_current: Page = None
-    ui_pages = [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_draft_duel, page_hyakkisen,
-                # 庭院里面的
-                page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team,
-                page_collection
-                ]
+    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_draft_duel, page_hyakkisen,
+        # 庭院里面的
+        page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team,
+        page_collection,
+    ]
     ui_close = [GameUiAssets.I_BACK_MALL,
                 BaseTask.I_UI_BACK_RED, BaseTask.I_UI_BACK_YELLOW, BaseTask.I_UI_BACK_BLUE,
                 GameUiAssets.I_BACK_FRIENDS, GameUiAssets.I_BACK_DAILY,

+ 2 - 0
tasks/GameUi/page.py

@@ -27,6 +27,8 @@ class Page:
         self.links[destination] = button
 
 
+#登录login
+page_login=Page(G.I_CHECK_LOGIN_FORM)
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
 # 召唤summon

+ 8 - 0
tasks/GameUi/page/page_img.json

@@ -9,6 +9,14 @@
     "description": "description"
   },
   {
+    "itemName": "main_scroll_close",
+    "imageName": "page_main_scroll_close.png",
+    "roiFront": "1181,634,28,39",
+    "roiBack": "1162,595,77,112",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "庭院卷轴关闭标识"
+  },  {
     "itemName": "main_goto_exploration",
     "imageName": "page_main_goto_exploration.png",
     "roiFront": "493,116,45,75",