From bdeb65676adfc59883b290bf118ebb77ed91be44 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 14 Jan 2025 17:41:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(ItemMerge):=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=89=A9=E5=93=81=E5=85=91=E6=8D=A2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ItemMerge.config 中添加了两个新的兑换配置项，ID 分别为 3401 和 3402
- 新增配置项使用物品 ID 13 进行兑换，分别需要 25000000 和 80000000 个物品 13
- 兑换后分别获得 10 个物品 ID 为 300 和 301 的物品
- 更新了 StdItems.config 中多个物品的属性，包括删除不必要的 openUi 字段
- 调整了部分物品的 iseffect 和 dropBroadcast 属性
---
 .../data/config/Merge/ItemMerge.config        |  28 ++
 LogicServer/data/config/item/StdItems.config  | 314 ++++++------------
 2 files changed, 126 insertions(+), 216 deletions(-)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index edab9e8..9924ff8 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1955,6 +1955,34 @@ ItemMergeConfig = {
 				table = { { id = 845, type = 0, count = 500 }, { id = 4, type = 4, count = 100000 } },
 			},
 		},
+		[4] = {
+			[3401] = {
+				circle = 1,
+				compose = { id = 13, type = 13, count = 25000000 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3401,
+				second_index = 4,
+				table = { { id = 300, type = 0, count = 10 } },
+				openserverday = 1,
+				level = 1,
+			},
+			[3402] = {
+				circle = 1,
+				compose = { id = 13, type = 13, count = 80000000 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 3402,
+				second_index = 4,
+				table = { { id = 301, type = 0, count = 10 } },
+				openserverday = 1,
+				level = 1,
+			},
+		},
 	},
 	[4] = {
 		[1] = {
diff --git a/LogicServer/data/config/item/StdItems.config b/LogicServer/data/config/item/StdItems.config
index 3d8a620..b6f43a1 100755
--- a/LogicServer/data/config/item/StdItems.config
+++ b/LogicServer/data/config/item/StdItems.config
@@ -138,15 +138,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 12, type = 11 },
-			{ value = 9, type = 17 },
-			{
-				value = 22,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 12, type = 11 }, { value = 9, type = 17 }, {
+			value = 22,
+			type = 19,
+		} },
 		denySell = 1,
 		time = 0,
 		forcetips = 0,
@@ -174,15 +169,10 @@ StdItems = {
 	[7] = {
 		dup = 0,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 3, type = 9 },
-			{ value = 6, type = 11 },
-			{ value = 4, type = 13 },
-			{
-				value = 12,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 3, type = 9 }, { value = 6, type = 11 }, { value = 4, type = 13 }, {
+			value = 12,
+			type = 15,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -267,15 +257,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 10, type = 11 },
-			{ value = 9, type = 13 },
-			{
-				value = 22,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 10, type = 11 }, { value = 9, type = 13 }, {
+			value = 22,
+			type = 15,
+		} },
 		denySell = 1,
 		time = 0,
 		forcetips = 0,
@@ -362,15 +347,10 @@ StdItems = {
 	[13] = {
 		dup = 0,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 3, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 4, type = 17 },
-			{
-				value = 12,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 3, type = 9 }, { value = 8, type = 11 }, { value = 4, type = 17 }, {
+			value = 12,
+			type = 19,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -399,15 +379,10 @@ StdItems = {
 	[14] = {
 		dup = 0,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 9, type = 11 },
-			{ value = 5, type = 17 },
-			{
-				value = 15,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 9, type = 11 }, { value = 5, type = 17 }, {
+			value = 15,
+			type = 19,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -464,15 +439,10 @@ StdItems = {
 	[16] = {
 		dup = 0,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 4, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 5, type = 13 },
-			{
-				value = 15,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 4, type = 9 }, { value = 8, type = 11 }, { value = 5, type = 13 }, {
+			value = 15,
+			type = 15,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -621,15 +591,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 9, type = 11 },
-			{ value = 14, type = 17 },
-			{
-				value = 32,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 9, type = 11 }, { value = 14, type = 17 }, {
+			value = 32,
+			type = 19,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 48000,
@@ -685,15 +650,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 21, type = 13 },
-			{
-				value = 46,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 8, type = 11 }, { value = 21, type = 13 }, {
+			value = 46,
+			type = 15,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 150000,
@@ -721,15 +681,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 14, type = 13 },
-			{
-				value = 32,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 8, type = 11 }, { value = 14, type = 13 }, {
+			value = 32,
+			type = 15,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 48000,
@@ -825,15 +780,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 18, type = 13 },
-			{
-				value = 39,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 8, type = 11 }, { value = 18, type = 13 }, {
+			value = 39,
+			type = 15,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 90000,
@@ -889,15 +839,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 9, type = 11 },
-			{ value = 18, type = 17 },
-			{
-				value = 39,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 9, type = 11 }, { value = 18, type = 17 }, {
+			value = 39,
+			type = 19,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 90000,
@@ -953,15 +898,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 27, type = 13 },
-			{
-				value = 56,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 8, type = 11 }, { value = 27, type = 13 }, {
+			value = 56,
+			type = 15,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 240000,
@@ -989,15 +929,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 9, type = 11 },
-			{ value = 27, type = 17 },
-			{
-				value = 56,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 9, type = 11 }, { value = 27, type = 17 }, {
+			value = 56,
+			type = 19,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 240000,
@@ -1025,15 +960,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 9, type = 11 },
-			{ value = 21, type = 17 },
-			{
-				value = 46,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 9, type = 11 }, { value = 21, type = 17 }, {
+			value = 46,
+			type = 19,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 150000,
@@ -1089,15 +1019,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 8, type = 11 },
-			{ value = 35, type = 13 },
-			{
-				value = 72,
-				type = 15,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 8, type = 11 }, { value = 35, type = 13 }, {
+			value = 72,
+			type = 15,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 360000,
@@ -1125,15 +1050,10 @@ StdItems = {
 		dup = 0,
 		denyDestroy = 1,
 		suggVocation = 3,
-		staitcAttrs = {
-			{ value = 5, type = 9 },
-			{ value = 9, type = 11 },
-			{ value = 35, type = 17 },
-			{
-				value = 72,
-				type = 19,
-			},
-		},
+		staitcAttrs = { { value = 5, type = 9 }, { value = 9, type = 11 }, { value = 35, type = 17 }, {
+			value = 72,
+			type = 19,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 360000,
@@ -1497,15 +1417,10 @@ StdItems = {
 	[47] = {
 		dup = 0,
 		suggVocation = 0,
-		staitcAttrs = {
-			{ value = 0, type = 21 },
-			{ value = 2, type = 23 },
-			{ value = 0, type = 25 },
-			{
-				value = 1,
-				type = 27,
-			},
-		},
+		staitcAttrs = { { value = 0, type = 21 }, { value = 2, type = 23 }, { value = 0, type = 25 }, {
+			value = 1,
+			type = 27,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -1534,15 +1449,10 @@ StdItems = {
 	[48] = {
 		dup = 0,
 		suggVocation = 0,
-		staitcAttrs = {
-			{ value = 3, type = 21 },
-			{ value = 3, type = 23 },
-			{ value = 1, type = 25 },
-			{
-				value = 2,
-				type = 27,
-			},
-		},
+		staitcAttrs = { { value = 3, type = 21 }, { value = 3, type = 23 }, { value = 1, type = 25 }, {
+			value = 2,
+			type = 27,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -1793,15 +1703,10 @@ StdItems = {
 	[55] = {
 		dup = 0,
 		suggVocation = 0,
-		staitcAttrs = {
-			{ value = 3, type = 21 },
-			{ value = 4, type = 23 },
-			{ value = 2, type = 25 },
-			{
-				value = 3,
-				type = 27,
-			},
-		},
+		staitcAttrs = { { value = 3, type = 21 }, { value = 4, type = 23 }, { value = 2, type = 25 }, {
+			value = 3,
+			type = 27,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -2464,15 +2369,10 @@ StdItems = {
 	[76] = {
 		dup = 0,
 		suggVocation = 0,
-		staitcAttrs = {
-			{ value = 0, type = 21 },
-			{ value = 1, type = 23 },
-			{ value = 0, type = 25 },
-			{
-				value = 1,
-				type = 27,
-			},
-		},
+		staitcAttrs = { { value = 0, type = 21 }, { value = 1, type = 23 }, { value = 0, type = 25 }, {
+			value = 1,
+			type = 27,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -4134,15 +4034,10 @@ StdItems = {
 	[129] = {
 		dup = 0,
 		suggVocation = 2,
-		staitcAttrs = {
-			{ value = 0, type = 21 },
-			{ value = 1, type = 23 },
-			{ value = 0, type = 25 },
-			{
-				value = 1,
-				type = 27,
-			},
-		},
+		staitcAttrs = { { value = 0, type = 21 }, { value = 1, type = 23 }, { value = 0, type = 25 }, {
+			value = 1,
+			type = 27,
+		} },
 		denySell = 1,
 		forcetips = 0,
 		time = 0,
@@ -9190,7 +9085,6 @@ StdItems = {
 		suitId = 0,
 		desc = "使用增加80万多倍经验，多倍经验使用期间打怪享受超级翻番",
 		recordLog = 1,
-		openUi = { view = "app.BagBatchUseWin", type = 1 },
 		name = "多倍经验瓶(小)",
 		dealPrice = 10,
 		dropBroadcast = 0,
@@ -9220,7 +9114,6 @@ StdItems = {
 		suitId = 0,
 		desc = "使用增加250万多倍经验，多倍经验使用期间打怪享受超级翻番",
 		recordLog = 1,
-		openUi = { view = "app.BagBatchUseWin", type = 1 },
 		name = "多倍经验瓶",
 		dealPrice = 10,
 		dropBroadcast = -1,
@@ -15995,15 +15888,10 @@ StdItems = {
 	[509] = {
 		dup = 0,
 		suggVocation = 0,
-		staitcAttrs = {
-			{ value = 2, type = 21 },
-			{ value = 2, type = 23 },
-			{ value = 2, type = 25 },
-			{
-				value = 2,
-				type = 27,
-			},
-		},
+		staitcAttrs = { { value = 2, type = 21 }, { value = 2, type = 23 }, { value = 2, type = 25 }, {
+			value = 2,
+			type = 27,
+		} },
 		time = 0,
 		forcetips = 0,
 		dealPrice = 10,
@@ -46101,8 +45989,7 @@ StdItems = {
 		showQuality = 5,
 		denyDestroy = 1,
 		isShowUseBtn = 1,
-		iseffect = 124,
-		forcetips = 2,
+		iseffect = 127,
 		suggVocation = 0,
 		staitcAttrs = {},
 		denySell = 1,
@@ -46111,7 +45998,7 @@ StdItems = {
 		colGroup = 0,
 		cdTime = 0,
 		icon = 13509,
-		recoverid = 0,
+		recoverid = 150091,
 		packageType = 2,
 		type = 131,
 		dealType = 0,
@@ -46122,8 +46009,7 @@ StdItems = {
 		desc = "打开后随机获得天之王者套装中的任意一件，获得随机奖励",
 		recordLog = 1,
 		name = "天之王者宝箱",
-		trade = 3,
-		dropBroadcast = -1,
+		dropBroadcast = 0,
 		itemlvl = 3,
 		shape = 0,
 		dropGroupid = 100876,
@@ -46137,7 +46023,6 @@ StdItems = {
 		denySell = 1,
 		isShowUseBtn = 1,
 		time = 0,
-		forcetips = 1,
 		colGroup = 0,
 		cdTime = 0,
 		icon = 13509,
@@ -46158,7 +46043,7 @@ StdItems = {
 		itemlvl = 3,
 		shape = 0,
 		existScenes = { -1 },
-		iseffect = 124,
+		iseffect = 127,
 		showQuality = 5,
 	},
 	[1381] = {
@@ -46166,8 +46051,7 @@ StdItems = {
 		showQuality = 5,
 		denyDestroy = 1,
 		isShowUseBtn = 1,
-		iseffect = 124,
-		forcetips = 2,
+		iseffect = 127,
 		suggVocation = 0,
 		staitcAttrs = {},
 		denySell = 1,
@@ -46188,7 +46072,7 @@ StdItems = {
 		recordLog = 1,
 		name = "天之天龙宝箱",
 		trade = 3,
-		dropBroadcast = -1,
+		dropBroadcast = 0,
 		itemlvl = 3,
 		shape = 0,
 		dropGroupid = 100878,
@@ -46199,8 +46083,7 @@ StdItems = {
 		showQuality = 5,
 		denyDestroy = 1,
 		isShowUseBtn = 1,
-		iseffect = 124,
-		forcetips = 2,
+		iseffect = 127,
 		suggVocation = 0,
 		staitcAttrs = {},
 		denySell = 1,
@@ -46221,7 +46104,7 @@ StdItems = {
 		recordLog = 1,
 		name = "金牛宝箱",
 		trade = 3,
-		dropBroadcast = -1,
+		dropBroadcast = 0,
 		itemlvl = 3,
 		shape = 0,
 		dropGroupid = 100879,
@@ -46232,8 +46115,7 @@ StdItems = {
 		showQuality = 5,
 		denyDestroy = 1,
 		isShowUseBtn = 1,
-		iseffect = 124,
-		forcetips = 2,
+		iseffect = 127,
 		suggVocation = 0,
 		staitcAttrs = {},
 		denySell = 1,
@@ -46254,7 +46136,7 @@ StdItems = {
 		recordLog = 1,
 		name = "金牛[炎]宝箱",
 		trade = 3,
-		dropBroadcast = -1,
+		dropBroadcast = 0,
 		itemlvl = 3,
 		shape = 0,
 		dropGroupid = 100880,