Преглед изворни кода

add page_ui page_kekkai_toppa to support kekkai toppa recognize.

TripleEarth пре 3 година
родитељ
комит
d519b43e4b

+ 5 - 0
tasks/GameUi/assets.py

@@ -161,6 +161,11 @@ class GameUiAssets:
 	I_REALM_RAID_GOTO_EXPLORATION = RuleImage(roi_front=(1192,107,36,43), roi_back=(1192,107,36,43), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_realm_raid_goto_exploration.png")
 
 
+	# Image Rule Assets
+	# 结界突破文字 
+	I_KEKKAI_TOPPA = RuleImage(roi_front=(570,76,129,40), roi_back=(570,76,129,40), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_kekkai_toppa.png")
+
+
 	# Image Rule Assets
 	# 左上角蓝色的返回 
 	I_BACK_BL = RuleImage(roi_front=(32,31,50,53), roi_back=(1,2,139,120), threshold=0.8, method="Template matching", file="./tasks/GameUi/res/res_back_blue.png")

+ 1 - 1
tasks/GameUi/game_ui.py

@@ -20,7 +20,7 @@ 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_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,
                 # 庭院里面的

+ 4 - 0
tasks/GameUi/page.py

@@ -59,6 +59,10 @@ page_exploration.link(button=G.I_EXPLORATION_GOTO_SOUL_ZONE, destination=page_so
 page_realm_raid = Page(G.I_CHECK_REALM_RAID)
 page_realm_raid.link(button=G.I_REALM_RAID_GOTO_EXPLORATION, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_REALM_RAID, destination=page_realm_raid)
+# 结界突破上方文字 kekkai toppa
+page_kekkai_toppa = Page(G.I_KEKKAI_TOPPA)
+page_kekkai_toppa.link(button=G.I_REALM_RAID_GOTO_EXPLORATION, destination=page_exploration)
+page_exploration.link(button=G.I_EXPLORATION_GOTO_REALM_RAID, destination=page_kekkai_toppa)
 # 御灵 goryou realm
 page_goryou_realm = Page(G.I_CHECK_GORYOU)
 page_goryou_realm.link(button=G.I_BACK_BLUE, destination=page_exploration)

+ 11 - 0
tasks/GameUi/page/page_img_supplement_RyouToppa.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "kekkai_toppa",
+    "imageName": "page_kekkai_toppa.png",
+    "roiFront": "570,76,129,40",
+    "roiBack": "570,76,129,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "结界突破文字"
+  }
+]

BIN
tasks/GameUi/page/page_kekkai_toppa.png


+ 3 - 3
tasks/RyouToppa/script_task.py

@@ -6,7 +6,7 @@ import time
 from tasks.RyouToppa.assets import RyouToppaAssets
 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.GameUi.page import page_realm_raid, page_main, page_kekkai_toppa
 from tasks.RealmRaid.assets import RealmRaidAssets
 from module.logger import logger
 from module.exception import TaskEnd
@@ -27,7 +27,7 @@ class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
         self.medal_grid = ImageGrid([RealmRaidAssets.I_MEDAL_5, RealmRaidAssets.I_MEDAL_4, RealmRaidAssets.I_MEDAL_3,
                                      RealmRaidAssets.I_MEDAL_2, RealmRaidAssets.I_MEDAL_1, RealmRaidAssets.I_MEDAL_0])
         self.ui_get_current_page()
-        self.ui_goto(page_realm_raid)
+        self.ui_goto(page_kekkai_toppa)
         ryou_toppa_start_flag = True
         # 点击突破
         while 1:
@@ -191,7 +191,7 @@ class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
         #     self.run_general_battle_back(config.general_battle_config)
 
         # 打20次
-        for i in range(20):
+        for i in range(30):
             if not self.is_ticket():
                 return False
             if not self.is_target_available():