huangrunheng 1 год назад
Родитель
Сommit
c2516e462c

+ 1 - 1
tasks/AreaBoss/assets.py

@@ -101,7 +101,7 @@ class AreaBossAssets:
 	I_AB_JI_FLOOR_TEN = RuleImage(roi_front=(390,370,60,40), roi_back=(390,370,60,40), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_ten.png")
 	# 小组内未取得名次 
 	I_AB_GROUP_RANK_NONE = RuleImage(roi_front=(890,415,95,85), roi_back=(890,415,95,85), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_rank_none.png")
-	# 挑战数进度条
+	# 挑战数进度条 
 	I_AB_NUM_CHALLENGE_RAIL = RuleImage(roi_front=(895,639,14,27), roi_back=(895,639,14,27), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_num_challenge_rail.png")
 
 

+ 11 - 11
tasks/Hyakkiyakou/assets.py

@@ -18,22 +18,22 @@ class HyakkiyakouAssets:
 	# description 
 	C_HSELECT_3 = RuleClick(roi_front=(934,298,115,306), roi_back=(934,298,115,306), name="hselect_3")
 	# description 
-	C_FRIEND_1 = RuleClick(roi_front=(466,227,161,67), roi_back=(466,227,161,67), name="friend_1")
+	C_FRIEND_1 = RuleClick(roi_front=(254,223,161,67), roi_back=(254,223,161,67), name="friend_1")
 	# description 
-	C_FRIEND_2 = RuleClick(roi_front=(738,229,158,64), roi_back=(738,229,158,64), name="friend_2")
+	C_FRIEND_2 = RuleClick(roi_front=(532,226,158,64), roi_back=(532,226,158,64), name="friend_2")
 	# description 
-	C_FRIEND_3 = RuleClick(roi_front=(445,310,183,66), roi_back=(445,310,183,66), name="friend_3")
+	C_FRIEND_3 = RuleClick(roi_front=(240,310,183,66), roi_back=(240,310,183,66), name="friend_3")
 	# description 
-	C_FRIEND_4 = RuleClick(roi_front=(712,311,184,62), roi_back=(712,311,184,62), name="friend_4")
+	C_FRIEND_4 = RuleClick(roi_front=(504,311,184,62), roi_back=(504,311,184,62), name="friend_4")
 	# description 
-	C_FRIEND_5 = RuleClick(roi_front=(449,394,178,61), roi_back=(449,394,178,61), name="friend_5")
+	C_FRIEND_5 = RuleClick(roi_front=(241,395,178,61), roi_back=(241,395,178,61), name="friend_5")
 	# description 
-	C_FRIEND_6 = RuleClick(roi_front=(714,397,182,62), roi_back=(714,397,182,62), name="friend_6")
+	C_FRIEND_6 = RuleClick(roi_front=(508,394,182,62), roi_back=(508,394,182,62), name="friend_6")
 
 
 	# Image Rule Assets
 	# 邀请按钮 
-	I_HINVITE = RuleImage(roi_front=(139,569,63,60), roi_back=(139,569,63,60), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_hinvite.png")
+	I_HINVITE = RuleImage(roi_front=(139,593,63,39), roi_back=(105,535,129,147), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_hinvite.png")
 	# 进入 
 	I_HACCESS = RuleImage(roi_front=(1059,554,100,100), roi_back=(1059,554,100,100), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_haccess.png")
 	# 开始 
@@ -135,13 +135,13 @@ class HyakkiyakouAssets:
 
 	# Image Rule Assets
 	# description 
-	I_FRIEND_SAME_1 = RuleImage(roi_front=(375,122,106,62), roi_back=(375,122,106,62), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
+	I_FRIEND_SAME_1 = RuleImage(roi_front=(167,123,106,62), roi_back=(154,105,132,94), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
 	# description 
-	I_FRIEND_REMOTE_1 = RuleImage(roi_front=(498,125,106,56), roi_back=(498,125,106,56), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
+	I_FRIEND_REMOTE_1 = RuleImage(roi_front=(288,123,106,56), roi_back=(269,106,159,91), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
 	# description 
-	I_FRIEND_SAME_2 = RuleImage(roi_front=(377,126,100,60), roi_back=(377,126,100,60), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
+	I_FRIEND_SAME_2 = RuleImage(roi_front=(168,126,100,60), roi_back=(152,112,133,80), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
 	# description 
-	I_FRIEND_REMOTE_2 = RuleImage(roi_front=(504,127,100,56), roi_back=(504,127,100,56), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
+	I_FRIEND_REMOTE_2 = RuleImage(roi_front=(296,122,100,56), roi_back=(278,115,131,81), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
 
 
 	# Ocr Rule Assets

+ 12 - 12
tasks/Hyakkiyakou/hya/click.json

@@ -19,38 +19,38 @@
   },
   {
     "itemName": "friend_1",
-    "roiFront": "466,227,161,67",
-    "roiBack": "466,227,161,67",
+    "roiFront": "254,223,161,67",
+    "roiBack": "254,223,161,67",
     "description": "description"
   },
   {
     "itemName": "friend_2",
-    "roiFront": "738,229,158,64",
-    "roiBack": "738,229,158,64",
+    "roiFront": "532,226,158,64",
+    "roiBack": "532,226,158,64",
     "description": "description"
   },
   {
     "itemName": "friend_3",
-    "roiFront": "445,310,183,66",
-    "roiBack": "445,310,183,66",
+    "roiFront": "240,310,183,66",
+    "roiBack": "240,310,183,66",
     "description": "description"
   },
   {
     "itemName": "friend_4",
-    "roiFront": "712,311,184,62",
-    "roiBack": "712,311,184,62",
+    "roiFront": "504,311,184,62",
+    "roiBack": "504,311,184,62",
     "description": "description"
   },
   {
     "itemName": "friend_5",
-    "roiFront": "449,394,178,61",
-    "roiBack": "449,394,178,61",
+    "roiFront": "241,395,178,61",
+    "roiBack": "241,395,178,61",
     "description": "description"
   },
   {
     "itemName": "friend_6",
-    "roiFront": "714,397,182,62",
-    "roiBack": "714,397,182,62",
+    "roiFront": "508,394,182,62",
+    "roiBack": "508,394,182,62",
     "description": "description"
   }
 ]

BIN
tasks/Hyakkiyakou/hya/hya_hinvite.png


+ 2 - 2
tasks/Hyakkiyakou/hya/image1.json

@@ -2,8 +2,8 @@
   {
     "itemName": "hinvite",
     "imageName": "hya_hinvite.png",
-    "roiFront": "139,569,63,60",
-    "roiBack": "139,569,63,60",
+    "roiFront": "139,593,63,39",
+    "roiBack": "105,535,129,147",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "邀请按钮"

+ 8 - 8
tasks/Hyakkiyakou/hya/image5.json

@@ -2,8 +2,8 @@
   {
     "itemName": "friend_same_1",
     "imageName": "hya_friend_same_1.png",
-    "roiFront": "375,122,106,62",
-    "roiBack": "375,122,106,62",
+    "roiFront": "167,123,106,62",
+    "roiBack": "154,105,132,94",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -11,8 +11,8 @@
   {
     "itemName": "friend_remote_1",
     "imageName": "hya_friend_remote_1.png",
-    "roiFront": "498,125,106,56",
-    "roiBack": "498,125,106,56",
+    "roiFront": "288,123,106,56",
+    "roiBack": "269,106,159,91",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -20,8 +20,8 @@
   {
     "itemName": "friend_same_2",
     "imageName": "hya_friend_same_2.png",
-    "roiFront": "377,126,100,60",
-    "roiBack": "377,126,100,60",
+    "roiFront": "168,126,100,60",
+    "roiBack": "152,112,133,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "friend_remote_2",
     "imageName": "hya_friend_remote_2.png",
-    "roiFront": "504,127,100,56",
-    "roiBack": "504,127,100,56",
+    "roiFront": "296,122,100,56",
+    "roiBack": "278,115,131,81",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"