diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index 0a670b7..edab9e8 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1630,6 +1630,8 @@ ItemMergeConfig = {
 				compose = { id = 1063, type = 0, count = 1 },
 				index = 2,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 211,
 				second_index = 5,
 				table = { { id = 1059, type = 0, count = 5 } },
@@ -1641,6 +1643,8 @@ ItemMergeConfig = {
 				compose = { id = 1064, type = 0, count = 1 },
 				index = 2,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 212,
 				second_index = 5,
 				table = { { id = 1060, type = 0, count = 5 } },
@@ -1652,6 +1656,8 @@ ItemMergeConfig = {
 				compose = { id = 1065, type = 0, count = 1 },
 				index = 2,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 213,
 				second_index = 5,
 				table = { { id = 1061, type = 0, count = 5 } },
@@ -1663,6 +1669,8 @@ ItemMergeConfig = {
 				compose = { id = 1066, type = 0, count = 1 },
 				index = 2,
 				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
 				Eid = 214,
 				second_index = 5,
 				table = { { id = 1062, type = 0, count = 5 } },
diff --git a/LogicServer/data/config/drop/droptable.config b/LogicServer/data/config/drop/droptable.config
index 01a9890..ad4f19d 100755
--- a/LogicServer/data/config/drop/droptable.config
+++ b/LogicServer/data/config/drop/droptable.config
@@ -10285,8 +10285,8 @@ DropTableConfig = {
 		limitopenserverDay = 1,
 	},
 	--金牛炎套
-	[2100182] = {
-		id = 2100182,
+	[2100183] = {
+		id = 2100183,
 		type = 2,
 		drop = {
 			{ rate = 100, type = 0, id = 791, count = 1 },
diff --git a/LogicServer/data/config/item/StdItems.config b/LogicServer/data/config/item/StdItems.config
index 3ea395c..45e4bc8 100755
--- a/LogicServer/data/config/item/StdItems.config
+++ b/LogicServer/data/config/item/StdItems.config
@@ -11834,9 +11834,8 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[380] = {
-		dup = 999,
+		dup = 99,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12174,7 +12173,6 @@ StdItems = {
 	[391] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12206,7 +12204,6 @@ StdItems = {
 	[392] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12238,7 +12235,6 @@ StdItems = {
 	[393] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12270,7 +12266,6 @@ StdItems = {
 	[394] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12302,7 +12297,6 @@ StdItems = {
 	[395] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12334,7 +12328,6 @@ StdItems = {
 	[396] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12366,7 +12359,6 @@ StdItems = {
 	[397] = {
 		dup = 9999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12397,7 +12389,6 @@ StdItems = {
 	[398] = {
 		dup = 9999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12428,7 +12419,6 @@ StdItems = {
 	[399] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12459,7 +12449,6 @@ StdItems = {
 	[400] = {
 		dup = 999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		forcetips = 0,
 		suggVocation = 0,
 		staitcAttrs = {},
@@ -12601,7 +12590,6 @@ StdItems = {
 	[404] = {
 		dup = 9999,
 		denyDestroy = 1,
-		isShowUseBtn = 1,
 		suggVocation = 0,
 		staitcAttrs = {},
 		denySell = 1,
@@ -26326,12 +26314,12 @@ StdItems = {
 			{ value = 999, type = 23 },
 			{ value = 999, type = 25 },
 			{ value = 999, type = 27 },
-			{ value = 6000, type = 54 },
+			{ value = 4000, type = 54 },
 			{ value = 3000, type = 84 },
 			{ value = 99999, type = 47 },
-			{ value = 600000, type = 95 },
-			{ value = 600000, type = 97 },
-			{ value = 600000, type = 99 },
+			{ value = 6000, type = 95 },
+			{ value = 6000, type = 97 },
+			{ value = 6000, type = 99 },
 		},
 		dealPrice = 10,
 		colGroup = 0,
@@ -41671,7 +41659,7 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[1244] = {
-		dup = 9999,
+		dup = 99,
 		denyDestroy = 1,
 		forcetips = 1,
 		suggVocation = 0,
@@ -41701,7 +41689,7 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[1245] = {
-		dup = 9999,
+		dup = 99,
 		denyDestroy = 1,
 		forcetips = 1,
 		suggVocation = 0,
@@ -41731,7 +41719,7 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[1246] = {
-		dup = 999,
+		dup = 99,
 		denyDestroy = 1,
 		forcetips = 1,
 		suggVocation = 0,
@@ -41761,7 +41749,7 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[1247] = {
-		dup = 999,
+		dup = 99,
 		denyDestroy = 1,
 		forcetips = 1,
 		suggVocation = 0,
@@ -41791,7 +41779,7 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[1248] = {
-		dup = 999,
+		dup = 99,
 		denyDestroy = 1,
 		forcetips = 1,
 		suggVocation = 0,
@@ -41821,7 +41809,7 @@ StdItems = {
 		existScenes = { -1 },
 	},
 	[1249] = {
-		dup = 999,
+		dup = 99,
 		denyDestroy = 1,
 		forcetips = 1,
 		suggVocation = 0,
diff --git a/LogicServer/data/envir/Scenes.config b/LogicServer/data/envir/Scenes.config
index 96444fa..ac865bd 100755
--- a/LogicServer/data/envir/Scenes.config
+++ b/LogicServer/data/envir/Scenes.config
@@ -762,9 +762,9 @@ Scenes = {
       { count = 30, time = 12, firstTime = 3, x = 252, y = 184, range = 200, entityid = 454, progress = 0, },
       { count = 30, time = 12, firstTime = 3, x = 252, y = 184, range = 200, entityid = 463, progress = 0, },
       --BOSS集合
-      { count = 1, time = 3600, firstTime = 3, x = 225, y = 67, range = 6, entityid = 456, progress = 0, }, --麒麟
-      { count = 1, time = 3600, firstTime = 3, x = 356, y = 329, range = 6, entityid = 435, progress = 0, }, --应龙
-      { count = 1, time = 3600, firstTime = 3, x = 487, y = 103, range = 6, entityid = 400, progress = 0, }, --玄武
+      { count = 1, time = 3600, firstTime = 3, x = 43, y = 143, range = 200, entityid = 456, progress = 0, }, --麒麟
+      { count = 1, time = 3600, firstTime = 3, x = 43, y = 143, range = 200, entityid = 435, progress = 0, }, --应龙
+      { count = 1, time = 3600, firstTime = 3, x = 43, y = 143, range = 200, entityid = 400, progress = 0, }, --玄武
       { count = 4, time = 3600, firstTime = 3, x = 333, y = 8, range = 100, entityid = 466, progress = 0, }, --钻石BOSS
       { count = 4, time = 36, firstTime = 3, x = 252, y = 184, range = 100, entityid = 434, progress = 0, }, --炼狱魔龙
       { count = 8, time = 36, firstTime = 3, x = 252, y = 184, range = 200, entityid = 465, progress = 0, }, --黄金BOSS