Merge pull request #1555 from yEs1do/fix(Sougenbi)

fix(Sougenbi): 移除冗余图像规则，更新OCR区域设置

Author: runhey

tasks/Sougenbi/assets.py

@@ -22,12 +22,6 @@ class SougenbiAssets:
 	# Image Rule Assets
 	# 进入业原火 
 	I_S_SOUGENBI = RuleImage(roi_front=(560,139,57,61), roi_back=(412,68,231,359), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_sougenbi.png")
-	# 贪 
-	I_S_GREED = RuleImage(roi_front=(118,121,307,100), roi_back=(167,143,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_greed.png")
-	#  
-	I_S_ANGER = RuleImage(roi_front=(164,291,307,100), roi_back=(164,291,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_anger.png")
-	# 痴 
-	I_S_FOOLERY = RuleImage(roi_front=(164,436,307,100), roi_back=(164,436,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_foolery.png")
 	# description 
 	I_S_TEAM_LOCK = RuleImage(roi_front=(700,652,31,36), roi_back=(667,649,167,56), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_team_lock.png")
 	# description 
@@ -46,10 +40,11 @@ class SougenbiAssets:
 
 	# Ocr Rule Assets
 	# Ocr-description 
-	O_S_GREED = RuleOcr(roi=(588,6,63,42), area=(588,6,63,42), mode="Single", method="Default", keyword="", name="s_greed")
+	O_S_GREED = RuleOcr(roi=(585,7,63,42), area=(585,7,63,42), mode="Single", method="Default", keyword="", name="s_greed")
 	# Ocr-description 
-	O_S_ANGER = RuleOcr(roi=(770,7,79,43), area=(770,7,79,43), mode="Digit", method="Default", keyword="", name="s_anger")
+	O_S_ANGER = RuleOcr(roi=(759,9,79,43), area=(759,9,79,43), mode="Digit", method="Default", keyword="", name="s_anger")
 	# Ocr-description 
-	O_S_FOOLERY = RuleOcr(roi=(956,11,68,36), area=(956,11,68,36), mode="Digit", method="Default", keyword="", name="s_foolery")
+	O_S_FOOLERY = RuleOcr(roi=(955,10,68,36), area=(955,10,68,36), mode="Digit", method="Default", keyword="", name="s_foolery")
+
 
 

tasks/Sougenbi/s/image.json

@@ -8,33 +8,6 @@
     "threshold": 0.8,
     "description": "进入业原火"
   },
-  {
-    "itemName": "s_greed",
-    "imageName": "s_s_greed.png",
-    "roiFront": "118,121,307,100",
-    "roiBack": "167,143,307,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "贪"
-  },
-  {
-    "itemName": "s_anger",
-    "imageName": "s_s_anger.png",
-    "roiFront": "164,291,307,100",
-    "roiBack": "164,291,307,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": ""
-  },
-  {
-    "itemName": "s_foolery",
-    "imageName": "s_s_foolery.png",
-    "roiFront": "164,436,307,100",
-    "roiBack": "164,436,307,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "痴"
-  },
   {
     "itemName": "s_team_lock",
     "imageName": "s_s_team_lock.png",

tasks/Sougenbi/s/ocr.json

@@ -1,26 +1,26 @@
 [
   {
     "itemName": "s_greed",
-    "roiFront": "588,6,63,42",
-    "roiBack": "588,6,63,42",
+    "roiFront": "585,7,63,42",
+    "roiBack": "585,7,63,42",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_anger",
-    "roiFront": "770,7,79,43",
-    "roiBack": "770,7,79,43",
+    "roiFront": "759,9,79,43",
+    "roiBack": "759,9,79,43",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_foolery",
-    "roiFront": "956,11,68,36",
-    "roiBack": "956,11,68,36",
+    "roiFront": "955,10,68,36",
+    "roiBack": "955,10,68,36",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",