From d6b9070d27441e8de217f8215ccfabf65045571a Mon Sep 17 00:00:00 2001
From: Kubbo <390378816@qq.com>
Date: Sun, 12 Jan 2025 15:21:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(ItemMerge):=20=E6=9B=B4=E6=96=B0=E5=90=88?=
 =?UTF-8?q?=E6=88=90=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改现有合成项的 compose 参数，将 id 和 type 互换
- 新增四个兑换项（7301至7304），使用荣誉值进行兑换
- 优化合成界面显示，统一按钮文本和样式
---
 .../data/config/Merge/ItemMerge.config        | 68 +++++++++++++++++--
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index dfe0138..683662c 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -4030,7 +4030,7 @@ ItemMergeConfig = {
 			},
 			[7206] = {
 				circle = 0,
-				compose = { id = 4, type = 0, count = 1000 },
+				compose = { id = 0, type = 4, count = 1000 },
 				index = 7,
 				buttontxt10 = "合成10次",
 				mergebutton10 = 1,
@@ -4044,7 +4044,7 @@ ItemMergeConfig = {
 			},
 			[7207] = {
 				circle = 0,
-				compose = { id = 4, type = 0, count = 3000 },
+				compose = { id = 0, type = 4, count = 3000 },
 				index = 7,
 				buttontxt10 = "合成10次",
 				mergebutton10 = 1,
@@ -4058,7 +4058,7 @@ ItemMergeConfig = {
 			},
 			[7208] = {
 				circle = 0,
-				compose = { id = 4, type = 0, count = 5000 },
+				compose = { id = 0, type = 4, count = 5000 },
 				index = 7,
 				buttontxt10 = "合成10次",
 				mergebutton10 = 1,
@@ -4072,7 +4072,7 @@ ItemMergeConfig = {
 			},
 			[7209] = {
 				circle = 0,
-				compose = { id = 4, type = 0, count = 10000 },
+				compose = { id = 0, type = 4, count = 10000 },
 				index = 7,
 				buttontxt10 = "合成10次",
 				mergebutton10 = 1,
@@ -4146,6 +4146,66 @@ ItemMergeConfig = {
 				level = 1,
 				redpoint = 1,
 			},
+			[7301] = {
+				circle = 0,
+				compose = { id = 3, type = 3, count = 300 },
+				index = 7,
+				text = "兑换",
+				clicklimit = 1,
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 7301,
+				second_index = 3,
+				table = { { id = 829, type = 0, count = 100 } },
+				openserverday = 1,
+				level = 1,
+				redpoint = 1,
+			},
+			[7302] = {
+				circle = 0,
+				compose = { id = 3, type = 3, count = 6000 },
+				index = 7,
+				text = "兑换",
+				clicklimit = 1,
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 7302,
+				second_index = 3,
+				table = { { id = 830, type = 0, count = 100 } },
+				openserverday = 1,
+				level = 1,
+				redpoint = 1,
+			},
+			[7303] = {
+				circle = 0,
+				compose = { id = 3, type = 3, count = 70000 },
+				index = 7,
+				text = "兑换",
+				clicklimit = 1,
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 241,
+				second_index = 3,
+				table = { { id = 831, type = 0, count = 100 } },
+				openserverday = 1,
+				level = 1,
+				redpoint = 1,
+			},
+			[7304] = {
+				circle = 0,
+				compose = { id = 3, type = 3, count = 260000 },
+				index = 7,
+				text = "兑换",
+				clicklimit = 1,
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 7304,
+				second_index = 3,
+				table = { { id = 832, type = 0, count = 100 } },
+				openserverday = 1,
+				level = 1,
+				redpoint = 1,
+			},
 		},
 	},
 	[8] = {