Explorar el Código

fix(KekkaiActivation): update img of card_finsh5

ryland hace 2 años
padre
commit
81d5694b5f

+ 2 - 2
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = './log/error/1707301227880/error1707301227880.png'
+IMAGE_FILE = './log/error/1710141221597/2024-03-11_15-13-41-589447.png'
 if __name__ == '__main__':
     from tasks.KekkaiActivation.assets import KekkaiActivationAssets
-    targe = KekkaiActivationAssets.I_CARDS_KAIKO_5
+    targe = KekkaiActivationAssets.I_CARDS_FISH_3
     print(detect_image(IMAGE_FILE, targe))
     # from tasks.KekkaiActivation.assets import KekkaiActivationAssets
     # target = KekkaiActivationAssets.O_CARD_ALL_TIME

+ 1 - 1
tasks/Hyakkiyakou/assets.py

@@ -21,7 +21,7 @@ class HyakkiyakouAssets:
 	# 本丸御殿 
 	I_TPAGE_2 = RuleImage(roi_front=(411,506,231,120), roi_back=(132,479,933,171), threshold=0.5, method="Template matching", file="./tasks/Hyakkiyakou/train/train_tpage_2.png")
 	# 之境 
-	I_TPAGE_3 = RuleImage(roi_front=(748,504,240,118), roi_back=(125,482,937,166), threshold=0.7, method="Template matching", file="./tasks/Hyakkiyakou/train/train_tpage_3.png")
+	I_TPAGE_3 = RuleImage(roi_front=(748,504,240,118), roi_back=(125,482,937,166), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/train/train_tpage_3.png")
 	# 鲸歌潜岸 
 	I_TPAGE_4 = RuleImage(roi_front=(281,507,233,120), roi_back=(124,484,933,163), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/train/train_tpage_4.png")
 	# 杨帆远航 

+ 9 - 3
tasks/Hyakkiyakou/generate.py

@@ -24,6 +24,7 @@ class ScriptTask(Benchmark, HyakkiyakouAssets):
     hero_name = ''
 
     def run_simple(self, hero_name: str='test'):
+        self.screenshot_benchmark()
         ScriptTask.hero_name = hero_name
         self.add_one_video(hero_name, index=0)
 
@@ -159,10 +160,15 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas1')
+    c = Config('oas2')
     d = Device(c)
     t = ScriptTask(c, d)
-    HERO_NAME = 'sp_009'
-    t.run_simple(HERO_NAME)
+    HERO_NAME = 'g_015'
+    # t.run_simple(HERO_NAME)
     t.run(HERO_NAME)
 
+
+
+
+
+

+ 2 - 2
tasks/KekkaiActivation/assets.py

@@ -88,9 +88,9 @@ class KekkaiActivationAssets:
 	# description 
 	I_CARDS_FISH_6 = RuleImage(roi_front=(193,183,87,91), roi_back=(178,169,110,474), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_fish_6.png")
 	# description 
-	I_CARDS_FISH_5 = RuleImage(roi_front=(192,358,88,21), roi_back=(176,155,105,492), threshold=0.9, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_fish_5.png")
+	I_CARDS_FISH_5 = RuleImage(roi_front=(192,358,88,21), roi_back=(176,155,105,492), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_fish_5.png")
 	# description 
-	I_CARDS_FISH_4 = RuleImage(roi_front=(192,409,87,21), roi_back=(176,175,118,473), threshold=0.9, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_fish_4.png")
+	I_CARDS_FISH_4 = RuleImage(roi_front=(192,409,87,21), roi_back=(176,175,118,473), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_fish_4.png")
 	# description 
 	I_CARDS_FISH_3 = RuleImage(roi_front=(193,314,86,64), roi_back=(188,164,100,482), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_fish_3.png")
 	# description 

BIN
tasks/KekkaiActivation/cards/cards_cards_fish_5.png


+ 4 - 4
tasks/KekkaiActivation/cards/image.json

@@ -47,10 +47,10 @@
   {
     "itemName": "cards_fish_5",
     "imageName": "cards_cards_fish_5.png",
-    "roiFront": "192,358,88,21",
-    "roiBack": "176,155,105,492",
+    "roiFront": "192,329,88,90",
+    "roiBack": "176,155,116,492",
     "method": "Template matching",
-    "threshold": 0.9,
+    "threshold": 0.8,
     "description": "description"
   },
   {
@@ -59,7 +59,7 @@
     "roiFront": "192,409,87,21",
     "roiBack": "176,175,118,473",
     "method": "Template matching",
-    "threshold": 0.9,
+    "threshold": 0.7,
     "description": "description"
   },
   {