Selaa lähdekoodia

Merge pull request #1699 from davidyangkunlong/regioinfix

Regioinfix
huangrunheng 3 kuukautta sitten
vanhempi
sitoutus
ab8774013c

+ 5 - 1
module/atom/ocr.py

@@ -49,7 +49,11 @@ class RuleOcr(Digit, DigitCounter, Duration, Single, Full, Quantity):
         else:
             area = self.roi
 
-        x, y, w, h = self.area
+		# 原代码:x, y, w, h = self.area
+		# 修改原因:20260725 , 每月活动,点击挑战的时候,经常点到切换门票模式和体力模式
+		# OCR识别到并点击,在SINGLE模式下,识别到挑战,点击区域应该为ROI,而不是AREA
+		# 该地方应该是误写为self.area,本地变量area没有起作用,如果是self.area,上面几句话就白写了,没起作用
+        x, y, w, h = area
         x = np.random.randint(x, x + w)
         y = np.random.randint(y, y + h)
         return x, y

+ 6 - 3
tasks/ActivityShikigami/assets.py

@@ -93,10 +93,13 @@ class ActivityShikigamiAssets:
 	# Ocr Rule Assets
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
+	# 20260725 缩小体力和活动体力的检测范围,范围太大,有可能把0识别为10的情况。
+	# 潜在风险1,超过1000的数字可能会只识别到最后的000,还有识别0的时候,score比较低,只有0.3,不知道怎么优化。
+	# 潜在风险2,部分数字,遇到过300等,会识别为0,之前没截上图,待后面遇到再处理这种情况。
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(777,17,63,30), area=(776,16,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
-	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(599,15,50,29), area=(600,16,49,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_AP = RuleOcr(roi=(793, 18, 44, 25), area=(793, 18, 44, 25), mode="DigitCounter", method="Default",           keyword="", name="remain_ap")
+	# 活动体力的剩余检测
+	O_REMAIN_PASS = RuleOcr(roi=(600, 18, 44, 25), area=(600, 18, 44, 25), mode="DigitCounter", method="Default",         keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 

+ 2 - 2
tasks/WeeklyTrifles/area_boss/image.json

@@ -20,8 +20,8 @@
   {
     "itemName": "wt_share_ab",
     "imageName": "area_boss_wt_share_ab.png",
-    "roiFront": "1183,308,45,39",
-    "roiBack": "1183,308,45,39",
+    "roiFront": "1187,273,45,39",
+    "roiBack": "1176,90,76,326",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "地鬼分享"

+ 1 - 1
tasks/WeeklyTrifles/assets.py

@@ -21,7 +21,7 @@ class WeeklyTriflesAssets:
 	# 今天一个都没有打 
 	I_WT_NO_DAY = RuleImage(roi_front=(167,360,72,69), roi_back=(167,360,72,69), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_no_day.png")
 	# 地鬼分享 
-	I_WT_SHARE_AB = RuleImage(roi_front=(1183,308,45,39), roi_back=(1183,308,45,39), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png")
+	I_WT_SHARE_AB = RuleImage(roi_front=(1187,273,45,39), roi_back=(1176,90,76,326), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png")
 	# 分享勾玉 
 	I_WT_AB_JADE = RuleImage(roi_front=(977,552,44,47), roi_back=(977,552,44,47), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_ab_jade.png")
 	# 微信分享