Merge pull request #1301 from runhey/dev

Dev

Author: runhey

tasks/Component/GeneralBuff/assets.py

@@ -26,9 +26,9 @@ class GeneralBuffAssets:
 	# description 
 	I_EXP_100 = RuleImage(roi_front=(383,406,30,40), roi_back=(368,126,58,386), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_exp_100.png")
 	# description 
-	I_OPEN_YELLOW = RuleImage(roi_front=(772,347,21,21), roi_back=(766,133,35,366), threshold=0.7, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_open_yellow.png")
+	I_OPEN_YELLOW = RuleImage(roi_front=(773,297,17,21), roi_back=(766,133,35,366), threshold=0.6, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_open_yellow.png")
 	# description 
-	I_CLOSE_RED = RuleImage(roi_front=(774,143,21,21), roi_back=(764,134,38,369), threshold=0.63, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_close_red.png")
+	I_CLOSE_RED = RuleImage(roi_front=(773,297,17,21), roi_back=(764,134,38,369), threshold=0.6, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_close_red.png")
 	# 用来判定是否点击的那个 
 	I_CLOUD = RuleImage(roi_front=(357,505,65,38), roi_back=(313,484,158,75), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_cloud.png")
 

tasks/Component/GeneralBuff/gb/gb_close_red.png

@@ -65,19 +65,19 @@
   {
     "itemName": "open_yellow",
     "imageName": "gb_open_yellow.png",
-    "roiFront": "772,347,21,21",
+    "roiFront": "773,297,17,21",
     "roiBack": "766,133,35,366",
     "method": "Template matching",
-    "threshold": 0.7,
+    "threshold": 0.6,
     "description": "description"
   },
   {
     "itemName": "close_red",
     "imageName": "gb_close_red.png",
-    "roiFront": "774,143,21,21",
+    "roiFront": "773,297,17,21",
     "roiBack": "764,134,38,369",
     "method": "Template matching",
-    "threshold": 0.63,
+    "threshold": 0.6,
     "description": "description"
   },
   {

tasks/Component/GeneralBuff/gb/gb_open_yellow.png

@@ -49,9 +49,9 @@ class DokanAssets:
 	# 是否已经成功进入道馆，上面中间的“道馆突破”文字 
 	I_RYOU_DOKAN_CHECK = RuleImage(roi_front=(567,15,144,42), roi_back=(567,15,144,42), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_check.png")
 	# 道馆内式神录 
-	I_RYOU_DOKAN_SHIKIGAMI = RuleImage(roi_front=(960,580,140,120), roi_back=(960,580,140,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_shikigami.png")
+	I_RYOU_DOKAN_SHIKIGAMI = RuleImage(roi_front=(987,608,89,60), roi_back=(987,608,89,60), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_shikigami.png")
 	# 优先攻击选项 
-	I_RYOU_DOKAN_ATTACK_PRIORITY = RuleImage(roi_front=(666,672,58,25), roi_back=(666,672,58,25), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_priority.png")
+	I_RYOU_DOKAN_ATTACK_PRIORITY = RuleImage(roi_front=(742,667,49,25), roi_back=(742,667,49,25), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_priority.png")
 	# 优先攻击: 见习 
 	I_RYOU_DOKAN_ATTACK_PRIORITY_0 = RuleImage(roi_front=(98,170,94,43), roi_back=(98,170,94,43), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_priority_0.png")
 	# 优先攻击: 初级 

tasks/Component/GeneralBuff/gb/image.json

@@ -38,17 +38,17 @@
   {
     "itemName": "ryou_dokan_shikigami",
     "imageName": "res_ryou_dokan_shikigami.png",
-    "roiFront": "960,580,140,120",
-    "roiBack": "960,580,140,120",
+    "roiFront": "987,608,89,60",
+    "roiBack": "987,608,89,60",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "道馆内式神录"
   },
   {
     "itemName": "ryou_dokan_attack_priority",
     "imageName": "res_ryou_dokan_priority.png",
-    "roiFront": "666,672,58,25",
-    "roiBack": "666,672,58,25",
+    "roiFront": "742,667,49,25",
+    "roiBack": "742,667,49,25",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "优先攻击选项"