From 6e552d8a47f8c07fe447db0d695a1ffada7ad7e5 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Mon, 27 Jan 2025 20:44:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(ItemMerge):=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E5=93=81=E5=85=91=E6=8D=A2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增了四个物品兑换配置，ID分别为3405、3406、3407、3408
- 这些配置允许玩家使用金币兑换不同数量的钻石或积分
- 配置了合成次数、按钮文本、开放条件等信息
---
 .../data/config/Merge/ItemMerge.config        | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index 0b3004e..b98d502 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -2181,6 +2181,58 @@ ItemMergeConfig = {
 				openserverday = 1,
 				level = 1,
 			},
+			[3405] = {
+				circle = 1,
+				compose = { id = 13, type = 13, count = 800000 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3405,
+				second_index = 4,
+				table = { { id = 299, type = 0, count = 1 } },
+				openserverday = 1,
+				level = 1,
+			},
+			[3406] = {
+				circle = 1,
+				compose = { id = 13, type = 13, count = 80000000 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3406,
+				second_index = 4,
+				table = { { id = 299, type = 0, count = 100 } },
+				openserverday = 1,
+				level = 1,
+			},
+			[3407] = {
+				circle = 1,
+				compose = { id = 13, type = 13, count = 500000 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3407,
+				second_index = 4,
+				table = { { id = 302, type = 0, count = 1 } },
+				openserverday = 1,
+				level = 1,
+			},
+			[3408] = {
+				circle = 1,
+				compose = { id = 13, type = 13, count = 50000000 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3408,
+				second_index = 4,
+				table = { { id = 302, type = 0, count = 100 } },
+				openserverday = 1,
+				level = 1,
+			},
 		},
 	},
 	[4] = {