From c06b088e8aafd50cebd98322e9375b9b799e8d49 Mon Sep 17 00:00:00 2001
From: Kubbo <390378816@qq.com>
Date: Mon, 13 Jan 2025 01:20:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(ItemMerge):=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=89=A9=E5=93=81=E5=85=91=E6=8D=A2=E9=85=8D=E7=BD=AE=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BC=80=E5=90=AF=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增物品兑换配置：
  - id: 3301，可兑换 8000000 金币，消耗 1 个 301 型道具
- 更新现有物品合成配置，设置开启服务器天数为 1：
  - id: 11003、11004、11005
---
 LogicServer/data/config/Merge/ItemMerge.config | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index cd27c03..bde7fc2 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1884,6 +1884,18 @@ ItemMergeConfig = {
 			},
 		},
 		[3] = {
+			[3301] = {
+				circle = 0,
+				compose = { id = 0, type = 133, count = 8000000 },
+				index = 3,
+				text = "兑换",
+				Eid = 3301,
+				second_index = 2,
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				table = { { id = 301, type = 0, count = 1 } },
+				openserverday = 1,
+			},
 			[11001] = {
 				circle = 0,
 				compose = { id = 1379, type = 0, count = 1 },
@@ -1914,6 +1926,7 @@ ItemMergeConfig = {
 				Eid = 11003,
 				second_index = 2,
 				table = { { id = 846, type = 0, count = 500 }, { id = 4, type = 4, count = 30000 } },
+				openserverday = 1,
 			},
 			[11004] = {
 				circle = 0,
@@ -1922,6 +1935,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 11004,
 				second_index = 2,
+				openserverday = 1,
 				table = { { id = 847, type = 0, count = 500 }, { id = 4, type = 4, count = 100000 } },
 			},
 			[11005] = {
@@ -1931,6 +1945,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 11005,
 				second_index = 2,
+				openserverday = 1,
 				table = { { id = 844, type = 0, count = 1000 }, { id = 4, type = 4, count = 250000 } },
 			},
 		},