yEs1do 1 год назад
Родитель
Сommit
3bb46b80f4
3 измененных файлов с 32 добавлено и 32 удалено
  1. 12 12
      tasks/WantedQuests/assets.py
  2. 16 16
      tasks/WantedQuests/ocr.json
  3. 4 4
      tasks/WantedQuests/wq/image.json

+ 12 - 12
tasks/WantedQuests/assets.py

@@ -37,21 +37,21 @@ class WantedQuestsAssets:
 	# 备用识别2 
 	O_WQ_NUM_UNKNOWN_2 = RuleOcr(roi=(34,406,65,24), area=(34,406,65,24), mode="Digit", method="Default", keyword="", name="wq_num_unknown_2")
 	# Ocr-description 
-	O_WQ_TYPE_1 = RuleOcr(roi=(544,238,55,36), area=(544,238,55,36), mode="Single", method="Default", keyword="", name="wq_type_1")
+	O_WQ_TYPE_1 = RuleOcr(roi=(544,248,55,36), area=(544,248,55,36), mode="Single", method="Default", keyword="", name="wq_type_1")
 	# Ocr-description 
-	O_WQ_TYPE_2 = RuleOcr(roi=(544,311,55,30), area=(544,311,55,30), mode="Single", method="Default", keyword="", name="wq_type_2")
+	O_WQ_TYPE_2 = RuleOcr(roi=(544,321,55,30), area=(544,321,55,30), mode="Single", method="Default", keyword="", name="wq_type_2")
 	# Ocr-description 
-	O_WQ_TYPE_3 = RuleOcr(roi=(544,382,54,30), area=(544,382,54,30), mode="Single", method="Default", keyword="", name="wq_type_3")
+	O_WQ_TYPE_3 = RuleOcr(roi=(544,392,54,30), area=(544,392,54,30), mode="Single", method="Default", keyword="", name="wq_type_3")
 	# Ocr-description 
-	O_WQ_TYPE_4 = RuleOcr(roi=(545,452,52,32), area=(545,452,52,32), mode="Single", method="Default", keyword="", name="wq_type_4")
+	O_WQ_TYPE_4 = RuleOcr(roi=(545,462,52,32), area=(545,462,52,32), mode="Single", method="Default", keyword="", name="wq_type_4")
 	# Ocr-description 
-	O_WQ_INFO_1 = RuleOcr(roi=(609,236,309,45), area=(609,236,309,45), mode="Single", method="Default", keyword="", name="wq_info_1")
+	O_WQ_INFO_1 = RuleOcr(roi=(609,246,309,45), area=(609,246,309,45), mode="Single", method="Default", keyword="", name="wq_info_1")
 	# Ocr-description 
-	O_WQ_INFO_2 = RuleOcr(roi=(612,308,298,41), area=(612,308,298,41), mode="Single", method="Default", keyword="", name="wq_info_2")
+	O_WQ_INFO_2 = RuleOcr(roi=(612,318,298,41), area=(612,318,298,41), mode="Single", method="Default", keyword="", name="wq_info_2")
 	# Ocr-description 
-	O_WQ_INFO_3 = RuleOcr(roi=(612,376,305,44), area=(612,376,305,44), mode="Single", method="Default", keyword="", name="wq_info_3")
+	O_WQ_INFO_3 = RuleOcr(roi=(612,386,305,44), area=(612,386,305,44), mode="Single", method="Default", keyword="", name="wq_info_3")
 	# Ocr-description 
-	O_WQ_INFO_4 = RuleOcr(roi=(613,446,315,44), area=(613,446,315,44), mode="Single", method="Default", keyword="", name="wq_info_4")
+	O_WQ_INFO_4 = RuleOcr(roi=(613,456,315,44), area=(613,456,315,44), mode="Single", method="Default", keyword="", name="wq_info_4")
 	# 怪物名称,如酒吞,阎魔等 
 	O_WQ_MONSTER_TYPE = RuleOcr(roi=(165,215,45,175), area=(165,215,45,175), mode="Full", method="Default", keyword="", name="wq_monster_type")
 	#  
