ryland 2 лет назад
Родитель
Сommit
c96ad0d2e3

+ 11 - 4
dev_tools/assets_test.py

@@ -10,6 +10,7 @@ from module.atom.ocr import RuleOcr
 
 
 def load_image(file: str):
+    file = Path(file)
     img = cv2.imdecode(fromfile(file, dtype=uint8), -1)
     img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
 
@@ -24,14 +25,20 @@ def detect_image(file: str, targe: RuleImage) -> bool:
     img = load_image(file)
     return targe.match(img)
 
+def detect_ocr(file: str, target: RuleOcr):
+    img = load_image(file)
+    return target.ocr(img)
+
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = './log/error/1704971960417/2024-01-11_19-19-20-403213.png'
+IMAGE_FILE = 'C:/Users/Ryland/Desktop/QQ截图20240113215243.png'
 if __name__ == '__main__':
+    # from tasks.KekkaiActivation.assets import KekkaiActivationAssets
+    # targe = KekkaiActivationAssets.I_A_HARVEST_FISH_6
+    # print(detect_image(IMAGE_FILE, targe))
     from tasks.KekkaiActivation.assets import KekkaiActivationAssets
-    targe = KekkaiActivationAssets.I_A_HARVEST_FISH_6
-    print(detect_image(IMAGE_FILE, targe))
-
+    target = KekkaiActivationAssets.O_CARD_ALL_TIME
+    print(detect_ocr(IMAGE_FILE, target))
 
 

+ 2 - 2
module/ocr/sub_ocr.py

@@ -156,9 +156,9 @@ class DigitCounter(Single):
 
 class Duration(Single):
     def after_process(self, result):
-        result = super().after_process(result)
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
-        result = result.replace('B', '8').replace(':', ':').replace(':', ':').replace(' ', '')
+        result = result.replace('B', '8').replace(':', ':').replace(' ', '')
+        result = super().after_process(result)
         return result
 
     @staticmethod

BIN
tasks/KekkaiActivation/a/a_a_demount.png


+ 9 - 0
tasks/KekkaiActivation/a/image.json

@@ -196,5 +196,14 @@
     "method": "Template matching",
     "threshold": 0.7,
     "description": "太阴3"
+  },
+  {
+    "itemName": "a_demount",
+    "imageName": "a_a_demount.png",
+    "roiFront": "939,575,55,47",
+    "roiBack": "903,551,107,91",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "卸下"
   }
 ]

+ 3 - 1
tasks/KekkaiActivation/assets.py

@@ -19,7 +19,7 @@ class KekkaiActivationAssets:
 
 	# Ocr Rule Assets
 	# 这张卡一共有多少小时 
-	O_CARD_ALL_TIME = RuleOcr(roi=(926,262,95,31), area=(926,262,95,31), mode="Single", method="Default", keyword="", name="card_all_time")
+	O_CARD_ALL_TIME = RuleOcr(roi=(926,262,95,31), area=(926,262,95,31), mode="Duration", method="Default", keyword="", name="card_all_time")
 
 
 	# Swipe Rule Assets
@@ -72,6 +72,8 @@ class KekkaiActivationAssets:
 	I_A_HARVEST_FISH_6 = RuleImage(roi_front=(898,159,45,38), roi_back=(869,131,100,100), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_6.png")
 	# 太阴3 
 	I_A_HARVEST_MOON_3 = RuleImage(roi_front=(897,159,46,40), roi_back=(869,127,100,100), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_moon_3.png")
+	# 卸下 
+	I_A_DEMOUNT = RuleImage(roi_front=(939,575,55,47), roi_back=(903,551,107,91), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_demount.png")
 
 
 	# Image Rule Assets

+ 1 - 1
tasks/KekkaiActivation/ocr.json

@@ -3,7 +3,7 @@
     "itemName": "card_all_time",
     "roiFront": "926,262,95,31",
     "roiBack": "926,262,95,31",
-    "mode": "Single",
+    "mode": "Duration",
     "method": "Default",
     "keyword": "",
     "description": "这张卡一共有多少小时"

+ 5 - 0
tasks/KekkaiActivation/script_task.py

@@ -106,6 +106,11 @@ class ScriptTask(KU, KekkaiActivationAssets):
                 # 黄色的 ”激活“
                 if self.appear(self.I_A_ACTIVATE_YELLOW, threshold=0.95):
                     continue
+                if self.appear(self.I_A_DEMOUNT):
+                    # 现在在动画里面
+                    logger.info('Now in the animation')
+                    logger.info('Now there is no card')
+                    continue
             # 如果这张卡生效着,在使用中
             if card_status and card_effect:
                 logger.info('Card is using')