From 89b5d718d9bd85992823d78a870d1e7380c76b22 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Jan 2025 15:32:17 +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=90=88=E6=88=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增了 6 个物品合成配置，Eid 分别为 1801 至 1806
- 合成条件包括官职限制、物品和货币消耗
- 配置了合成结果、开启时间和提示文本
---
 .../data/config/Merge/ItemMerge.config        | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index e841df3..5f97610 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1040,6 +1040,90 @@ ItemMergeConfig = {
 				text = "合成",
 				limitTips = "官职二品开放",
 			},
+			[1801] = {
+				circle = 2,
+				compose = { id = 842, type = 0, count = 1 },
+				index = 1,
+				mergelimit = { office = 10 },
+				redpoint = 1,
+				Eid = 1801,
+				second_index = 8,
+				table = { { id = 1002, type = 0, count = 1 }, { id = 3, type = 3, count = 500 } },
+				openserverday = 1,
+				level = 1,
+				text = "合成",
+				limitTips = "官职一品以上开放",
+			},
+			[1802] = {
+				circle = 2,
+				compose = { id = 843, type = 0, count = 1 },
+				index = 1,
+				mergelimit = { office = 12 },
+				redpoint = 1,
+				Eid = 1802,
+				second_index = 8,
+				table = { { id = 1002, type = 0, count = 1 }, { id = 3, type = 3, count = 500 } },
+				openserverday = 1,
+				level = 1,
+				text = "合成",
+				limitTips = "官职上卿以上开放",
+			},
+			[1803] = {
+				circle = 2,
+				compose = { id = 846, type = 0, count = 1 },
+				index = 1,
+				mergelimit = { office = 15 },
+				redpoint = 1,
+				Eid = 1803,
+				second_index = 8,
+				table = { { id = 1002, type = 0, count = 1 }, { id = 3, type = 3, count = 500 } },
+				openserverday = 1,
+				level = 1,
+				text = "合成",
+				limitTips = "官职国公以上开放",
+			},
+			[1804] = {
+				circle = 2,
+				compose = { id = 847, type = 0, count = 1 },
+				index = 1,
+				mergelimit = { office = 15 },
+				redpoint = 1,
+				Eid = 1804,
+				second_index = 8,
+				table = { { id = 1002, type = 0, count = 1 }, { id = 3, type = 3, count = 500 } },
+				openserverday = 1,
+				level = 1,
+				text = "合成",
+				limitTips = "官职亲王以上开放",
+			},
+			[1805] = {
+				circle = 2,
+				compose = { id = 844, type = 0, count = 1 },
+				index = 1,
+				mergelimit = { office = 23 },
+				redpoint = 1,
+				Eid = 1805,
+				second_index = 8,
+				table = { { id = 1002, type = 0, count = 5 }, { id = 4, type = 4, count = 50 } },
+				openserverday = 1,
+				level = 1,
+				text = "合成",
+				limitTips = "官职五珠亲王以上开放",
+			},
+			[1806] = {
+				circle = 2,
+				compose = { id = 845, type = 0, count = 1 },
+				index = 1,
+				mergelimit = { office = 28 },
+				redpoint = 1,
+				Eid = 1806,
+				second_index = 8,
+				table = { { id = 1002, type = 0, count = 10 }, { id = 4, type = 4, count = 100 } },
+				openserverday = 1,
+				level = 1,
+				text = "合成",
+				limitTips = "官职十珠亲王开放",
+			},
 		},
 		[9] = {
 			[137] = {