From 322ef4ecf7ac9f4d743db568828db3f35333a54d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jan 2025 11:00:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(Item):=20=E6=96=B0=E5=A2=9E=E7=83=9B?=
 =?UTF-8?q?=E9=BE=99=E6=97=A5=E6=9C=88=E4=BD=A9=E5=90=88=E6=88=90=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E9=87=91=E5=88=B8=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增烛龙日月佩合成配方，使用5个1268、5个1269和10000金币合成
- 为15元、30元、50元和80元代金券添加批量使用界面
- 新增烛龙日月佩物品配置，具有高级属性和山海经套装特效
---
 .../data/config/Merge/ItemMerge.config        | 15 ++++++++
 LogicServer/data/config/item/StdItems.config  | 38 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index 639d15e..413e5c6 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -1929,6 +1929,21 @@ ItemMergeConfig = {
 				redpointlimit = { openDay = 85 },
 				redpoint = 1,
 			},
+			[3101] = {
+				circle = 0,
+				compose = { id = 1388, type = 0, count = 1 },
+				index = 3,
+				text = "合成",
+				Eid = 3101,
+				second_index = 1,
+				table = { { id = 1268, type = 0, count = 5 }, { id = 1269, type = 0, count = 5 }, {
+					id = 4,
+					type = 4,
+					count = 10000,
+				} },
+				level = 1,
+				redpoint = 1,
+			},
 		},
 		[2] = {
 			[72] = {
diff --git a/LogicServer/data/config/item/StdItems.config b/LogicServer/data/config/item/StdItems.config
index c44d9cb..a97cc56 100755
--- a/LogicServer/data/config/item/StdItems.config
+++ b/LogicServer/data/config/item/StdItems.config
@@ -12338,6 +12338,7 @@ StdItems = {
 		id = 397,
 		itemlvl = 3,
 		name = "15元代金券",
+		openUi = { type = 1, view = "app.BagBatchUseWin" },
 		packageType = 2,
 		recordLog = 1,
 		recoverView = { { count = 200, id = 2, rate = 100, type = 2 } },
@@ -12367,6 +12368,7 @@ StdItems = {
 		id = 398,
 		itemlvl = 3,
 		name = "30元代金券",
+		openUi = { type = 1, view = "app.BagBatchUseWin" },
 		packageType = 2,
 		recordLog = 1,
 		recoverView = { { count = 200, id = 2, rate = 100, type = 2 } },
@@ -12397,6 +12399,7 @@ StdItems = {
 		id = 399,
 		itemlvl = 3,
 		name = "50元代金券",
+		openUi = { type = 1, view = "app.BagBatchUseWin" },
 		packageType = 2,
 		recordLog = 1,
 		recoverView = { { count = 200, id = 2, rate = 100, type = 2 } },
@@ -12427,6 +12430,7 @@ StdItems = {
 		id = 400,
 		itemlvl = 3,
 		name = "80元代金券",
+		openUi = { type = 1, view = "app.BagBatchUseWin" },
 		packageType = 2,
 		recordLog = 1,
 		recoverView = { { count = 200, id = 2, rate = 100, type = 2 } },
@@ -46251,4 +46255,38 @@ StdItems = {
 		trade = 1,
 		type = 2,
 	},
+	[1388] = {
+		cdTime = 0,
+		colGroup = 0,
+		conds = { { cond = 6, value = 1 } },
+		dealPrice = 10,
+		dealType = 0,
+		denyDestroy = 1,
+		desc = "带有烛龙的日月图案，象征烛龙的掌控之力,山海经套装之一",
+		dropBroadcast = -1,
+		dropEffect = 11,
+		dup = 0,
+		existScenes = { -1 },
+		icon = 13734,
+		id = 1388,
+		itemEff = 5,
+		itemlevel = 250,
+		itemlvl = 3,
+		name = "烛龙日月佩",
+		packageType = 1,
+		recordLog = 1,
+		recoverView = { { count = 1, id = 1319, rate = 100, type = 0 } },
+		recoverid = 150091,
+		shape = 0,
+		showQuality = 5,
+		staitcAttrs = { { type = 81, value = 3000 }, { type = 6, value = 3000 }, { type = 70, value = 2000 }, {
+			type = 75,
+			value = 1500,
+		} },
+		suggVocation = 0,
+		suitId = 0,
+		time = 0,
+		trade = 1,
+		type = 16,
+	},
 }