@@ -153,13 +153,13 @@ class WantedQuestsAssets:
 	# 小号不追踪 
 	I_TRACE_FALSE = RuleImage(roi_front=(170,186,31,32), roi_back=(170,186,31,32), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_trace_false.png")
 	# description 
-	I_GOTO_1 = RuleImage(roi_front=(978,234,87,45), roi_back=(978,234,87,45), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_1.png")
+	I_GOTO_1 = RuleImage(roi_front=(978,234,87,45), roi_back=(978,234,87,60), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_1.png")
 	# description 
-	I_GOTO_2 = RuleImage(roi_front=(979,305,88,43), roi_back=(979,305,88,43), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_2.png")
+	I_GOTO_2 = RuleImage(roi_front=(979,305,88,43), roi_back=(979,305,88,58), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_2.png")
 	# description 
-	I_GOTO_3 = RuleImage(roi_front=(979,373,88,47), roi_back=(979,373,88,47), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_3.png")
+	I_GOTO_3 = RuleImage(roi_front=(979,373,88,47), roi_back=(979,373,88,62), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_3.png")
 	# description 
-	I_GOTO_4 = RuleImage(roi_front=(979,447,87,42), roi_back=(979,447,87,42), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_4.png")
+	I_GOTO_4 = RuleImage(roi_front=(979,447,87,42), roi_back=(979,447,87,57), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_4.png")
 	# 判断是否还有任务 
 	I_WQ_CHECK_TASK = RuleImage(roi_front=(110,154,21,125), roi_back=(73,122,69,459), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_wq_check_task.png")
 	# 庭院悬赏任务界面 单个任务点开后 左上角是否追踪 

+ 16 - 16
tasks/WantedQuests/ocr.json

@@ -73,8 +73,8 @@
   },
   {
     "itemName": "wq_type_1",
-    "roiFront": "544,238,55,36",
-    "roiBack": "544,238,55,36",
+    "roiFront": "544,248,55,36",
+    "roiBack": "544,248,55,36",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -82,8 +82,8 @@
   },
   {
     "itemName": "wq_type_2",
-    "roiFront": "544,311,55,30",
-    "roiBack": "544,311,55,30",
+    "roiFront": "544,321,55,30",
+    "roiBack": "544,321,55,30",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -91,8 +91,8 @@
   },
   {
     "itemName": "wq_type_3",
-    "roiFront": "544,382,54,30",
-    "roiBack": "544,382,54,30",
+    "roiFront": "544,392,54,30",
+    "roiBack": "544,392,54,30",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -100,8 +100,8 @@
   },
   {
     "itemName": "wq_type_4",
-    "roiFront": "545,452,52,32",
-    "roiBack": "545,452,52,32",
+    "roiFront": "545,462,52,32",
+    "roiBack": "545,462,52,32",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -109,8 +109,8 @@
   },
   {
     "itemName": "wq_info_1",
-    "roiFront": "609,236,309,45",
-    "roiBack": "609,236,309,45",
+    "roiFront": "609,246,309,45",
+    "roiBack": "609,246,309,45",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -118,8 +118,8 @@
   },
   {
     "itemName": "wq_info_2",
-    "roiFront": "612,308,298,41",
-    "roiBack": "612,308,298,41",
+    "roiFront": "612,318,298,41",
+    "roiBack": "612,318,298,41",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -127,8 +127,8 @@
   },
   {
     "itemName": "wq_info_3",
-    "roiFront": "612,376,305,44",
-    "roiBack": "612,376,305,44",
+    "roiFront": "612,386,305,44",
+    "roiBack": "612,386,305,44",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -136,8 +136,8 @@
   },
   {
     "itemName": "wq_info_4",
-    "roiFront": "613,446,315,44",
-    "roiBack": "613,446,315,44",
+    "roiFront": "613,456,315,44",
+    "roiBack": "613,456,315,44",
     "mode": "Single",
     "method": "Default",
     "keyword": "",

+ 4 - 4
tasks/WantedQuests/wq/image.json

@@ -66,7 +66,7 @@
     "itemName": "goto_1",
     "imageName": "wq_goto_1.png",
     "roiFront": "978,234,87,45",
-    "roiBack": "978,234,87,45",
+    "roiBack": "978,234,87,60",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -75,7 +75,7 @@
     "itemName": "goto_2",
     "imageName": "wq_goto_2.png",
     "roiFront": "979,305,88,43",
-    "roiBack": "979,305,88,43",
+    "roiBack": "979,305,88,58",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -84,7 +84,7 @@
     "itemName": "goto_3",
     "imageName": "wq_goto_3.png",
     "roiFront": "979,373,88,47",
-    "roiBack": "979,373,88,47",
+    "roiBack": "979,373,88,62",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -93,7 +93,7 @@
     "itemName": "goto_4",
     "imageName": "wq_goto_4.png",
     "roiFront": "979,447,87,42",
-    "roiBack": "979,447,87,42",
+    "roiBack": "979,447,87,57",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"