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

fix(MetaDemon): Update demon encounter image matching

- refresh image templates and matching regions
- set the local test configuration to the test server
blylana 1 неделя назад
Родитель
Сommit
835338cbee

+ 5 - 5
tasks/MetaDemon/assets.py

@@ -12,7 +12,7 @@ class MetaDemonAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# description 
 	# description 
-	I_MD_ENTER = RuleImage(roi_front=(426,463,60,80), roi_back=(239,369,547,215), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_enter.png")
+	I_MD_ENTER = RuleImage(roi_front=(1190,297,37,32), roi_back=(1153,124,127,451), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_enter.png")
 	# description 
 	# description 
 	I_MD_MAIN = RuleImage(roi_front=(658,156,41,139), roi_back=(636,133,100,245), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_main.png")
 	I_MD_MAIN = RuleImage(roi_front=(658,156,41,139), roi_back=(636,133,100,245), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_main.png")
 	# description 
 	# description 
@@ -51,15 +51,15 @@ class MetaDemonAssets:
 	# 右侧进去 
 	# 右侧进去 
 	I_RIGHT_ENTER = RuleImage(roi_front=(1183,314,46,34), roi_back=(1150,131,100,360), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_right_enter.png")
 	I_RIGHT_ENTER = RuleImage(roi_front=(1183,314,46,34), roi_back=(1150,131,100,360), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_right_enter.png")
 	# description 
 	# description 
-	I_ENTER2 = RuleImage(roi_front=(461,265,44,156), roi_back=(428,220,100,258), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter2.png")
+	I_ENTER2 = RuleImage(roi_front=(925,102,44,156), roi_back=(852,20,195,413), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter2.png")
 	# 寻找鬼王 
 	# 寻找鬼王 
 	I_FIND_DEMON = RuleImage(roi_front=(1140,582,86,81), roi_back=(1102,546,132,133), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_find_demon.png")
 	I_FIND_DEMON = RuleImage(roi_front=(1140,582,86,81), roi_back=(1102,546,132,133), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_find_demon.png")
 	# 点击战斗 
 	# 点击战斗 
-	I_BATTLE_DEMON = RuleImage(roi_front=(1131,573,100,100), roi_back=(1085,536,165,161), threshold=0.7, method="Template matching", file="./tasks/MetaDemon/md/md_battle_demon.png")
+	I_BATTLE_DEMON = RuleImage(roi_front=(1133,595,98,54), roi_back=(1085,536,165,161), threshold=0.7, method="Template matching", file="./tasks/MetaDemon/md/md_battle_demon.png")
 	# description 
 	# description 
 	I_BOSS_EMPTY = RuleImage(roi_front=(44,134,88,85), roi_back=(44,134,88,85), threshold=0.7, method="Template matching", file="./tasks/MetaDemon/md/md_boss_empty.png")
 	I_BOSS_EMPTY = RuleImage(roi_front=(44,134,88,85), roi_back=(44,134,88,85), threshold=0.7, method="Template matching", file="./tasks/MetaDemon/md/md_boss_empty.png")
 	# 集结 
 	# 集结 
-	I_BOSS_CONVENE = RuleImage(roi_front=(247,146,47,52), roi_back=(228,127,88,85), threshold=0.7, method="Template matching", file="./tasks/MetaDemon/md/md_boss_convene.png")
+	I_BOSS_CONVENE = RuleImage(roi_front=(251,155,47,52), roi_back=(228,127,88,90), threshold=0.7, method="Template matching", file="./tasks/MetaDemon/md/md_boss_convene.png")
 	# description 
 	# description 
 	I_BOSS_EMPTY_1 = RuleImage(roi_front=(46,372,87,90), roi_back=(46,372,87,90), threshold=0.5, method="Template matching", file="./tasks/MetaDemon/md/md_boss_empty_1.png")
 	I_BOSS_EMPTY_1 = RuleImage(roi_front=(46,372,87,90), roi_back=(46,372,87,90), threshold=0.5, method="Template matching", file="./tasks/MetaDemon/md/md_boss_empty_1.png")
 	# description 
 	# description 
@@ -69,7 +69,7 @@ class MetaDemonAssets:
 	# 空 
 	# 空 
 	I_CRAFTING_EMPTY = RuleImage(roi_front=(939,460,75,81), roi_back=(922,447,108,111), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_empty.png")
 	I_CRAFTING_EMPTY = RuleImage(roi_front=(939,460,75,81), roi_back=(922,447,108,111), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_empty.png")
 	# 一星卡片 
 	# 一星卡片 
-	I_CRAFTING_CARD_STAR_1 = RuleImage(roi_front=(217,156,87,92), roi_back=(191,127,140,137), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_card_star_1.png")
+	I_CRAFTING_CARD_STAR_1 = RuleImage(roi_front=(214,152,87,92), roi_back=(191,127,140,137), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_card_star_1.png")
 	# 开始合成 
 	# 开始合成 
 	I_CRAFTING_START = RuleImage(roi_front=(889,561,140,39), roi_back=(840,521,231,100), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_start.png")
 	I_CRAFTING_START = RuleImage(roi_front=(889,561,140,39), roi_back=(840,521,231,100), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_start.png")
 	# description 
 	# description 

+ 2 - 2
tasks/MetaDemon/md/image.json

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "md_enter",
     "itemName": "md_enter",
     "imageName": "md_md_enter.png",
     "imageName": "md_md_enter.png",
-    "roiFront": "426,463,60,80",
-    "roiBack": "239,369,547,215",
+    "roiFront": "1190,297,37,32",
+    "roiBack": "1153,124,127,451",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"

+ 6 - 6
tasks/MetaDemon/md/image_2025.json

@@ -11,8 +11,8 @@
   {
   {
     "itemName": "enter2",
     "itemName": "enter2",
     "imageName": "md_enter2.png",
     "imageName": "md_enter2.png",
-    "roiFront": "461,265,44,156",
-    "roiBack": "428,220,100,258",
+    "roiFront": "925,102,44,156",
+    "roiBack": "852,20,195,413",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -29,7 +29,7 @@
   {
   {
     "itemName": "battle_demon",
     "itemName": "battle_demon",
     "imageName": "md_battle_demon.png",
     "imageName": "md_battle_demon.png",
-    "roiFront": "1131,573,100,100",
+    "roiFront": "1133,595,98,54",
     "roiBack": "1085,536,165,161",
     "roiBack": "1085,536,165,161",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -47,8 +47,8 @@
   {
   {
     "itemName": "boss_convene",
     "itemName": "boss_convene",
     "imageName": "md_boss_convene.png",
     "imageName": "md_boss_convene.png",
-    "roiFront": "247,146,47,52",
-    "roiBack": "228,127,88,85",
+    "roiFront": "251,155,47,52",
+    "roiBack": "228,127,88,90",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "集结"
     "description": "集结"
@@ -92,7 +92,7 @@
   {
   {
     "itemName": "crafting_card_star_1",
     "itemName": "crafting_card_star_1",
     "imageName": "md_crafting_card_star_1.png",
     "imageName": "md_crafting_card_star_1.png",
-    "roiFront": "217,156,87,92",
+    "roiFront": "214,152,87,92",
     "roiBack": "191,127,140,137",
     "roiBack": "191,127,140,137",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,

BIN
tasks/MetaDemon/md/md_battle_demon.png


BIN
tasks/MetaDemon/md/md_boss_convene.png


BIN
tasks/MetaDemon/md/md_boss_empty.png


BIN
tasks/MetaDemon/md/md_boss_empty_1.png


BIN
tasks/MetaDemon/md/md_crafting_1.png


BIN
tasks/MetaDemon/md/md_crafting_card_star_1.png


BIN
tasks/MetaDemon/md/md_crafting_start.png


BIN
tasks/MetaDemon/md/md_enter2.png


BIN
tasks/MetaDemon/md/md_md_enter.png


BIN
tasks/MetaDemon/md/md_right_enter.png


+ 1 - 1
tasks/MetaDemon/script_task.py

@@ -294,7 +294,7 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
 
 
-    c = Config('oas1')
+    c = Config('体服')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)