From 659bc24a33054628849f5df862ff63f50b64cae4 Mon Sep 17 00:00:00 2001 From: YlovexLN <1584544837@qq.com> Date: Mon, 18 Aug 2025 23:47:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(assets):=20=E6=B7=BB=E5=8A=A0=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E5=88=B6=E9=80=A0=E9=80=89=E9=A1=B9=E5=92=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在武器制造入口中添加"订单等级"和"制造数量"选项 - 新增高级和绝密订单等级的处理流程 - 添加制造数量为1到4的处理流程 - 更新武器制造相关的管道配置 --- assets/resource/interface.json | 100 ++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/assets/resource/interface.json b/assets/resource/interface.json index 19410b5..465f3ea 100644 --- a/assets/resource/interface.json +++ b/assets/resource/interface.json @@ -38,7 +38,11 @@ }, { "name": "武器制造", - "entry": "weapons-fabricate" + "entry": "weapons-fabricate", + "option": [ + "订单等级", + "制造数量" + ] }, { "name": "和合", @@ -882,6 +886,100 @@ } } ] + }, + "订单等级": { + "cases": [ + { + "name": "高级", + "pipeline_override": { + "weapons-fabricate-job": { + "next": [ + "senior-orders-add", + "weapons-fabricate-job" + ] + } + } + }, + { + "name": "绝密", + "pipeline_override": { + "weapons-fabricate-job": { + "next": [ + "confidential-orders-add", + "weapons-fabricate-job" + ] + } + } + } + ] + }, + "制造数量": { + "cases": [ + { + "name": "1", + "pipeline_override": { + "weapons-fabricate-job": { + "next": [ + "orders-add", + "weapons-fabricate-job" + ] + }, + "weapons-fabricate-quit-two-add": { + "next": [ + "weapons-fabricate-add-1" + ] + } + } + }, + { + "name": "2", + "pipeline_override": { + "weapons-fabricate-job": { + "next": [ + "orders-add", + "weapons-fabricate-job" + ] + }, + "weapons-fabricate-quit-two-add": { + "next": [ + "weapons-fabricate-add-2" + ] + } + } + }, + { + "name": "3", + "pipeline_override": { + "weapons-fabricate-job": { + "next": [ + "orders-add", + "weapons-fabricate-job" + ] + }, + "weapons-fabricate-quit-two-add": { + "next": [ + "weapons-fabricate-add-3" + ] + } + } + }, + { + "name": "4", + "pipeline_override": { + "weapons-fabricate-job": { + "next": [ + "orders-add", + "weapons-fabricate-job" + ] + }, + "weapons-fabricate-quit-two-add": { + "next": [ + "weapons-fabricate-add-4" + ] + } + } + } + ] } }, "version": "v0.0.1" From 147caa361432d59b14d5affe63ed10acecb43a5d Mon Sep 17 00:00:00 2001 From: YlovexLN <1584544837@qq.com> Date: Mon, 18 Aug 2025 23:47:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(assets):=20=E6=B7=BB=E5=8A=A0=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E5=88=B6=E9=80=A0=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E6=AD=A5=E9=AA=A4=EF=BC=8C=E4=BB=A5=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=AD=A6=E5=99=A8=E5=88=B6=E9=80=A0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/3_(9)_weapons_fabricate.json | 158 +++++++++++++++++- 1 file changed, 156 insertions(+), 2 deletions(-) diff --git a/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json b/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json index e76f1db..ca355f7 100644 --- a/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json @@ -50,6 +50,21 @@ "senior-orders" ] }, + "senior-orders-add": { + "recognition": "OCR", + "expected": "高级", + "action": "Click", + "post_delay": 2000, + "target_offset": [ + 50, + 30, + 0, + 0 + ], + "next": [ + "orders-add" + ] + }, "signed-contract": { "recognition": "OCR", "expected": "签订合同", @@ -102,7 +117,7 @@ }, "weapons-fabricate-quit-Image": { "recognition": "TemplateMatch", - "template": "Company\\29.png", + "template": "Company/29.png", "action": "Click", "target": [ 1150, @@ -122,6 +137,24 @@ "weapons-fabricate-quit-Image" ] }, + "weapons-fabricate-quit-Image-add": { + "recognition": "TemplateMatch", + "template": "Company/29.png", + "action": "Click", + "target": [ + 1150, + 70, + 0, + 0 + ], + "post_delay": 2000, + "roi": [ + 1050, + 0, + 200, + 190 + ] + }, "confidential-orders": { "recognition": "OCR", "expected": "绝密", @@ -140,6 +173,27 @@ "confidential-orders" ] }, + "confidential-orders-add": { + "recognition": "OCR", + "expected": "绝密", + "action": "Click", + "post_delay": 2000, + "target_offset": [ + 50, + 30, + 0, + 0 + ], + "next": [ + "orders-add" + ] + }, + "orders-add": { + "post_delay": 2000, + "next": [ + "weapons-fabricate-quit-two-add" + ] + }, "signed-contract-two": { "recognition": "OCR", "expected": "签订合同", @@ -157,6 +211,18 @@ "signed-contract-two" ] }, + "signed-contract-two-add": { + "recognition": "OCR", + "expected": "签订合同", + "action": "Click", + "post_delay": 2000, + "roi": [ + 835, + 500, + 400, + 210 + ] + }, "weapons-fabricate-determine-three": { "recognition": "OCR", "expected": "确定", @@ -174,6 +240,18 @@ "weapons-fabricate-full" ] }, + "weapons-fabricate-determine-three-add": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "post_delay": 2000, + "roi": [ + 655, + 400, + 260, + 150 + ] + }, "weapons-fabricate-quit-two": { "recognition": "OCR", "expected": "等待生产", @@ -188,6 +266,82 @@ "weapons-fabricate-home" ] }, + "weapons-fabricate-quit-two-add": { + "next": [ + "weapons-fabricate-add-2" + ], + "interrupt": [ + "weapons-fabricate-quit-Image-add", + "weapons-fabricate-determine-three-add", + "signed-contract-two-add", + "weapons-fabricate-quit-two-add" + ] + }, + "weapons-fabricate-add-1": { + "recognition": "OCR", + "expected": [ + "1/1", + "1/2", + "1/3", + "1/4" + ], + "roi": [ + 439, + 584, + 197, + 40 + ], + "next": [ + "weapons-fabricate-home" + ] + }, + "weapons-fabricate-add-2": { + "recognition": "OCR", + "expected": [ + "2/2", + "2/3", + "2/4" + ], + "roi": [ + 439, + 584, + 197, + 40 + ], + "next": [ + "weapons-fabricate-home" + ] + }, + "weapons-fabricate-add-3": { + "recognition": "OCR", + "expected": [ + "3/4" + ], + "roi": [ + 439, + 584, + 197, + 40 + ], + "next": [ + "weapons-fabricate-home" + ] + }, + "weapons-fabricate-add-4": { + "recognition": "OCR", + "expected": [ + "4/4" + ], + "roi": [ + 439, + 584, + 197, + 40 + ], + "next": [ + "weapons-fabricate-home" + ] + }, "weapons-fabricate-lack": { "recognition": "OCR", "expected": "缺少所需", @@ -217,7 +371,7 @@ }, "weapons-fabricate-home": { "recognition": "TemplateMatch", - "template": "Startup\\10.png", + "template": "Startup/10.png", "action": "Click" } } \ No newline at end of file