From 637d8fd7cee857733985267fc407f51b3edaa5d2 Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Wed, 18 Sep 2024 13:51:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource_picli/base/pipeline/2048_cd.json | 70 ++++++++++++------- .../resource_picli/base/pipeline/2048_hh.json | 70 +++++++------------ 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/assets/resource_picli/base/pipeline/2048_cd.json b/assets/resource_picli/base/pipeline/2048_cd.json index 4672cb3..d5c8a38 100644 --- a/assets/resource_picli/base/pipeline/2048_cd.json +++ b/assets/resource_picli/base/pipeline/2048_cd.json @@ -1,80 +1,98 @@ { - "2048_cd_1": { + "2048_hh_1": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_1.png", + "template": "2048_hh/2048_hh_1.png", "threshold": 0.60 }, - "2048_cd_3": { + "2048_hh_2": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_3.png", + "template": "2048_hh/2048_hh_2.png", "threshold": 0.60 }, - "2048_cd_4": { + "2048_hh_3": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_4.png", + "template": "2048_hh/2048_hh_3.png", "threshold": 0.60 }, - "2048_cd_5": { + "2048_hh_4": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_5.png", + "template": "2048_hh/2048_hh_4.png", "threshold": 0.60 }, - "2048_cd_6": { + "2048_hh_5": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_6.png", + "template": "2048_hh/2048_hh_5.png", "threshold": 0.60 }, - "2048_cd_7": { + "2048_hh_6": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_7.png", + "template": "2048_hh/2048_hh_6.png", "threshold": 0.60 }, - "2048_cd_8": { + "2048_hh_7": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_8.png", + "template": "2048_hh/2048_hh_7.png", "threshold": 0.60 }, - "2048_cd_9": { + "2048_hh_8": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_9.png", + "template": "2048_hh/2048_hh_8.png", "threshold": 0.60 }, - "2048_cd_10": { + "2048_hh_9": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_10.png", + "template": "2048_hh/2048_hh_9.png", "threshold": 0.60 }, - "2048_cd_11": { + "2048_hh_10": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_11.png", + "template": "2048_hh/2048_hh_10.png", "threshold": 0.60 }, - "2048_cd_12": { + "2048_hh_11": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_12.png", + "template": "2048_hh/2048_hh_11.png", "threshold": 0.60 }, - "2048_cd_13": { + "2048_hh_12": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_13.png", + "template": "2048_hh/2048_hh_12.png", "threshold": 0.60 }, - "2048_cd_16": { + "2048_hh_13": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_16.png", + "template": "2048_hh/2048_hh_13.png", + "threshold": 0.60 + }, + "2048_hh_14": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_14.png", + "threshold": 0.60 + }, + "2048_hh_15": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_15.png", + "threshold": 0.60 + }, + "2048_hh_16": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_16.png", "threshold": 0.60 } } diff --git a/assets/resource_picli/base/pipeline/2048_hh.json b/assets/resource_picli/base/pipeline/2048_hh.json index 17ebbb2..9411e15 100644 --- a/assets/resource_picli/base/pipeline/2048_hh.json +++ b/assets/resource_picli/base/pipeline/2048_hh.json @@ -1,98 +1,80 @@ { - "2048_cd_1": { + "2048_hh_1": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_1.png", + "template": "2048_hh/2048_hh_1.png", "threshold": 0.60 }, - "2048_cd_2": { + "2048_hh_2": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_2.png", + "template": "2048_hh/2048_hh_2.png", "threshold": 0.60 }, - "2048_cd_3": { + "2048_hh_3": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_3.png", + "template": "2048_hh/2048_hh_3.png", "threshold": 0.60 }, - "2048_cd_4": { + "2048_hh_4": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_4.png", + "template": "2048_hh/2048_hh_4.png", "threshold": 0.60 }, - "2048_cd_5": { + "2048_hh_5": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_5.png", + "template": "2048_hh/2048_hh_5.png", "threshold": 0.60 }, - "2048_cd_6": { + "2048_hh_6": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_6.png", + "template": "2048_hh/2048_hh_6.png", "threshold": 0.60 }, - "2048_cd_7": { + "2048_hh_7": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_7.png", + "template": "2048_hh/2048_hh_7.png", "threshold": 0.60 }, - "2048_cd_8": { + "2048_hh_8": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_8.png", + "template": "2048_hh/2048_hh_8.png", "threshold": 0.60 }, - "2048_cd_9": { + "2048_hh_9": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_9.png", + "template": "2048_hh/2048_hh_9.png", "threshold": 0.60 }, - "2048_cd_10": { + "2048_hh_10": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_10.png", + "template": "2048_hh/2048_hh_10.png", "threshold": 0.60 }, - "2048_cd_11": { + "2048_hh_11": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_11.png", + "template": "2048_hh/2048_hh_11.png", "threshold": 0.60 }, - "2048_cd_12": { + "2048_hh_12": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_12.png", + "template": "2048_hh/2048_hh_12.png", "threshold": 0.60 }, - "2048_cd_13": { + "2048_hh_bs": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_13.png", - "threshold": 0.60 - }, - "2048_cd_14": { - "recognition": "TemplateMatch", - "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_14.png", - "threshold": 0.60 - }, - "2048_cd_15": { - "recognition": "TemplateMatch", - "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_15.png", - "threshold": 0.60 - }, - "2048_cd_16": { - "recognition": "TemplateMatch", - "roi": [347, 100, 588, 579], - "template": "2048_cd/2048_cd_16.png", + "template": "2048_hh/2048_hh_bs.png", "threshold": 0.60 } } From dac2a47d59f7faf420c73c2683f8d6f66008b489 Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Wed, 18 Sep 2024 13:56:06 +0800 Subject: [PATCH 2/2] fix: 2048_cd --- .../resource_picli/base/pipeline/2048_cd.json | 68 ++++++++----------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/assets/resource_picli/base/pipeline/2048_cd.json b/assets/resource_picli/base/pipeline/2048_cd.json index d5c8a38..5d6cd2e 100644 --- a/assets/resource_picli/base/pipeline/2048_cd.json +++ b/assets/resource_picli/base/pipeline/2048_cd.json @@ -1,98 +1,86 @@ { - "2048_hh_1": { + "2048_cd_1": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_1.png", + "template": "2048_cd/2048_cd_1.png", "threshold": 0.60 }, - "2048_hh_2": { + "2048_cd_2": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_2.png", + "template": "2048_cd/2048_cd_2.png", "threshold": 0.60 }, - "2048_hh_3": { + "2048_cd_3": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_3.png", + "template": "2048_cd/2048_cd_3.png", "threshold": 0.60 }, - "2048_hh_4": { + "2048_cd_4": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_4.png", + "template": "2048_cd/2048_cd_4.png", "threshold": 0.60 }, - "2048_hh_5": { + "2048_cd_5": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_5.png", + "template": "2048_cd/2048_cd_5.png", "threshold": 0.60 }, - "2048_hh_6": { + "2048_cd_6": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_6.png", + "template": "2048_cd/2048_cd_6.png", "threshold": 0.60 }, - "2048_hh_7": { + "2048_cd_7": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_7.png", + "template": "2048_cd/2048_cd_7.png", "threshold": 0.60 }, - "2048_hh_8": { + "2048_cd_8": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_8.png", + "template": "2048_cd/2048_cd_8.png", "threshold": 0.60 }, - "2048_hh_9": { + "2048_cd_9": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_9.png", + "template": "2048_cd/2048_cd_9.png", "threshold": 0.60 }, - "2048_hh_10": { + "2048_cd_10": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_10.png", + "template": "2048_cd/2048_cd_10.png", "threshold": 0.60 }, - "2048_hh_11": { + "2048_cd_11": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_11.png", + "template": "2048_cd/2048_cd_11.png", "threshold": 0.60 }, - "2048_hh_12": { + "2048_cd_12": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_12.png", + "template": "2048_cd/2048_cd_12.png", "threshold": 0.60 }, - "2048_hh_13": { + "2048_cd_13": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_13.png", + "template": "2048_cd/2048_cd_13.png", "threshold": 0.60 }, - "2048_hh_14": { + "2048_cd_16": { "recognition": "TemplateMatch", "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_14.png", - "threshold": 0.60 - }, - "2048_hh_15": { - "recognition": "TemplateMatch", - "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_15.png", - "threshold": 0.60 - }, - "2048_hh_16": { - "recognition": "TemplateMatch", - "roi": [347, 100, 588, 579], - "template": "2048_hh/2048_hh_16.png", + "template": "2048_cd/2048_cd_16.png", "threshold": 0.60 } }