From 265cb90cc7aa57b0aa45a7f97471adb290819e78 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 21 Jan 2025 17:00:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/config/Merge/ItemMerge.config        | 650 +++++++++---------
 LogicServer/data/config/Merge/Merge.config    |  13 +-
 2 files changed, 341 insertions(+), 322 deletions(-)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index 9924ff8..cce109a 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1444,11 +1444,11 @@ ItemMergeConfig = {
 				mergelimit = { vip = 3 },
 				Eid = 125,
 				second_index = 3,
-				table = {
-					{ id = 838, type = 0, count = 30 },
-					{ id = 421, type = 0, count = 25 },
-					{ id = 2, type = 2, count = 80000 },
-				},
+				table = { { id = 838, type = 0, count = 30 }, { id = 421, type = 0, count = 25 }, {
+					id = 2,
+					type = 2,
+					count = 80000,
+				} },
 				openserverday = 1,
 				level = 1,
 				text = "合成",
@@ -1840,6 +1840,8 @@ ItemMergeConfig = {
 				compose = { id = 2, type = 2, count = 20000 },
 				index = 3,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 72,
 				second_index = 2,
 				table = { { id = 838, type = 0, count = 10 } },
@@ -1851,6 +1853,8 @@ ItemMergeConfig = {
 				compose = { id = 838, type = 0, count = 10 },
 				index = 3,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 73,
 				second_index = 2,
 				table = { { id = 840, type = 0, count = 1 } },
@@ -1862,6 +1866,8 @@ ItemMergeConfig = {
 				compose = { id = 841, type = 0, count = 1 },
 				index = 3,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 78,
 				second_index = 2,
 				table = { { id = 840, type = 0, count = 10 } },
@@ -1873,6 +1879,8 @@ ItemMergeConfig = {
 				compose = { id = 842, type = 0, count = 1 },
 				index = 3,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 132,
 				second_index = 2,
 				table = { { id = 841, type = 0, count = 3 }, { id = 2, type = 2, count = 1000000 } },
@@ -1884,6 +1892,8 @@ ItemMergeConfig = {
 				compose = { id = 300, type = 0, count = 1 },
 				index = 3,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 238,
 				second_index = 2,
 				table = { { id = 842, type = 0, count = 1 } },
@@ -2251,11 +2261,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 89,
 				second_index = 2,
-				table = {
-					{ id = 739, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 60 },
-					{ id = 855, type = 0, count = 100 },
-				},
+				table = { { id = 739, type = 0, count = 1 }, { id = 1114, type = 0, count = 60 }, {
+					id = 855,
+					type = 0,
+					count = 100,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2266,11 +2276,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 90,
 				second_index = 2,
-				table = {
-					{ id = 740, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 60 },
-					{ id = 855, type = 0, count = 100 },
-				},
+				table = { { id = 740, type = 0, count = 1 }, { id = 1114, type = 0, count = 60 }, {
+					id = 855,
+					type = 0,
+					count = 100,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2281,11 +2291,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 91,
 				second_index = 2,
-				table = {
-					{ id = 741, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 60 },
-					{ id = 855, type = 0, count = 100 },
-				},
+				table = { { id = 741, type = 0, count = 1 }, { id = 1114, type = 0, count = 60 }, {
+					id = 855,
+					type = 0,
+					count = 100,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2296,11 +2306,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 92,
 				second_index = 2,
-				table = {
-					{ id = 749, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 150 },
-					{ id = 855, type = 0, count = 200 },
-				},
+				table = { { id = 749, type = 0, count = 1 }, { id = 1114, type = 0, count = 150 }, {
+					id = 855,
+					type = 0,
+					count = 200,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2311,11 +2321,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 93,
 				second_index = 2,
-				table = {
-					{ id = 750, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 150 },
-					{ id = 855, type = 0, count = 200 },
-				},
+				table = { { id = 750, type = 0, count = 1 }, { id = 1114, type = 0, count = 150 }, {
+					id = 855,
+					type = 0,
+					count = 200,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2326,11 +2336,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 94,
 				second_index = 2,
-				table = {
-					{ id = 751, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 150 },
-					{ id = 855, type = 0, count = 200 },
-				},
+				table = { { id = 751, type = 0, count = 1 }, { id = 1114, type = 0, count = 150 }, {
+					id = 855,
+					type = 0,
+					count = 200,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2341,11 +2351,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 95,
 				second_index = 2,
-				table = {
-					{ id = 773, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 800 },
-					{ id = 855, type = 0, count = 400 },
-				},
+				table = { { id = 773, type = 0, count = 1 }, { id = 1114, type = 0, count = 800 }, {
+					id = 855,
+					type = 0,
+					count = 400,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -2356,11 +2366,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 96,
 				second_index = 2,
-				table = {
-					{ id = 774, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 800 },
-					{ id = 855, type = 0, count = 400 },
-				},
+				table = { { id = 774, type = 0, count = 1 }, { id = 1114, type = 0, count = 800 }, {
+					id = 855,
+					type = 0,
+					count = 400,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -2371,11 +2381,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 97,
 				second_index = 2,
-				table = {
-					{ id = 775, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 800 },
-					{ id = 855, type = 0, count = 400 },
-				},
+				table = { { id = 775, type = 0, count = 1 }, { id = 1114, type = 0, count = 800 }, {
+					id = 855,
+					type = 0,
+					count = 400,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -2386,11 +2396,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 225,
 				second_index = 2,
-				table = {
-					{ id = 797, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 2000 },
-					{ id = 855, type = 0, count = 500 },
-				},
+				table = { { id = 797, type = 0, count = 1 }, { id = 1114, type = 0, count = 2000 }, {
+					id = 855,
+					type = 0,
+					count = 500,
+				} },
 				openserverday = 85,
 				level = 1,
 				redpointlimit = { openDay = 85 },
@@ -2403,11 +2413,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 226,
 				second_index = 2,
-				table = {
-					{ id = 798, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 2000 },
-					{ id = 855, type = 0, count = 500 },
-				},
+				table = { { id = 798, type = 0, count = 1 }, { id = 1114, type = 0, count = 2000 }, {
+					id = 855,
+					type = 0,
+					count = 500,
+				} },
 				openserverday = 85,
 				level = 1,
 				redpointlimit = { openDay = 85 },
@@ -2420,11 +2430,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 227,
 				second_index = 2,
-				table = {
-					{ id = 799, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 2000 },
-					{ id = 855, type = 0, count = 500 },
-				},
+				table = { { id = 799, type = 0, count = 1 }, { id = 1114, type = 0, count = 2000 }, {
+					id = 855,
+					type = 0,
+					count = 500,
+				} },
 				openserverday = 85,
 				level = 1,
 				redpointlimit = { openDay = 85 },
@@ -2650,11 +2660,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 105,
 				second_index = 4,
-				table = {
-					{ id = 738, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 30 },
-					{ id = 856, type = 0, count = 100 },
-				},
+				table = { { id = 738, type = 0, count = 1 }, { id = 1114, type = 0, count = 30 }, {
+					id = 856,
+					type = 0,
+					count = 100,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2665,11 +2675,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 106,
 				second_index = 4,
-				table = {
-					{ id = 748, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 80 },
-					{ id = 856, type = 0, count = 200 },
-				},
+				table = { { id = 748, type = 0, count = 1 }, { id = 1114, type = 0, count = 80 }, {
+					id = 856,
+					type = 0,
+					count = 200,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2680,11 +2690,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 107,
 				second_index = 4,
-				table = {
-					{ id = 748, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 80 },
-					{ id = 856, type = 0, count = 200 },
-				},
+				table = { { id = 748, type = 0, count = 1 }, { id = 1114, type = 0, count = 80 }, {
+					id = 856,
+					type = 0,
+					count = 200,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2695,11 +2705,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 108,
 				second_index = 4,
-				table = {
-					{ id = 748, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 80 },
-					{ id = 856, type = 0, count = 200 },
-				},
+				table = { { id = 748, type = 0, count = 1 }, { id = 1114, type = 0, count = 80 }, {
+					id = 856,
+					type = 0,
+					count = 200,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2710,11 +2720,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 109,
 				second_index = 4,
-				table = {
-					{ id = 770, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 500 },
-					{ id = 856, type = 0, count = 400 },
-				},
+				table = { { id = 770, type = 0, count = 1 }, { id = 1114, type = 0, count = 500 }, {
+					id = 856,
+					type = 0,
+					count = 400,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -2725,11 +2735,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 110,
 				second_index = 4,
-				table = {
-					{ id = 771, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 500 },
-					{ id = 856, type = 0, count = 400 },
-				},
+				table = { { id = 771, type = 0, count = 1 }, { id = 1114, type = 0, count = 500 }, {
+					id = 856,
+					type = 0,
+					count = 400,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -2740,11 +2750,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 111,
 				second_index = 4,
-				table = {
-					{ id = 772, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 500 },
-					{ id = 856, type = 0, count = 400 },
-				},
+				table = { { id = 772, type = 0, count = 1 }, { id = 1114, type = 0, count = 500 }, {
+					id = 856,
+					type = 0,
+					count = 400,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -2755,11 +2765,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 228,
 				second_index = 4,
-				table = {
-					{ id = 794, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 1200 },
-					{ id = 855, type = 0, count = 500 },
-				},
+				table = { { id = 794, type = 0, count = 1 }, { id = 1114, type = 0, count = 1200 }, {
+					id = 855,
+					type = 0,
+					count = 500,
+				} },
 				openserverday = 85,
 				level = 1,
 				redpointlimit = { openDay = 85 },
@@ -2772,11 +2782,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 229,
 				second_index = 4,
-				table = {
-					{ id = 795, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 1200 },
-					{ id = 855, type = 0, count = 500 },
-				},
+				table = { { id = 795, type = 0, count = 1 }, { id = 1114, type = 0, count = 1200 }, {
+					id = 855,
+					type = 0,
+					count = 500,
+				} },
 				openserverday = 85,
 				level = 1,
 				redpointlimit = { openDay = 85 },
@@ -2789,11 +2799,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 230,
 				second_index = 4,
-				table = {
-					{ id = 796, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 1200 },
-					{ id = 855, type = 0, count = 500 },
-				},
+				table = { { id = 796, type = 0, count = 1 }, { id = 1114, type = 0, count = 1200 }, {
+					id = 855,
+					type = 0,
+					count = 500,
+				} },
 				openserverday = 85,
 				level = 1,
 				redpointlimit = { openDay = 85 },
@@ -2808,11 +2818,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 244,
 				second_index = 5,
-				table = {
-					{ id = 749, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 5 },
-					{ id = 970, type = 0, count = 5 },
-				},
+				table = { { id = 749, type = 0, count = 1 }, { id = 1114, type = 0, count = 5 }, {
+					id = 970,
+					type = 0,
+					count = 5,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2823,11 +2833,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 245,
 				second_index = 5,
-				table = {
-					{ id = 749, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 5 },
-					{ id = 970, type = 0, count = 5 },
-				},
+				table = { { id = 749, type = 0, count = 1 }, { id = 1114, type = 0, count = 5 }, {
+					id = 970,
+					type = 0,
+					count = 5,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2838,11 +2848,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 246,
 				second_index = 5,
-				table = {
-					{ id = 750, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 5 },
-					{ id = 970, type = 0, count = 5 },
-				},
+				table = { { id = 750, type = 0, count = 1 }, { id = 1114, type = 0, count = 5 }, {
+					id = 970,
+					type = 0,
+					count = 5,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2853,11 +2863,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 247,
 				second_index = 5,
-				table = {
-					{ id = 750, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 5 },
-					{ id = 970, type = 0, count = 5 },
-				},
+				table = { { id = 750, type = 0, count = 1 }, { id = 1114, type = 0, count = 5 }, {
+					id = 970,
+					type = 0,
+					count = 5,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2868,11 +2878,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 248,
 				second_index = 5,
-				table = {
-					{ id = 751, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 5 },
-					{ id = 970, type = 0, count = 5 },
-				},
+				table = { { id = 751, type = 0, count = 1 }, { id = 1114, type = 0, count = 5 }, {
+					id = 970,
+					type = 0,
+					count = 5,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2883,11 +2893,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 249,
 				second_index = 5,
-				table = {
-					{ id = 751, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 5 },
-					{ id = 970, type = 0, count = 5 },
-				},
+				table = { { id = 751, type = 0, count = 1 }, { id = 1114, type = 0, count = 5 }, {
+					id = 970,
+					type = 0,
+					count = 5,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2898,11 +2908,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 250,
 				second_index = 5,
-				table = {
-					{ id = 773, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 773, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2913,11 +2923,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 251,
 				second_index = 5,
-				table = {
-					{ id = 773, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 773, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2928,11 +2938,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 252,
 				second_index = 5,
-				table = {
-					{ id = 774, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 774, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2943,11 +2953,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 253,
 				second_index = 5,
-				table = {
-					{ id = 774, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 774, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2958,11 +2968,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 254,
 				second_index = 5,
-				table = {
-					{ id = 775, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 775, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2973,11 +2983,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 255,
 				second_index = 5,
-				table = {
-					{ id = 775, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 775, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -2988,11 +2998,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 256,
 				second_index = 5,
-				table = {
-					{ id = 797, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 797, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3003,11 +3013,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 257,
 				second_index = 5,
-				table = {
-					{ id = 797, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 797, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3018,11 +3028,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 258,
 				second_index = 5,
-				table = {
-					{ id = 798, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 798, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3033,11 +3043,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 259,
 				second_index = 5,
-				table = {
-					{ id = 798, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 798, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3048,11 +3058,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 260,
 				second_index = 5,
-				table = {
-					{ id = 799, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 799, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3063,11 +3073,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 261,
 				second_index = 5,
-				table = {
-					{ id = 799, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 799, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3078,11 +3088,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 262,
 				second_index = 5,
-				table = {
-					{ id = 1265, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 50 },
-					{ id = 970, type = 0, count = 50 },
-				},
+				table = { { id = 1265, type = 0, count = 1 }, { id = 1114, type = 0, count = 50 }, {
+					id = 970,
+					type = 0,
+					count = 50,
+				} },
 				openserverday = 85,
 				level = 1,
 			},
@@ -3093,11 +3103,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 263,
 				second_index = 5,
-				table = {
-					{ id = 1265, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 50 },
-					{ id = 970, type = 0, count = 50 },
-				},
+				table = { { id = 1265, type = 0, count = 1 }, { id = 1114, type = 0, count = 50 }, {
+					id = 970,
+					type = 0,
+					count = 50,
+				} },
 				openserverday = 85,
 				level = 1,
 			},
@@ -3108,11 +3118,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 264,
 				second_index = 5,
-				table = {
-					{ id = 1266, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 50 },
-					{ id = 970, type = 0, count = 50 },
-				},
+				table = { { id = 1266, type = 0, count = 1 }, { id = 1114, type = 0, count = 50 }, {
+					id = 970,
+					type = 0,
+					count = 50,
+				} },
 				openserverday = 85,
 				level = 1,
 			},
@@ -3123,11 +3133,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 265,
 				second_index = 5,
-				table = {
-					{ id = 1266, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 50 },
-					{ id = 970, type = 0, count = 50 },
-				},
+				table = { { id = 1266, type = 0, count = 1 }, { id = 1114, type = 0, count = 50 }, {
+					id = 970,
+					type = 0,
+					count = 50,
+				} },
 				openserverday = 85,
 				level = 1,
 			},
@@ -3138,11 +3148,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 266,
 				second_index = 5,
-				table = {
-					{ id = 1267, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 50 },
-					{ id = 970, type = 0, count = 50 },
-				},
+				table = { { id = 1267, type = 0, count = 1 }, { id = 1114, type = 0, count = 50 }, {
+					id = 970,
+					type = 0,
+					count = 50,
+				} },
 				openserverday = 85,
 				level = 1,
 			},
@@ -3153,11 +3163,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 267,
 				second_index = 5,
-				table = {
-					{ id = 1267, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 50 },
-					{ id = 970, type = 0, count = 50 },
-				},
+				table = { { id = 1267, type = 0, count = 1 }, { id = 1114, type = 0, count = 50 }, {
+					id = 970,
+					type = 0,
+					count = 50,
+				} },
 				openserverday = 85,
 				level = 1,
 			},
@@ -3168,11 +3178,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 268,
 				second_index = 5,
-				table = {
-					{ id = 770, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 770, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -3183,11 +3193,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 269,
 				second_index = 5,
-				table = {
-					{ id = 770, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 770, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -3198,11 +3208,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 270,
 				second_index = 5,
-				table = {
-					{ id = 771, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 771, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -3213,11 +3223,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 271,
 				second_index = 5,
-				table = {
-					{ id = 771, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 771, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -3228,11 +3238,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 272,
 				second_index = 5,
-				table = {
-					{ id = 772, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 772, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -3243,11 +3253,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 273,
 				second_index = 5,
-				table = {
-					{ id = 772, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 10 },
-					{ id = 970, type = 0, count = 10 },
-				},
+				table = { { id = 772, type = 0, count = 1 }, { id = 1114, type = 0, count = 10 }, {
+					id = 970,
+					type = 0,
+					count = 10,
+				} },
 				openserverday = 1,
 				level = 1,
 			},
@@ -3258,11 +3268,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 274,
 				second_index = 5,
-				table = {
-					{ id = 794, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 794, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3273,11 +3283,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 275,
 				second_index = 5,
-				table = {
-					{ id = 794, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 794, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3288,11 +3298,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 276,
 				second_index = 5,
-				table = {
-					{ id = 795, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 795, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3303,11 +3313,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 277,
 				second_index = 5,
-				table = {
-					{ id = 795, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 795, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3318,11 +3328,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 278,
 				second_index = 5,
-				table = {
-					{ id = 796, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 796, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3333,11 +3343,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 279,
 				second_index = 5,
-				table = {
-					{ id = 796, type = 0, count = 1 },
-					{ id = 1114, type = 0, count = 20 },
-					{ id = 970, type = 0, count = 20 },
-				},
+				table = { { id = 796, type = 0, count = 1 }, { id = 1114, type = 0, count = 20 }, {
+					id = 970,
+					type = 0,
+					count = 20,
+				} },
 				openserverday = 50,
 				level = 1,
 			},
@@ -3914,11 +3924,11 @@ ItemMergeConfig = {
 				text = "兑换",
 				Eid = 206,
 				second_index = 6,
-				table = {
-					{ id = 1167, type = 0, count = 3 },
-					{ id = 1172, type = 0, count = 3 },
-					{ id = 1177, type = 0, count = 3 },
-				},
+				table = { { id = 1167, type = 0, count = 3 }, { id = 1172, type = 0, count = 3 }, {
+					id = 1177,
+					type = 0,
+					count = 3,
+				} },
 				openserverday = 70,
 				level = 1,
 			},
@@ -3929,11 +3939,11 @@ ItemMergeConfig = {
 				text = "兑换",
 				Eid = 207,
 				second_index = 6,
-				table = {
-					{ id = 1168, type = 0, count = 2 },
-					{ id = 1173, type = 0, count = 2 },
-					{ id = 1178, type = 0, count = 2 },
-				},
+				table = { { id = 1168, type = 0, count = 2 }, { id = 1173, type = 0, count = 2 }, {
+					id = 1178,
+					type = 0,
+					count = 2,
+				} },
 				openserverday = 70,
 				level = 1,
 			},
@@ -3944,11 +3954,11 @@ ItemMergeConfig = {
 				text = "兑换",
 				Eid = 208,
 				second_index = 6,
-				table = {
-					{ id = 1169, type = 0, count = 1 },
-					{ id = 1174, type = 0, count = 1 },
-					{ id = 1179, type = 0, count = 1 },
-				},
+				table = { { id = 1169, type = 0, count = 1 }, { id = 1174, type = 0, count = 1 }, {
+					id = 1179,
+					type = 0,
+					count = 1,
+				} },
 				openserverday = 70,
 				level = 1,
 			},
@@ -4255,11 +4265,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 280,
 				second_index = 1,
-				table = {
-					{ id = 1339, type = 0, count = 2 },
-					{ id = 1340, type = 0, count = 1 },
-					{ id = 1341, type = 0, count = 1 },
-				},
+				table = { { id = 1339, type = 0, count = 2 }, { id = 1340, type = 0, count = 1 }, {
+					id = 1341,
+					type = 0,
+					count = 1,
+				} },
 				openserverday = 15,
 				level = 1,
 			},
@@ -4270,11 +4280,11 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 281,
 				second_index = 1,
-				table = {
-					{ id = 1339, type = 0, count = 2 },
-					{ id = 1340, type = 0, count = 1 },
-					{ id = 1342, type = 0, count = 1 },
-				},
+				table = { { id = 1339, type = 0, count = 2 }, { id = 1340, type = 0, count = 1 }, {
+					id = 1342,
+					type = 0,
+					count = 1,
+				} },
 				openserverday = 15,
 				level = 1,
 			},
diff --git a/LogicServer/data/config/Merge/Merge.config b/LogicServer/data/config/Merge/Merge.config
index a7b47ff..7d167b6 100755
--- a/LogicServer/data/config/Merge/Merge.config
+++ b/LogicServer/data/config/Merge/Merge.config
@@ -151,7 +151,7 @@ MergeConfig = {
 		[2] = {
 			rebornconds = 0,
 			index = 2,
-			Uitype = 2,
+			Uitype = 1,
 			id = 3,
 			levelconds = 1,
 			dayconds = 1,
@@ -159,13 +159,22 @@ MergeConfig = {
 		},
 		[3] = {
 			rebornconds = 0,
-			index = 2,
+			index = 3,
 			Uitype = 1,
 			id = 3,
 			levelconds = 1,
 			dayconds = 1,
 			name = "高阶装备",
 		},
+		[4] = {
+			rebornconds = 0,
+			index = 4,
+			Uitype = 1,
+			id = 3,
+			levelconds = 1,
+			dayconds = 1,
+			name = "多倍经验",
+		},
 	},
 	[4] = {
 		[1] = {