From d9046c03b7b081e8ca6f7c84a93e85580bfdd00a Mon Sep 17 00:00:00 2001 From: kubbo <390378816@qq.com> Date: Sun, 26 Jan 2025 22:56:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(item):=20=E6=9B=B4=E6=96=B0=E9=81=93?= =?UTF-8?q?=E5=85=B7=E5=90=88=E6=88=90=E9=85=8D=E7=BD=AE=E5=92=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整了多个道具的合成成本和产出 - 更新了部分道具的使用界面为回收窗口 - 新增了多个代金券道具的回收配置 - 优化了银两道具的回收参数 - 移除了部分代金券道具的使用界面配置 --- .../data/config/Merge/ItemMerge.config | 391 ++++++++++++++++-- LogicServer/data/config/item/StdItems.config | 44 +- 2 files changed, 385 insertions(+), 50 deletions(-) diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index 5fe79c7..4efdeea 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -1946,19 +1946,6 @@ ItemMergeConfig = { }, }, [2] = { - [72] = { - circle = 0, - compose = { id = 2, type = 2, count = 20000 }, - index = 3, - text = "兑换", - buttontxt10 = "合成10次", - mergebutton10 = 1, - Eid = 72, - second_index = 2, - table = { { id = 838, type = 0, count = 10 } }, - openserverday = 1, - level = 1, - }, [73] = { circle = 0, compose = { id = 838, type = 0, count = 10 }, @@ -2144,27 +2131,53 @@ ItemMergeConfig = { [4] = { [3401] = { circle = 1, - compose = { id = 13, type = 13, count = 25000000 }, + compose = { id = 13, type = 13, count = 2500000 }, index = 3, text = "兑换", buttontxt10 = "合成10次", mergebutton10 = 1, Eid = 3401, second_index = 4, - table = { { id = 300, type = 0, count = 10 } }, + table = { { id = 300, type = 0, count = 1 } }, openserverday = 1, level = 1, }, [3402] = { circle = 1, - compose = { id = 13, type = 13, count = 80000000 }, + compose = { id = 13, type = 13, count = 250000000 }, index = 3, text = "兑换", buttontxt10 = "合成10次", mergebutton10 = 1, Eid = 3402, second_index = 4, - table = { { id = 301, type = 0, count = 10 } }, + table = { { id = 300, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [3403] = { + circle = 1, + compose = { id = 13, type = 13, count = 8000000 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3403, + second_index = 4, + table = { { id = 301, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [3404] = { + circle = 1, + compose = { id = 13, type = 13, count = 800000000 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3404, + second_index = 4, + table = { { id = 301, type = 0, count = 100 } }, openserverday = 1, level = 1, }, @@ -4240,7 +4253,7 @@ ItemMergeConfig = { [2] = { [7201] = { circle = 0, - compose = { id = 4, type = 4, count = 1500 }, + compose = { id = 4, type = 4, count = 1000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4248,13 +4261,13 @@ ItemMergeConfig = { clicklimit = 1, Eid = 7201, second_index = 1, - table = { { id = 397, type = 0, count = 10 } }, + table = { { id = 389, type = 0, count = 1 } }, openserverday = 1, level = 1, }, [7202] = { circle = 0, - compose = { id = 4, type = 4, count = 150000 }, + compose = { id = 4, type = 4, count = 100000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4262,13 +4275,13 @@ ItemMergeConfig = { clicklimit = 1, Eid = 7202, second_index = 1, - table = { { id = 397, type = 0, count = 1000 } }, + table = { { id = 389, type = 0, count = 100 } }, openserverday = 1, level = 1, }, [7203] = { circle = 0, - compose = { id = 4, type = 4, count = 3000 }, + compose = { id = 4, type = 4, count = 1000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4276,27 +4289,27 @@ ItemMergeConfig = { clicklimit = 1, Eid = 7203, second_index = 1, - table = { { id = 398, type = 0, count = 10 } }, + table = { { id = 389, type = 0, count = 1 } }, openserverday = 1, level = 1, }, [7204] = { circle = 0, - compose = { id = 4, type = 4, count = 300000 }, + compose = { id = 4, type = 4, count = 100000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, text = "兑换", clicklimit = 1, - Eid = 7203, + Eid = 7204, second_index = 1, - table = { { id = 398, type = 0, count = 1000 } }, + table = { { id = 389, type = 0, count = 100 } }, openserverday = 1, level = 1, }, [7205] = { circle = 0, - compose = { id = 4, type = 4, count = 5000 }, + compose = { id = 4, type = 4, count = 1000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4304,7 +4317,329 @@ ItemMergeConfig = { clicklimit = 1, Eid = 7205, second_index = 1, - table = { { id = 399, type = 0, count = 10 } }, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7206] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7206, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7207] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7207, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7208] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7208, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7209] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7209, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7210] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7210, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7211] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7211, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7212] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7212, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7213] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7213, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7214] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7214, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7215] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7215, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7216] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7216, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7217] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7217, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7218] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7218, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7219] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7219, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7220] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7220, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7221] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7221, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7222] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7222, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7223] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7223, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7224] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7224, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7225] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7225, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7226] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7226, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + }, + [7227] = { + circle = 0, + compose = { id = 4, type = 4, count = 1000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7227, + second_index = 1, + table = { { id = 389, type = 0, count = 1 } }, + openserverday = 1, + level = 1, + }, + [7228] = { + circle = 0, + compose = { id = 4, type = 4, count = 100000 }, + index = 7, + buttontxt10 = "合成10次", + mergebutton10 = 1, + text = "兑换", + clicklimit = 1, + Eid = 7228, + second_index = 1, + table = { { id = 389, type = 0, count = 100 } }, openserverday = 1, level = 1, }, diff --git a/LogicServer/data/config/item/StdItems.config b/LogicServer/data/config/item/StdItems.config index a2bc307..5ec7f88 100755 --- a/LogicServer/data/config/item/StdItems.config +++ b/LogicServer/data/config/item/StdItems.config @@ -9049,6 +9049,7 @@ StdItems = { isShowUseBtn = 1, itemlvl = 3, name = "多倍经验瓶(小)", + openUi = { param1 = { 1, 3, 4 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverid = 0, @@ -9077,7 +9078,7 @@ StdItems = { id = 300, itemlvl = 3, name = "多倍经验瓶", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 3, 4 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverid = 0, @@ -9105,6 +9106,7 @@ StdItems = { id = 301, itemlvl = 3, name = "多倍经验瓶(大)", + openUi = { param1 = { 1, 3, 4 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverid = 0, @@ -9134,7 +9136,7 @@ StdItems = { isShowUseBtn = 1, itemlvl = 3, name = "精力水晶", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 3, 4 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recoverid = 0, shape = 0, @@ -11815,7 +11817,7 @@ StdItems = { id = 380, itemlvl = 3, name = "100元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12057,7 +12059,7 @@ StdItems = { isShowUseBtn = 1, itemlvl = 3, name = "200元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12089,7 +12091,7 @@ StdItems = { isShowUseBtn = 1, itemlvl = 3, name = "500元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12121,7 +12123,7 @@ StdItems = { isShowUseBtn = 1, itemlvl = 3, name = "一千元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12152,7 +12154,7 @@ StdItems = { id = 391, itemlvl = 3, name = "两千元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12183,7 +12185,7 @@ StdItems = { id = 392, itemlvl = 3, name = "五千元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12214,7 +12216,7 @@ StdItems = { id = 393, itemlvl = 3, name = "一万元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12245,7 +12247,7 @@ StdItems = { id = 394, itemlvl = 3, name = "1元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12276,7 +12278,7 @@ StdItems = { id = 395, itemlvl = 3, name = "5元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12307,7 +12309,7 @@ StdItems = { id = 396, itemlvl = 3, name = "10元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12338,7 +12340,7 @@ StdItems = { id = 397, itemlvl = 3, name = "15元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12368,7 +12370,7 @@ StdItems = { id = 398, itemlvl = 3, name = "30元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12399,7 +12401,7 @@ StdItems = { id = 399, itemlvl = 3, name = "50元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -12430,7 +12432,7 @@ StdItems = { id = 400, itemlvl = 3, name = "80元代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, + openUi = { param1 = { 1, 7, 2 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -27440,7 +27442,7 @@ StdItems = { itemEff = 5, itemlvl = 3, name = "银两(小)", - openUi = { param1 = { 1, 3, 7 }, type = 3, view = "app.RecycleWin" }, + openUi = { param1 = { 1, 7, 3 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, shape = 0, @@ -27471,7 +27473,7 @@ StdItems = { itemEff = 5, itemlvl = 3, name = "银两(中)", - openUi = { param1 = { 1, 3, 7 }, type = 3, view = "app.RecycleWin" }, + openUi = { param1 = { 1, 7, 3 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, shape = 0, @@ -27502,7 +27504,7 @@ StdItems = { itemEff = 5, itemlvl = 3, name = "银两(大)", - openUi = { param1 = { 1, 3, 7 }, type = 3, view = "app.RecycleWin" }, + openUi = { param1 = { 1, 7, 3 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, shape = 0, @@ -27533,7 +27535,7 @@ StdItems = { itemEff = 5, itemlvl = 3, name = "银两(海量)", - openUi = { param1 = { 1, 3, 7 }, type = 3, view = "app.RecycleWin" }, + openUi = { param1 = { 1, 7, 3 }, type = 3, view = "app.RecycleWin" }, packageType = 2, recordLog = 1, shape = 0, @@ -43590,7 +43592,6 @@ StdItems = { itemEff = 5, itemlvl = 3, name = "3万元宝代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } }, @@ -43623,7 +43624,6 @@ StdItems = { itemEff = 5, itemlvl = 3, name = "5万元宝代金券", - openUi = { type = 1, view = "app.BagBatchUseWin" }, packageType = 2, recordLog = 1, recoverView = { { count = 200, id = 2, rate = 100, type = 2 } },