From 629e780ada0fe45d1393c4df1a65e5b5901ac5b6 Mon Sep 17 00:00:00 2001
From: Kubbo <390378816@qq.com>
Date: Wed, 12 Feb 2025 23:43:07 +0800
Subject: [PATCH] =?UTF-8?q?config:=20=E6=9B=B4=E6=96=B0=20ItemMerge=20?=
 =?UTF-8?q?=E5=92=8C=20shop=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 ItemMerge 配置:
  - 将 mergelimit 中的 circle 改为 zs，表示转生等级
  - 更新 limitTips 文本，使用"转生"代替"转生等级"

- 更新 shop 配置:
  - 修改商品 ID 从 1242 到 1394
  - 更改购买限制类型和值，从无限制到转生等级 15
  - 更新商品价格，从 188 个第 3 类物品到 100 万个第 4 类物品
---
 LogicServer/data/config/Merge/ItemMerge.config | 4 ++--
 LogicServer/data/config/shop/shop.config       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index f39f212..bef4961 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -2074,8 +2074,8 @@ ItemMergeConfig = {
 				second_index = 2,
 				openserverday = 1,
 				table = { { id = 845, type = 0, count = 10000 }, { id = 4, type = 4, count = 1000000 } },
-				mergelimit = { office = 23, circle = 15 },
-				limitTips = "转生等级15且官职为5珠亲王以上方可兑换",
+				mergelimit = { office = 23, zs = 15 },
+				limitTips = "转生15且5珠亲王以上方可兑换",
 			},
 			[11001] = {
 				circle = 0,
diff --git a/LogicServer/data/config/shop/shop.config b/LogicServer/data/config/shop/shop.config
index 4fb4264..f7e0468 100755
--- a/LogicServer/data/config/shop/shop.config
+++ b/LogicServer/data/config/shop/shop.config
@@ -117,12 +117,12 @@ ShopConfig = {
 				shopid = 94,
 				shoptype = 1,
 				Tabshop = 1,
-				shop = { id = 1242, type = 0, count = 1 },
+				shop = { id = 1394, type = 0, count = 1 },
 				statictype = 51,
-				buytype = { { limit = { { value = 0, times = 1 } }, type = 3 } },
+				buytype = { { limit = { { value = 15, times = 1 } }, type = 2 } },
 				daylimit = 0,
 				levellimit = 1,
-				price = { id = 3, type = 3, count = 188 },
+				price = { id = 4, type = 4, count = 1000000 },
 			},
 		},
 		[2] = {