From d21d57ec67c1c05dd2944b95742fbcb943b92ae5 Mon Sep 17 00:00:00 2001 From: kubbo <390378816@qq.com> Date: Thu, 17 Apr 2025 15:11:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(ItemMerge):=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E7=89=A9=E5=93=81=E5=90=88=E6=88=90=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E7=8E=B0=E6=9C=89=E7=89=A9=E5=93=81?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ItemMerge.config 中添加了新的物品合成配置 [3206] - 调整了 StdItems.config 中多个物品的 staitcAttrs 属性格式 - 将 829、830、831、832 物品的 dup 属性从 9999 调整为 99999 --- .../data/config/Merge/ItemMerge.config | 13 + LogicServer/data/config/item/StdItems.config | 398 ++++++------------ 2 files changed, 137 insertions(+), 274 deletions(-) diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index 286563e..1dd3280 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -2063,6 +2063,19 @@ ItemMergeConfig = { openserverday = 15, level = 1, }, + [3206] = { + circle = 0, + compose = { id = 840, type = 0, count = 1 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3206, + second_index = 2, + table = { { id = 838, type = 0, count = 10 } }, + openserverday = 1, + level = 1, + }, }, [3] = { [3301] = { diff --git a/LogicServer/data/config/item/StdItems.config b/LogicServer/data/config/item/StdItems.config index 5eab961..8bb4c61 100755 --- a/LogicServer/data/config/item/StdItems.config +++ b/LogicServer/data/config/item/StdItems.config @@ -156,15 +156,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 6, - staitcAttrs = { - { type = 19, value = 22 }, - { type = 17, value = 9 }, - { type = 11, value = 12 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 22 }, { type = 17, value = 9 }, { type = 11, value = 12 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -193,15 +188,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 5, - staitcAttrs = { - { type = 15, value = 12 }, - { type = 13, value = 4 }, - { type = 11, value = 6 }, - { - type = 9, - value = 3, - }, - }, + staitcAttrs = { { type = 15, value = 12 }, { type = 13, value = 4 }, { type = 11, value = 6 }, { + type = 9, + value = 3, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -285,15 +275,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 9, - staitcAttrs = { - { type = 15, value = 22 }, - { type = 13, value = 9 }, - { type = 11, value = 10 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 22 }, { type = 13, value = 9 }, { type = 11, value = 10 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -381,15 +366,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 13, - staitcAttrs = { - { type = 19, value = 12 }, - { type = 17, value = 4 }, - { type = 11, value = 8 }, - { - type = 9, - value = 3, - }, - }, + staitcAttrs = { { type = 19, value = 12 }, { type = 17, value = 4 }, { type = 11, value = 8 }, { + type = 9, + value = 3, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -418,15 +398,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 11, - staitcAttrs = { - { type = 19, value = 15 }, - { type = 17, value = 5 }, - { type = 11, value = 9 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 15 }, { type = 17, value = 5 }, { type = 11, value = 9 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -483,15 +458,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 15, - staitcAttrs = { - { type = 15, value = 15 }, - { type = 13, value = 5 }, - { type = 11, value = 8 }, - { - type = 9, - value = 4, - }, - }, + staitcAttrs = { { type = 15, value = 15 }, { type = 13, value = 5 }, { type = 11, value = 8 }, { + type = 9, + value = 4, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -519,15 +489,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 16, - staitcAttrs = { - { type = 19, value = 27 }, - { type = 17, value = 12 }, - { type = 11, value = 12 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 27 }, { type = 17, value = 12 }, { type = 11, value = 12 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -580,15 +545,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 17, - staitcAttrs = { - { type = 15, value = 27 }, - { type = 13, value = 12 }, - { type = 11, value = 10 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 27 }, { type = 13, value = 12 }, { type = 11, value = 10 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -644,15 +604,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 19, - staitcAttrs = { - { type = 19, value = 32 }, - { type = 17, value = 14 }, - { type = 11, value = 9 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 32 }, { type = 17, value = 14 }, { type = 11, value = 9 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -708,15 +663,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 21, - staitcAttrs = { - { type = 15, value = 46 }, - { type = 13, value = 21 }, - { type = 11, value = 8 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 46 }, { type = 13, value = 21 }, { type = 11, value = 8 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -744,15 +694,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 22, - staitcAttrs = { - { type = 15, value = 32 }, - { type = 13, value = 14 }, - { type = 11, value = 8 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 32 }, { type = 13, value = 14 }, { type = 11, value = 8 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -848,15 +793,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 25, - staitcAttrs = { - { type = 15, value = 39 }, - { type = 13, value = 18 }, - { type = 11, value = 8 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 39 }, { type = 13, value = 18 }, { type = 11, value = 8 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -912,15 +852,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 27, - staitcAttrs = { - { type = 19, value = 39 }, - { type = 17, value = 18 }, - { type = 11, value = 9 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 39 }, { type = 17, value = 18 }, { type = 11, value = 9 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -976,15 +911,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 29, - staitcAttrs = { - { type = 15, value = 56 }, - { type = 13, value = 27 }, - { type = 11, value = 8 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 56 }, { type = 13, value = 27 }, { type = 11, value = 8 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -1012,15 +942,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 30, - staitcAttrs = { - { type = 19, value = 56 }, - { type = 17, value = 27 }, - { type = 11, value = 9 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 56 }, { type = 17, value = 27 }, { type = 11, value = 9 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -1048,15 +973,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 31, - staitcAttrs = { - { type = 19, value = 46 }, - { type = 17, value = 21 }, - { type = 11, value = 9 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 46 }, { type = 17, value = 21 }, { type = 11, value = 9 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -1112,15 +1032,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 35, - staitcAttrs = { - { type = 15, value = 72 }, - { type = 13, value = 35 }, - { type = 11, value = 8 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 15, value = 72 }, { type = 13, value = 35 }, { type = 11, value = 8 }, { + type = 9, + value = 5, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -1148,15 +1063,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 38, - staitcAttrs = { - { type = 19, value = 72 }, - { type = 17, value = 35 }, - { type = 11, value = 9 }, - { - type = 9, - value = 5, - }, - }, + staitcAttrs = { { type = 19, value = 72 }, { type = 17, value = 35 }, { type = 11, value = 9 }, { + type = 9, + value = 5, + } }, suggVocation = 3, suitId = 0, time = 0, @@ -1494,15 +1404,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 1, - staitcAttrs = { - { type = 27, value = 1 }, - { type = 25, value = 0 }, - { type = 23, value = 2 }, - { - type = 21, - value = 0, - }, - }, + staitcAttrs = { { type = 27, value = 1 }, { type = 25, value = 0 }, { type = 23, value = 2 }, { + type = 21, + value = 0, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -1531,15 +1436,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 2, - staitcAttrs = { - { type = 27, value = 2 }, - { type = 25, value = 1 }, - { type = 23, value = 3 }, - { - type = 21, - value = 3, - }, - }, + staitcAttrs = { { type = 27, value = 2 }, { type = 25, value = 1 }, { type = 23, value = 3 }, { + type = 21, + value = 3, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -1790,15 +1690,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 2, - staitcAttrs = { - { type = 27, value = 3 }, - { type = 25, value = 2 }, - { type = 23, value = 4 }, - { - type = 21, - value = 3, - }, - }, + staitcAttrs = { { type = 27, value = 3 }, { type = 25, value = 2 }, { type = 23, value = 4 }, { + type = 21, + value = 3, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -2461,15 +2356,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 0, - staitcAttrs = { - { type = 27, value = 1 }, - { type = 25, value = 0 }, - { type = 23, value = 1 }, - { - type = 21, - value = 0, - }, - }, + staitcAttrs = { { type = 27, value = 1 }, { type = 25, value = 0 }, { type = 23, value = 1 }, { + type = 21, + value = 0, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -4011,15 +3901,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 0, - staitcAttrs = { - { type = 54, value = 20 }, - { type = 83, value = 20 }, - { type = 136, value = 20 }, - { - type = 75, - value = 20, - }, - }, + staitcAttrs = { { type = 54, value = 20 }, { type = 83, value = 20 }, { type = 136, value = 20 }, { + type = 75, + value = 20, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -4134,15 +4019,10 @@ StdItems = { recoverView = { { count = 100, id = 0, rate = 100, type = 2 } }, recoverid = 150051, shape = 0, - staitcAttrs = { - { type = 27, value = 1 }, - { type = 25, value = 0 }, - { type = 23, value = 1 }, - { - type = 21, - value = 0, - }, - }, + staitcAttrs = { { type = 27, value = 1 }, { type = 25, value = 0 }, { type = 23, value = 1 }, { + type = 21, + value = 0, + } }, suggVocation = 2, suitId = 0, time = 0, @@ -15985,15 +15865,10 @@ StdItems = { recoverView = { { count = 120, id = 2, rate = 100, type = 2 } }, recoverid = 150052, shape = 0, - staitcAttrs = { - { type = 27, value = 2 }, - { type = 25, value = 2 }, - { type = 23, value = 2 }, - { - type = 21, - value = 2, - }, - }, + staitcAttrs = { { type = 27, value = 2 }, { type = 25, value = 2 }, { type = 23, value = 2 }, { + type = 21, + value = 2, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -27557,7 +27432,7 @@ StdItems = { desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得", dropBroadcast = 1, dropEffect = 3, - dup = 9999, + dup = 99999, existScenes = { -1 }, icon = 13131, id = 829, @@ -27588,7 +27463,7 @@ StdItems = { desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得", dropBroadcast = -1, dropEffect = 14, - dup = 9999, + dup = 99999, existScenes = { -1 }, icon = 13131, id = 830, @@ -27619,7 +27494,7 @@ StdItems = { desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得", dropBroadcast = -1, dropEffect = 11, - dup = 9999, + dup = 99999, existScenes = { -1 }, icon = 13131, id = 831, @@ -27650,7 +27525,7 @@ StdItems = { desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得", dropBroadcast = -1, dropEffect = 12, - dup = 9999, + dup = 99999, existScenes = { -1 }, icon = 13131, id = 832, @@ -32985,15 +32860,10 @@ StdItems = { recoverid = 150063, shape = 0, showQuality = 4, - staitcAttrs = { - { type = 35, value = 2000 }, - { type = 6, value = 2000 }, - { type = 27, value = 22 }, - { - type = 25, - value = 22, - }, - }, + staitcAttrs = { { type = 35, value = 2000 }, { type = 6, value = 2000 }, { type = 27, value = 22 }, { + type = 25, + value = 22, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -33436,15 +33306,10 @@ StdItems = { recoverView = { { count = 10, id = 0, rate = 100, type = 2 } }, recoverid = 100054, shape = 0, - staitcAttrs = { - { type = 0, value = 227 }, - { type = 0, value = 226 }, - { type = 0, value = 225 }, - { - type = 0, - value = 224, - }, - }, + staitcAttrs = { { type = 0, value = 227 }, { type = 0, value = 226 }, { type = 0, value = 225 }, { + type = 0, + value = 224, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -42555,15 +42420,10 @@ StdItems = { recoverid = 1500, shape = 0, showQuality = 5, - staitcAttrs = { - { type = 80, value = 1700 }, - { type = 101, value = 600 }, - { type = 116, value = 600 }, - { - type = 138, - value = 1500, - }, - }, + staitcAttrs = { { type = 80, value = 1700 }, { type = 101, value = 600 }, { type = 116, value = 600 }, { + type = 138, + value = 1500, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -42594,15 +42454,10 @@ StdItems = { recoverid = 150091, shape = 0, showQuality = 5, - staitcAttrs = { - { type = 81, value = 1800 }, - { type = 6, value = 1800 }, - { type = 79, value = 1500 }, - { - type = 70, - value = 1500, - }, - }, + staitcAttrs = { { type = 81, value = 1800 }, { type = 6, value = 1800 }, { type = 79, value = 1500 }, { + type = 70, + value = 1500, + } }, suggVocation = 0, suitId = 0, time = 0, @@ -46422,15 +46277,10 @@ StdItems = { recoverid = 150091, shape = 0, showQuality = 5, - staitcAttrs = { - { type = 81, value = 3000 }, - { type = 6, value = 3000 }, - { type = 70, value = 2000 }, - { - type = 75, - value = 1500, - }, - }, + staitcAttrs = { { type = 81, value = 3000 }, { type = 6, value = 3000 }, { type = 70, value = 2000 }, { + type = 75, + value = 1500, + } }, suggVocation = 0, suitId = 0, time = 0,