From 73189aa52aa24d0e706f3efa6ca487c2cd4d1d26 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 21 Jan 2025 17:11:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(ItemMerge):=20=E8=B0=83=E6=95=B4=E9=81=93?=
 =?UTF-8?q?=E5=85=B7=E5=90=88=E6=88=90=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=85=91=E6=8D=A2=E9=85=8D=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整了现有道具合成配置，包括修改了部分道具的合成所需材料数量
- 新增了多个道具兑换配方，包括：
  - 842 兑换 843（10个）
  - 843 兑换 846（10个）
  - 846 兑换 847（10个）
  - 847 兑换 844（10个）
  - 844 兑换 845（10个）
- 新增的兑换配方均需要相应数量的材料
---
 .../data/config/Merge/ItemMerge.config        | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index cce109a..e841df3 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1883,7 +1883,7 @@ ItemMergeConfig = {
 				mergebutton10 = 1,
 				Eid = 132,
 				second_index = 2,
-				table = { { id = 841, type = 0, count = 3 }, { id = 2, type = 2, count = 1000000 } },
+				table = { { id = 841, type = 0, count = 3 }, { id = 2, type = 2, count = 100000 } },
 				openserverday = 15,
 				level = 1,
 			},
@@ -1900,6 +1900,71 @@ ItemMergeConfig = {
 				openserverday = 1,
 				level = 1,
 			},
+			[3201] = {
+				circle = 0,
+				compose = { id = 843, type = 0, count = 1 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3201,
+				second_index = 2,
+				table = { { id = 842, type = 0, count = 10 }, { id = 3, type = 3, count = 500 } },
+				openserverday = 15,
+				level = 1,
+			},
+			[3202] = {
+				circle = 0,
+				compose = { id = 846, type = 0, count = 1 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3202,
+				second_index = 2,
+				table = { { id = 843, type = 0, count = 10 }, { id = 4, type = 4, count = 50 } },
+				openserverday = 15,
+				level = 1,
+			},
+			[3203] = {
+				circle = 0,
+				compose = { id = 847, type = 0, count = 1 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3203,
+				second_index = 2,
+				table = { { id = 846, type = 0, count = 10 }, { id = 4, type = 4, count = 100 } },
+				openserverday = 15,
+				level = 1,
+			},
+			[3204] = {
+				circle = 0,
+				compose = { id = 844, type = 0, count = 1 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3204,
+				second_index = 2,
+				table = { { id = 847, type = 0, count = 10 }, { id = 4, type = 4, count = 200 } },
+				openserverday = 15,
+				level = 1,
+			},
+			[3205] = {
+				circle = 0,
+				compose = { id = 845, type = 0, count = 1 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3205,
+				second_index = 2,
+				table = { { id = 844, type = 0, count = 10 }, { id = 4, type = 4, count = 500 } },
+				openserverday = 15,
+				level = 1,
+			},
 		},
 		[3] = {
 			[11001] = {