From 56bea22ff34cd38777b922349c1732160e46d1b1 Mon Sep 17 00:00:00 2001
From: Kubbo <390378816@qq.com>
Date: Wed, 12 Feb 2025 23:42:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor(configs):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=81=93=E5=85=B7=E5=90=88=E5=B9=B6=E9=85=8D=E7=BD=AE=E5=92=8C?=
 =?UTF-8?q?=E5=95=86=E5=BA=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 ItemMergeConfig.json 中的 mergelimit 字段，将 circle 改为 zs
- 更新 ShopConfig.json 中的商品 ID、价格和限制条件
---
 configs/ItemMergeConfig.json |  2 +-
 configs/ShopConfig.json      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/ItemMergeConfig.json b/configs/ItemMergeConfig.json
index 22b0ab8..9340f0d 100644
--- a/configs/ItemMergeConfig.json
+++ b/configs/ItemMergeConfig.json
@@ -2481,7 +2481,7 @@
           { "id": 845, "type": 0, "count": 10000 },
           { "id": 4, "type": 4, "count": 1000000 }
         ],
-        "mergelimit": { "office": 23, "circle": 15 },
+        "mergelimit": { "office": 23, "zs": 15 },
         "limitTips": "转生15且5珠亲王以上方可兑换"
       }
     },
diff --git a/configs/ShopConfig.json b/configs/ShopConfig.json
index 820d866..3869748 100644
--- a/configs/ShopConfig.json
+++ b/configs/ShopConfig.json
@@ -214,7 +214,7 @@
                 "shoptype": 1,
                 "Tabshop": 1,
                 "shop": {
-                    "id": 1242,
+                    "id": 1394,
                     "type": 0,
                     "count": 1
                 },
@@ -223,19 +223,19 @@
                     {
                         "limit": [
                             {
-                                "value": 0,
+                                "value": 15,
                                 "times": 1
                             }
                         ],
-                        "type": 3
+                        "type": 2
                     }
                 ],
                 "daylimit": 0,
                 "levellimit": 1,
                 "price": {
-                    "id": 3,
-                    "type": 3,
-                    "count": 188
+                    "id":4,
+                    "type": 4,
+                    "count": 1000000
                 }
             }
         },