yEs1do 1 jaar geleden
bovenliggende
commit
2a27a14bfd

+ 16 - 16
tasks/ActivityShikigami/as/ocr.json

@@ -1,47 +1,47 @@
 [
 [
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "imageName": "as_remain_ap.png",
-    "roiFront": "1101,17,68,29",
-    "roiBack": "1101,17,68,29",
+    "roiFront": "1100,16,68,32",
+    "roiBack": "1100,16,68,32",
+    "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
-    "threshold": 0,
+    "keyword": "",
     "description": "体力的数量检测"
     "description": "体力的数量检测"
   },
   },
   {
   {
     "itemName": "remain_ap_activity",
     "itemName": "remain_ap_activity",
-    "imageName": "as_remain_ap_activity.png",
-    "roiFront": "942.2,17.39999999999992,73.60000000000014,29.799999999999926",
-    "roiBack": "942.2,17.39999999999992,73.60000000000014,29.799999999999926",
+    "roiFront": "534,18,70,28",
+    "roiBack": "534,18,70,28",
+    "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
-    "threshold": 0,
+    "keyword": "",
     "description": "活动体力的剩余检测"
     "description": "活动体力的剩余检测"
   },
   },
   {
   {
     "itemName": "remain_buy",
     "itemName": "remain_buy",
-    "imageName": "as_remain_buy.png",
     "roiFront": "808,531,39,42",
     "roiFront": "808,531,39,42",
     "roiBack": "808,531,39,42",
     "roiBack": "808,531,39,42",
+    "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
-    "threshold": 0,
+    "keyword": "",
     "description": "还有多少次购买体力的机会"
     "description": "还有多少次购买体力的机会"
   },
   },
   {
   {
     "itemName": "remain_ap_activity2",
     "itemName": "remain_ap_activity2",
-    "imageName": "as_remain_ap_activity2.png",
-    "roiFront": "936,18,77,29",
-    "roiBack": "936,18,77,29",
+    "roiFront": "534,18,71,29",
+    "roiBack": "534,18,71,29",
+    "mode": "Digit",
     "method": "Default",
     "method": "Default",
-    "threshold": 0,
+    "keyword": "",
     "description": "活动票数(没有百分比)"
     "description": "活动票数(没有百分比)"
   },
   },
   {
   {
     "itemName": "entry_activity",
     "itemName": "entry_activity",
-    "imageName": "",
     "roiFront": "71,241,98,32",
     "roiFront": "71,241,98,32",
     "roiBack": "71,241,98,32",
     "roiBack": "71,241,98,32",
+    "mode": "Single",
     "method": "Default",
     "method": "Default",
-    "threshold": 0,
+    "keyword": "阵练演武",
     "description": "Ocr-description"
     "description": "Ocr-description"
   }
   }
 ]
 ]

+ 6 - 6
tasks/ActivityShikigami/assets.py

@@ -74,16 +74,16 @@ class ActivityShikigamiAssets:
 	I_NEW = RuleImage(roi_front=(1004,192,65,52), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_new.png")
 	I_NEW = RuleImage(roi_front=(1004,192,65,52), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_new.png")
 
 
 
 
-	# Image Rule Assets
+	# Ocr Rule Assets
 	# 体力的数量检测 
 	# 体力的数量检测 
-	I_REMAIN_AP = RuleImage(roi_front=(1101,17,68,29), roi_back=(1101,17,68,29), threshold=0, method="Default", file="./tasks/ActivityShikigami/as/as_remain_ap.png")
+	O_REMAIN_AP = RuleOcr(roi=(1100,16,68,32), area=(1100,16,68,32), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
-	I_REMAIN_AP_ACTIVITY = RuleImage(roi_front=(942.2,17.39999999999992,73.60000000000014,29.799999999999926), roi_back=(942.2,17.39999999999992,73.60000000000014,29.799999999999926), threshold=0, method="Default", file="./tasks/ActivityShikigami/as/as_remain_ap_activity.png")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	# 还有多少次购买体力的机会 
-	I_REMAIN_BUY = RuleImage(roi_front=(808,531,39,42), roi_back=(808,531,39,42), threshold=0, method="Default", file="./tasks/ActivityShikigami/as/as_remain_buy.png")
+	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 
 	# 活动票数(没有百分比) 
-	I_REMAIN_AP_ACTIVITY2 = RuleImage(roi_front=(936,18,77,29), roi_back=(936,18,77,29), threshold=0, method="Default", file="./tasks/ActivityShikigami/as/as_remain_ap_activity2.png")
+	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(534,18,71,29), area=(534,18,71,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
 	# Ocr-description 
 	# Ocr-description 
-	I_ENTRY_ACTIVITY = RuleImage(roi_front=(71,241,98,32), roi_back=(71,241,98,32), threshold=0, method="Default", file="./tasks/ActivityShikigami/as/")
+	O_ENTRY_ACTIVITY = RuleOcr(roi=(71,241,98,32), area=(71,241,98,32), mode="Single", method="Default", keyword="阵练演武", name="entry_activity")
 
 
 
 

+ 3 - 3
tasks/Component/BaseActivity/config_activity.py

@@ -65,6 +65,6 @@ class GeneralClimb(ConfigBase):
             return def_value
             return def_value
         return def_value
         return def_value
 
 
-    @field_validator('ap_mode', mode='after')
-    def check_mode(cls, value):
-        return ApMode.AP_GAME
+    # @field_validator('ap_mode', mode='after')
+    # def check_mode(cls, value):
+    #     return ApMode.AP_GAME