From 2d7d7a5bfb2c1637b46a9225ceb227aab46fb430 Mon Sep 17 00:00:00 2001
From: a16797 <167970334@qq.com>
Date: Tue, 15 Oct 2024 01:29:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=AD=94=E7=B2=BE?=
 =?UTF-8?q?=E6=94=B6=E8=8F=9C=E5=8F=AF=E9=80=89=E3=80=82=20(#219)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat: 新增魔精收菜可选，默认收取。
fix: 修复领取奖励的问题。

GUI暂不可用
---
 assets/interface.json                         | 25 ++++++++++++++++++-
 assets/resource/base/pipeline/awards.json     |  3 ++-
 assets/resource/base/pipeline/wilderness.json |  1 +
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/assets/interface.json b/assets/interface.json
index 94df2570..01b258bb 100644
--- a/assets/interface.json
+++ b/assets/interface.json
@@ -38,7 +38,10 @@
         },
         {
             "name": "收取荒原",
-            "entry": "Wilderness"
+            "entry": "Wilderness",
+            "option": [
+                "魔精收菜"
+            ]
         },
         {
             "name": "每日心相（意志解析）",
@@ -885,6 +888,26 @@
                 }
             ]
         },
+        "魔精收菜": {
+            "cases": [
+                {
+                    "name": "Yes",
+                    "pipeline_override": {
+                        "EnterProduct": {
+                            "enabled": true
+                        }
+                    }
+                },
+                {
+                    "name": "No",
+                    "pipeline_override": {
+                        "EnterProduct": {
+                            "enabled": false
+                        }
+                    }
+                }
+            ]
+        },
         "模式选择": {
             "cases": [
                 {
diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json
index 0de8fcfd..2e703f8c 100644
--- a/assets/resource/base/pipeline/awards.json
+++ b/assets/resource/base/pipeline/awards.json
@@ -84,7 +84,8 @@
         "next": [
             "Sub_CollectDailyAwards",
             "Sub_ObtainedAwards",
-            "WeeklyAwardsBadge"
+            "WeeklyAwardsBadge",
+            "Sub_BackButton"
         ]
     },
     "Sub_CollectDailyAwards": {
diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json
index 22439b11..f1ed8f9c 100644
--- a/assets/resource/base/pipeline/wilderness.json
+++ b/assets/resource/base/pipeline/wilderness.json
@@ -190,6 +190,7 @@
         ]
     },
     "EnterProduct": {
+        "enabled": true,
         "recognition": "OCR",
         "expected": [
             "生产"