diff --git a/LogicServer/data/config/Merge/Merge.config b/LogicServer/data/config/Merge/Merge.config
index 40d3638..2e979c8 100755
--- a/LogicServer/data/config/Merge/Merge.config
+++ b/LogicServer/data/config/Merge/Merge.config
@@ -1,131 +1,342 @@
---D-锻造合成表.xlsx 合成二级目录
-MergeConfig={
-[1] = {
+MergeConfig = {
 	[1] = {
-		id = 1,
-		index = 1,
-		name = "赤月装备",
-		levelconds = 35,
-		rebornconds = 0,
-		dayconds = 0,
+		[1] = {
+			rebornconds = 0,
+			index = 1,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "魂玉",
+		},
+		[2] = {
+			rebornconds = 0,
+			index = 2,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "勋章",
+		},
+		[3] = {
+			rebornconds = 2,
+			index = 3,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "治疗宝玉",
+		},
+		[4] = {
+			rebornconds = 2,
+			index = 4,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "神装-斗笠",
+		},
+		[5] = {
+			rebornconds = 2,
+			index = 5,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "神装-盾牌",
+		},
+		[6] = {
+			rebornconds = 2,
+			index = 6,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "神装-面甲",
+		},
+		[7] = {
+			rebornconds = 2,
+			index = 7,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "神装-披风",
+		},
+		[8] = {
+			rebornconds = 2,
+			index = 8,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "官职证明",
+		},
+		[9] = {
+			rebornconds = 2,
+			index = 9,
+			Uitype = 2,
+			id = 1,
+			levelconds = 1,
+			dayconds = 60,
+			name = "星月装备",
+		},
+		[10] = {
+			rebornconds = 2,
+			index = 10,
+			Uitype = 1,
+			id = 1,
+			levelconds = 1,
+			dayconds = 1,
+			name = "王者装备",
+		},
 	},
 	[2] = {
-		id = 1,
-		index = 2,
-		name = "魔龙装备",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 3,
+		[1] = {
+			rebornconds = 0,
+			index = 1,
+			Uitype = 2,
+			id = 2,
+			levelconds = 1,
+			dayconds = 1,
+			name = "特权",
+		},
+		[2] = {
+			rebornconds = 2,
+			index = 2,
+			Uitype = 2,
+			id = 2,
+			levelconds = 1,
+			dayconds = 1,
+			name = "证明兑换",
+		},
+		[3] = {
+			rebornconds = 0,
+			index = 3,
+			Uitype = 2,
+			id = 2,
+			levelconds = 1,
+			dayconds = 1,
+			name = "神水",
+		},
+		[4] = {
+			rebornconds = 0,
+			index = 4,
+			Uitype = 1,
+			id = 2,
+			levelconds = 1,
+			dayconds = 5,
+			name = "圣宠",
+		},
+		[5] = {
+			rebornconds = 0,
+			index = 5,
+			Uitype = 2,
+			id = 2,
+			levelconds = 1,
+			dayconds = 1,
+			name = "高阶材料",
+		},
+		[6] = {
+			rebornconds = 0,
+			index = 6,
+			Uitype = 1,
+			id = 2,
+			levelconds = 1,
+			dayconds = 1,
+			name = "兵魂",
+		},
 	},
 	[3] = {
-		id = 1,
-		index = 3,
-		name = "战神装备",
-		levelconds = 45,
-		rebornconds = 0,
-		dayconds = 7,
+		[1] = {
+			rebornconds = 0,
+			index = 1,
+			Uitype = 2,
+			id = 3,
+			levelconds = 1,
+			dayconds = 1,
+			name = "佩饰",
+		},
+		[2] = {
+			rebornconds = 0,
+			index = 2,
+			Uitype = 2,
+			id = 3,
+			levelconds = 1,
+			dayconds = 1,
+			name = "装备凭证",
+		},
+		[3] = {
+			rebornconds = 0,
+			index = 2,
+			Uitype = 1,
+			id = 3,
+			levelconds = 1,
+			dayconds = 1,
+			name = "多倍经验",
+		},
 	},
 	[4] = {
-		id = 1,
-		index = 4,
-		name = "星王装备",
-		levelconds = 45,
-		rebornconds = 0,
-		dayconds = 7,
+		[1] = {
+			rebornconds = 4,
+			index = 1,
+			Uitype = 2,
+			id = 4,
+			levelconds = 1,
+			dayconds = 1,
+			name = "神兵",
+		},
+		[2] = {
+			rebornconds = 4,
+			index = 2,
+			Uitype = 2,
+			id = 4,
+			levelconds = 1,
+			dayconds = 1,
+			name = "天之神兵",
+		},
+		[3] = {
+			rebornconds = 4,
+			index = 3,
+			Uitype = 2,
+			id = 4,
+			levelconds = 1,
+			dayconds = 1,
+			name = "圣甲",
+		},
+		[4] = {
+			rebornconds = 4,
+			index = 4,
+			Uitype = 2,
+			id = 4,
+			levelconds = 1,
+			dayconds = 1,
+			name = "天之圣甲",
+		},
+		[5] = {
+			rebornconds = 4,
+			index = 5,
+			Uitype = 2,
+			id = 4,
+			levelconds = 1,
+			dayconds = 1,
+			name = "天之互换",
+		},
 	},
 	[5] = {
-		id = 1,
-		index = 5,
-		name = "王者装备",
-		levelconds = 45,
-		rebornconds = 0,
-		dayconds = 30,
+		[1] = {
+			rebornconds = 999,
+			index = 1,
+			Uitype = 2,
+			id = 5,
+			levelconds = 1,
+			dayconds = 1,
+			name = "祝福国庆",
+		},
 	},
 	[6] = {
-		id = 1,
-		index = 6,
-		name = "魂玉合成",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 0,
+		[1] = {
+			rebornconds = 0,
+			index = 1,
+			Uitype = 1,
+			id = 6,
+			levelconds = 1,
+			dayconds = 8,
+			name = "银花簪",
+		},
+		[2] = {
+			rebornconds = 0,
+			index = 2,
+			Uitype = 1,
+			id = 6,
+			levelconds = 1,
+			dayconds = 8,
+			name = "养心玉",
+		},
+		[3] = {
+			rebornconds = 0,
+			index = 3,
+			Uitype = 1,
+			id = 6,
+			levelconds = 1,
+			dayconds = 8,
+			name = "金曜珠",
+		},
+		[4] = {
+			rebornconds = 0,
+			index = 4,
+			Uitype = 1,
+			id = 6,
+			levelconds = 1,
+			dayconds = 8,
+			name = "黑檀石",
+		},
+		[5] = {
+			rebornconds = 0,
+			index = 5,
+			Uitype = 2,
+			id = 6,
+			levelconds = 1,
+			dayconds = 30,
+			name = "檀珠",
+		},
+		[6] = {
+			rebornconds = 0,
+			index = 6,
+			Uitype = 2,
+			id = 6,
+			levelconds = 1,
+			dayconds = 60,
+			name = "易筋经",
+		},
+		[7] = {
+			rebornconds = 6,
+			index = 7,
+			Uitype = 2,
+			id = 6,
+			levelconds = 1,
+			dayconds = 1,
+			name = "内功秘籍",
+		},
 	},
-},
-[2] = {
-	[1] = {
-		id = 2,
-		index = 1,
-		name = "赤月互换",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 1,
+	[7] = {
+		[1] = {
+			rebornconds = 0,
+			index = 1,
+			Uitype = 1,
+			id = 7,
+			levelconds = 1,
+			dayconds = 1,
+			name = "换真充",
+		},
+		[2] = {
+			rebornconds = 0,
+			index = 2,
+			Uitype = 1,
+			id = 7,
+			levelconds = 1,
+			dayconds = 1,
+			name = "元宝兑换",
+		},
+		[3] = {
+			rebornconds = 0,
+			index = 3,
+			Uitype = 1,
+			id = 7,
+			levelconds = 1,
+			dayconds = 1,
+			name = "银两兑换",
+		},
 	},
-	[2] = {
-		id = 2,
-		index = 2,
-		name = "魔龙互换",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 1,
+	[8] = {
+		[1] = {
+			rebornconds = 3,
+			index = 1,
+			Uitype = 2,
+			id = 8,
+			levelconds = 1,
+			dayconds = 15,
+			name = "字诀",
+		},
 	},
-	[3] = {
-		id = 2,
-		index = 3,
-		name = "战神互换",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 3,
-	},
-	[4] = {
-		id = 2,
-		index = 4,
-		name = "星王互换",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 7,
-	},
-	[5] = {
-		id = 2,
-		index = 5,
-		name = "王者互换",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 30,
-	},
-	[6] = {
-		id = 2,
-		index = 6,
-		name = "王者锻造",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 30,
-	},
-},
-[3] = {
-	[1] = {
-		id = 3,
-		index = 1,
-		name = "衣服合成",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 15,
-	},
-	[2] = {
-		id = 3,
-		index = 2,
-		name = "王者互换",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 40,
-	},
-},
-[4] = {
-	[1] = {
-		id = 4,
-		index = 1,
-		name = "秘籍",
-		levelconds = 40,
-		rebornconds = 0,
-		dayconds = 0,
-	},
-},
-}
\ No newline at end of file
+}
diff --git a/LogicServer/data/config/Merge/merge_total.config b/LogicServer/data/config/Merge/merge_total.config
index 790d6f2..3486618 100755
--- a/LogicServer/data/config/Merge/merge_total.config
+++ b/LogicServer/data/config/Merge/merge_total.config
@@ -1,35 +1,31 @@
---D-锻造合成表.xlsx 合成主目录
-MergeTotal={
-[1] = {
-	id = 1,
-	openLv = 35,
-	openZs = 0,
-	openserverDay = 0,
-	btn_source = "装备",
-	sort = 1,
-},
-[2] = {
-	id = 2,
-	openLv = 40,
-	openZs = 0,
-	openserverDay = 15,
-	btn_source = "武器",
-	sort = 2,
-},
-[3] = {
-	id = 3,
-	openLv = 40,
-	openZs = 0,
-	openserverDay = 15,
-	btn_source = "衣服",
-	sort = 3,
-},
-[4] = {
-	id = 4,
-	openLv = 40,
-	openZs = 0,
-	openserverDay = 0,
-	btn_source = "其他",
-	sort = 4,
-},
-}
\ No newline at end of file
+MergeTotal = {
+	[1] = {
+		openZs = 0,
+		sort = 1,
+		id = 1,
+		btn_source = "合成装备",
+		openserverDay = 0,
+		openLv = 1,
+	},
+	[2] = { openZs = 0, sort = 3, id = 2, btn_source = "材料", openserverDay = 0, openLv = 1 },
+	[3] = { openZs = 0, sort = 4, id = 3, btn_source = "成长", openserverDay = 0, openLv = 1 },
+	[4] = {
+		openZs = 4,
+		sort = 5,
+		id = 4,
+		btn_source = "神兵圣甲",
+		openserverDay = 0,
+		openLv = 1,
+	},
+	[5] = { openZs = 999, sort = 6, id = 5, btn_source = "活动", openserverDay = 1, openLv = 1 },
+	[6] = { openZs = 6, sort = 2, id = 6, btn_source = "内功", openserverDay = 1, openLv = 1 },
+	[7] = {
+		openZs = 0,
+		sort = 7,
+		id = 7,
+		btn_source = "元宝银两",
+		openserverDay = 1,
+		openLv = 1,
+	},
+	[8] = { openZs = 18, sort = 8, id = 8, btn_source = "字诀", openserverDay = 15, openLv = 1 },
+}