Эх сурвалжийг харах

fix(CostumeShikigami): 缩小预设点击范围
尝试修复第N组有概率切换到N+1组

yuyuyuyuyu 9 сар өмнө
parent
commit
9472384636

+ 7 - 7
tasks/Component/CostumeShikigami/assets.py

@@ -245,19 +245,19 @@ class CostumeShikigamiAssets:
 	# 用于判断是否在式神录里面 
 	I_SOU_CHECK_IN_6 = RuleImage(roi_front=(269,69,50,49), roi_back=(269,69,50,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_in_6.png")
 	# 检查是否为第一组 
-	I_SOU_CHECK_GROUP_1_6 = RuleImage(roi_front=(1078,79,22,52), roi_back=(1078,79,22,52), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_1_6.png")
+	I_SOU_CHECK_GROUP_1_6 = RuleImage(roi_front=(1087,80,22,52), roi_back=(1087,80,22,52), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_1_6.png")
 	# description 
-	I_SOU_CHECK_GROUP_2_6 = RuleImage(roi_front=(1080,149,25,49), roi_back=(1080,149,25,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_2_6.png")
+	I_SOU_CHECK_GROUP_2_6 = RuleImage(roi_front=(1088,152,25,49), roi_back=(1088,152,25,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_2_6.png")
 	# description 
-	I_SOU_CHECK_GROUP_3_6 = RuleImage(roi_front=(1080,221,22,43), roi_back=(1080,221,22,43), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_3_6.png")
+	I_SOU_CHECK_GROUP_3_6 = RuleImage(roi_front=(1089,225,22,43), roi_back=(1089,225,22,43), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_3_6.png")
 	# description 
-	I_SOU_CHECK_GROUP_4_6 = RuleImage(roi_front=(1081,289,21,50), roi_back=(1081,289,21,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_4_6.png")
+	I_SOU_CHECK_GROUP_4_6 = RuleImage(roi_front=(1092,293,21,47), roi_back=(1092,293,21,47), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_4_6.png")
 	# description 
-	I_SOU_CHECK_GROUP_5_6 = RuleImage(roi_front=(1081,360,21,50), roi_back=(1081,360,21,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_5_6.png")
+	I_SOU_CHECK_GROUP_5_6 = RuleImage(roi_front=(1090,361,21,50), roi_back=(1090,361,21,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_5_6.png")
 	# description 
-	I_SOU_CHECK_GROUP_6_6 = RuleImage(roi_front=(1081,428,23,49), roi_back=(1081,428,23,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_6_6.png")
+	I_SOU_CHECK_GROUP_6_6 = RuleImage(roi_front=(1089,429,23,49), roi_back=(1089,429,23,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_6_6.png")
 	# description 
-	I_SOU_CHECK_GROUP_7_6 = RuleImage(roi_front=(1079,500,21,48), roi_back=(1079,500,21,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_7_6.png")
+	I_SOU_CHECK_GROUP_7_6 = RuleImage(roi_front=(1088,502,21,48), roi_back=(1088,502,21,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_7_6.png")
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_6 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_team_present_6.png")
 	# 需要切换的预设按钮(颜色深一点) 

+ 14 - 14
tasks/Component/CostumeShikigami/sk6/image.json

@@ -83,8 +83,8 @@
   {
     "itemName": "sou_check_group_1_6",
     "imageName": "sk6_sou_check_group_1_6.png",
-    "roiFront": "1078,79,22,52",
-    "roiBack": "1078,79,22,52",
+    "roiFront": "1087,80,22,52",
+    "roiBack": "1087,80,22,52",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "检查是否为第一组"
@@ -92,8 +92,8 @@
   {
     "itemName": "sou_check_group_2_6",
     "imageName": "sk6_sou_check_group_2_6.png",
-    "roiFront": "1080,149,25,49",
-    "roiBack": "1080,149,25,49",
+    "roiFront": "1088,152,25,49",
+    "roiBack": "1088,152,25,49",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -101,8 +101,8 @@
   {
     "itemName": "sou_check_group_3_6",
     "imageName": "sk6_sou_check_group_3_6.png",
-    "roiFront": "1080,221,22,43",
-    "roiBack": "1080,221,22,43",
+    "roiFront": "1089,225,22,43",
+    "roiBack": "1089,225,22,43",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -110,8 +110,8 @@
   {
     "itemName": "sou_check_group_4_6",
     "imageName": "sk6_sou_check_group_4_6.png",
-    "roiFront": "1081,289,21,50",
-    "roiBack": "1081,289,21,50",
+    "roiFront": "1092,293,21,47",
+    "roiBack": "1092,293,21,47",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -119,8 +119,8 @@
   {
     "itemName": "sou_check_group_5_6",
     "imageName": "sk6_sou_check_group_5_6.png",
-    "roiFront": "1081,360,21,50",
-    "roiBack": "1081,360,21,50",
+    "roiFront": "1090,361,21,50",
+    "roiBack": "1090,361,21,50",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -128,8 +128,8 @@
   {
     "itemName": "sou_check_group_6_6",
     "imageName": "sk6_sou_check_group_6_6.png",
-    "roiFront": "1081,428,23,49",
-    "roiBack": "1081,428,23,49",
+    "roiFront": "1089,429,23,49",
+    "roiBack": "1089,429,23,49",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -137,8 +137,8 @@
   {
     "itemName": "sou_check_group_7_6",
     "imageName": "sk6_sou_check_group_7_6.png",
-    "roiFront": "1079,500,21,48",
-    "roiBack": "1079,500,21,48",
+    "roiFront": "1088,502,21,48",
+    "roiBack": "1088,502,21,48",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_1_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_2_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_3_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_4_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_5_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_6_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_check_group_7_6.png


+ 7 - 7
tasks/Component/SwitchSoul/assets.py

@@ -12,19 +12,19 @@ class SwitchSoulAssets:
 
 	# Click Rule Assets
 	# description 
-	C_SOU_GROUP_1 = RuleClick(roi_front=(1086,85,158,67), roi_back=(1086,85,158,67), name="sou_group_1")
+	C_SOU_GROUP_1 = RuleClick(roi_front=(1086,85,158,47), roi_back=(1086,85,158,47), name="sou_group_1")
 	# description 
-	C_SOU_GROUP_2 = RuleClick(roi_front=(1087,155,162,62), roi_back=(1087,155,162,62), name="sou_group_2")
+	C_SOU_GROUP_2 = RuleClick(roi_front=(1087,155,162,48), roi_back=(1087,155,162,48), name="sou_group_2")
 	# description 
-	C_SOU_GROUP_3 = RuleClick(roi_front=(1088,226,154,61), roi_back=(1088,226,154,61), name="sou_group_3")
+	C_SOU_GROUP_3 = RuleClick(roi_front=(1088,226,154,49), roi_back=(1088,226,154,49), name="sou_group_3")
 	# description 
-	C_SOU_GROUP_4 = RuleClick(roi_front=(1087,297,157,59), roi_back=(1087,297,157,59), name="sou_group_4")
+	C_SOU_GROUP_4 = RuleClick(roi_front=(1087,297,157,46), roi_back=(1087,297,157,46), name="sou_group_4")
 	# description 
-	C_SOU_GROUP_5 = RuleClick(roi_front=(1087,365,154,62), roi_back=(1087,365,154,62), name="sou_group_5")
+	C_SOU_GROUP_5 = RuleClick(roi_front=(1087,365,154,47), roi_back=(1087,365,154,47), name="sou_group_5")
 	# description 
-	C_SOU_GROUP_6 = RuleClick(roi_front=(1088,437,156,57), roi_back=(1088,437,156,57), name="sou_group_6")
+	C_SOU_GROUP_6 = RuleClick(roi_front=(1088,437,156,46), roi_back=(1088,437,156,46), name="sou_group_6")
 	# description 
-	C_SOU_GROUP_7 = RuleClick(roi_front=(1090,505,156,62), roi_back=(1090,505,156,62), name="sou_group_7")
+	C_SOU_GROUP_7 = RuleClick(roi_front=(1090,505,156,51), roi_back=(1090,505,156,51), name="sou_group_7")
 	# 阵容选择按钮位置 
 	C_SOU_TEAM_SELECT = RuleClick(roi_front=(977,157,21,21), roi_back=(977,157,21,21), name="sou_team_select")
 

+ 14 - 14
tasks/Component/SwitchSoul/ss/click.json

@@ -1,44 +1,44 @@
 [
   {
     "itemName": "sou_group_1",
-    "roiFront": "1086,85,158,67",
-    "roiBack": "1086,85,158,67",
+    "roiFront": "1086,85,158,47",
+    "roiBack": "1086,85,158,47",
     "description": "description"
   },
   {
     "itemName": "sou_group_2",
-    "roiFront": "1087,155,162,62",
-    "roiBack": "1087,155,162,62",
+    "roiFront": "1087,155,162,48",
+    "roiBack": "1087,155,162,48",
     "description": "description"
   },
   {
     "itemName": "sou_group_3",
-    "roiFront": "1088,226,154,61",
-    "roiBack": "1088,226,154,61",
+    "roiFront": "1088,226,154,49",
+    "roiBack": "1088,226,154,49",
     "description": "description"
   },
   {
     "itemName": "sou_group_4",
-    "roiFront": "1087,297,157,59",
-    "roiBack": "1087,297,157,59",
+    "roiFront": "1087,297,157,46",
+    "roiBack": "1087,297,157,46",
     "description": "description"
   },
   {
     "itemName": "sou_group_5",
-    "roiFront": "1087,365,154,62",
-    "roiBack": "1087,365,154,62",
+    "roiFront": "1087,365,154,47",
+    "roiBack": "1087,365,154,47",
     "description": "description"
   },
   {
     "itemName": "sou_group_6",
-    "roiFront": "1088,437,156,57",
-    "roiBack": "1088,437,156,57",
+    "roiFront": "1088,437,156,46",
+    "roiBack": "1088,437,156,46",
     "description": "description"
   },
   {
     "itemName": "sou_group_7",
-    "roiFront": "1090,505,156,62",
-    "roiBack": "1090,505,156,62",
+    "roiFront": "1090,505,156,51",
+    "roiBack": "1090,505,156,51",
     "description": "description"
   },
   {