ソースを参照

Merge pull request #997 from yEs1do/feat(Page_change)

探索界面兼容体服坐标&其他界面问题
huangrunheng 1 年間 前
親
コミット
0b1ebbacb9

+ 19 - 19
tasks/GameUi/assets.py

@@ -38,32 +38,32 @@ class GameUiAssets:
 	I_MAIN_GOTO_EXPLORATION = RuleImage(roi_front=(493,116,45,75), roi_back=(243,100,933,211), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_main_goto_exploration.png")
 	# description 
 	I_CHECK_EXPLORATION = RuleImage(roi_front=(1146,175,21,22), roi_back=(1146,175,21,22), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_exploration.png")
-	# description 
+	# 探索前往觉醒 
 	I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(57,628,57,61), roi_back=(33,619,113,79), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
-	# description 
+	# 探索前往御魂 
 	I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(159,633,55,55), roi_back=(138,620,89,75), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
-	# description 
-	I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,102,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
-	# 前往御灵 
-	I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(346,626,60,67), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
-	# 式神委派 
-	I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(445,638,60,50), roi_back=(445,638,60,50), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
-	# 秘闻 
-	I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(546,628,61,55), roi_back=(524,614,100,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
-	# 地狱鬼王 
-	I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(640,638,51,45), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
-	# 平安奇谭 
-	I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,52,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
-	# 六道之门 
-	I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(838,640,60,49), roi_back=(818,631,200,66), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
-	# 器灵 
-	I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(937,639,56,49), roi_back=(928,633,203,64), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
+	# 探索前往结界突破 
+	I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,203,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
+	# 探索前往御灵 
+	I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(346,626,178,67), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
+	# 探索前往式神委派 
+	I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(445,638,60,50), roi_back=(445,638,180,50), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
+	# 探索前往秘闻 
+	I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(546,628,61,55), roi_back=(524,614,200,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
+	# 探索前往地域鬼王 
+	I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(640,638,180,45), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
+	# 探索前往平安奇谭 
+	I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,180,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
+	# 探索前往六道之门 
+	I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(938,640,60,49), roi_back=(918,631,200,66), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
+	# 探索前往契灵之境 
+	I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(1037,639,56,49), roi_back=(1018,633,203,64), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
 	# description 
 	I_BACK_BLUE = RuleImage(roi_front=(32,37,54,52), roi_back=(3,2,130,114), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_blue.png")
 	# description 
 	I_CHECK_AWAKE = RuleImage(roi_front=(376,565,73,82), roi_back=(376,565,73,82), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_awake.png")
 	# description 
-	I_CHECK_SOUL_ZONES = RuleImage(roi_front=(49,105,298,405), roi_back=(49,105,298,405), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
+	I_CHECK_SOUL_ZONES = RuleImage(roi_front=(49,186,298,237), roi_back=(49,186,298,237), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
 	# description 
 	I_CHECK_REALM_RAID = RuleImage(roi_front=(129,632,52,48), roi_back=(66,526,233,188), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_realm_raid.png")
 	# description 

+ 6 - 6
tasks/GameUi/page.py

@@ -78,11 +78,11 @@ page_exploration.link(button=G.I_EXPLORATION_GOTO_DELEGATION, destination=page_d
 page_secret_zones = Page(G.I_CHECK_SECRET_ZONES)
 page_secret_zones.link(button=G.I_BACK_BLUE, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_SECRET_ZONES, destination=page_secret_zones)
-# 地狱鬼王 area boss
+# 地域鬼王 area boss
 page_area_boss = Page(G.I_CHECK_AREA_BOSS)
 page_area_boss.link(button=G.I_BACK_BLUE, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_AREA_BOSS, destination=page_area_boss)
-# 平安奇谭
+# 平安奇谭 heian kitan
 page_heian_kitan = Page(G.I_CHECK_HEIAN_KITAN)
 page_heian_kitan.link(button=G.I_CHECK_HEIAN_KITAN, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_HEIAN_KITAN, destination=page_heian_kitan)
@@ -90,17 +90,17 @@ page_exploration.link(button=G.I_EXPLORATION_GOTO_HEIAN_KITAN, destination=page_
 page_six_gates = Page(G.I_CHECK_SIX_GATES)
 page_six_gates.link(button=G.I_SIX_GATES_GOTO_EXPLORATION, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_SIX_GATES, destination=page_six_gates)
-# 器灵 bondling_fairyland
+# 契灵之境 bondling fairyland
 page_bondling_fairyland = Page(G.I_CHECK_BONDLING_FAIRYLAND)
 page_bondling_fairyland.link(button=G.I_BACK_YOLLOW, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_BONDLING_FAIRYLAND, destination=page_bondling_fairyland)
 
 # ************************************* 町中部分 *****************************************#
-# 斗鸡 duel
+# 斗技 duel
 page_duel = Page(G.I_CHECK_DUEL)
 page_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
-# 封魔之时 demon_encounter
+# 逢魔之时 demon_encounter
 page_demon_encounter = Page(G.I_CHECK_DEMON_ENCOUNTER)
 page_demon_encounter.link(button=G.I_DEMON_ENCOUNTER_GOTO_TOWN, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DEMON_ENCOUNTER, destination=page_demon_encounter)
@@ -112,7 +112,7 @@ page_town.link(button=G.I_TOWN_GOTO_HUNT, destination=page_hunt)
 page_draft_duel = Page(G.I_CHECK_DRAFT_DUEL)
 page_draft_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DRAFT_DUEL, destination=page_draft_duel)
-# 百鬼奕 hyakkisen
+# 百鬼弈 hyakkisen
 page_hyakkisen = Page(G.I_CHECK_HYAKKISEN)
 page_hyakkisen.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_HYAKKISEN, destination=page_hyakkisen)

BIN
tasks/GameUi/page/page_check_soul_zones.png


+ 22 - 22
tasks/GameUi/page/page_img.json

@@ -42,7 +42,7 @@
     "roiBack": "33,619,113,79",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "探索前往觉醒"
   },
   {
     "itemName": "exploration_goto_soul_zone",
@@ -51,79 +51,79 @@
     "roiBack": "138,620,89,75",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "探索前往御魂"
   },
   {
     "itemName": "exploration_goto_realm_raid",
     "imageName": "page_exploration_goto_realm_raid.png",
     "roiFront": "248,636,67,48",
-    "roiBack": "229,612,102,87",
+    "roiBack": "229,612,203,87",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "探索前往结界突破"
   },
   {
     "itemName": "exploration_goto_goryou_realm",
     "imageName": "page_exploration_goto_goryou_realm.png",
     "roiFront": "353,639,47,45",
-    "roiBack": "346,626,60,67",
+    "roiBack": "346,626,178,67",
     "method": "Template matching",
     "threshold": 0.7,
-    "description": "前往御灵"
+    "description": "探索前往御灵"
   },
   {
     "itemName": "exploration_goto_delegation",
     "imageName": "page_exploration_goto_delegation.png",
     "roiFront": "445,638,60,50",
-    "roiBack": "445,638,60,50",
+    "roiBack": "445,638,180,50",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "式神委派"
+    "description": "探索前往式神委派"
   },
   {
     "itemName": "exploration_goto_secret_zones",
     "imageName": "page_exploration_goto_secret_zones.png",
     "roiFront": "546,628,61,55",
-    "roiBack": "524,614,100,87",
+    "roiBack": "524,614,200,87",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "秘闻"
+    "description": "探索前往秘闻"
   },
   {
     "itemName": "exploration_goto_area_boss",
     "imageName": "page_exploration_goto_area_boss.png",
     "roiFront": "640,638,51,45",
-    "roiBack": "640,638,51,45",
+    "roiBack": "640,638,180,45",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "地狱鬼王"
+    "description": "探索前往地域鬼王"
   },
   {
     "itemName": "exploration_goto_heian_kitan",
     "imageName": "page_exploration_goto_heian_kitan.png",
     "roiFront": "739,643,52,44",
-    "roiBack": "739,643,52,44",
+    "roiBack": "739,643,180,44",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "平安奇谭"
+    "description": "探索前往平安奇谭"
   },
   {
     "itemName": "exploration_goto_six_gates",
     "imageName": "page_exploration_goto_six_gates.png",
-    "roiFront": "838,640,60,49",
-    "roiBack": "818,631,200,66",
+    "roiFront": "938,640,60,49",
+    "roiBack": "918,631,200,66",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "六道之门"
+    "description": "探索前往六道之门"
   },
   {
     "itemName": "exploration_goto_bondling_fairyland",
     "imageName": "page_exploration_goto_bondling_fairyland.png",
-    "roiFront": "937,639,56,49",
-    "roiBack": "928,633,203,64",
+    "roiFront": "1037,639,56,49",
+    "roiBack": "1018,633,203,64",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "器灵"
+    "description": "探索前往契灵之境"
   },
   {
     "itemName": "back_blue",
@@ -146,8 +146,8 @@
   {
     "itemName": "check_soul_zones",
     "imageName": "page_check_soul_zones.png",
-    "roiFront": "49,105,298,405",
-    "roiBack": "49,105,298,405",
+    "roiFront": "49,186,298,237",
+    "roiBack": "49,186,298,237",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 1 - 1
tasks/HeroTest/as/image.json

@@ -12,7 +12,7 @@
     "itemName": "two",
     "imageName": "as_two.png",
     "roiFront": "819,685,95,26",
-    "roiBack": "819,685,95,26",
+    "roiBack": "819,685,200,26",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入活动第二步"

+ 1 - 1
tasks/HeroTest/assets.py

@@ -14,7 +14,7 @@ class HeroTestAssets:
 	# 进入活动第一步 
 	I_ONE = RuleImage(roi_front=(633,106,88,105), roi_back=(633,106,88,105), threshold=0.7, method="Template matching", file="./tasks/HeroTest/as/as_one.png")
 	# 进入活动第二步 
-	I_TWO = RuleImage(roi_front=(819,685,95,26), roi_back=(819,685,95,26), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_two.png")
+	I_TWO = RuleImage(roi_front=(819,685,95,26), roi_back=(819,685,200,26), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_two.png")
 	# 点击鬼兵演武 
 	I_GBB = RuleImage(roi_front=(95,344,37,131), roi_back=(95,344,37,131), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_gbb.png")
 	# 爬塔返回按钮