diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index 683662c..0df4478 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -1264,7 +1264,7 @@ ItemMergeConfig = { text = "合成", Eid = 11004, second_index = 2, - table = { { id = 847, type = 0, count = 500 }, { id = 4, type = 4, count = 50000 } }, + table = { { id = 847, type = 0, count = 500 }, { id = 4, type = 4, count = 100000 } }, }, [11005] = { circle = 0, @@ -1273,16 +1273,7 @@ ItemMergeConfig = { text = "合成", Eid = 11005, second_index = 2, - table = { { id = 844, type = 0, count = 500 }, { id = 4, type = 4, count = 100000 } }, - }, - [11006] = { - circle = 0, - compose = { id = 1384, type = 0, count = 1 }, - index = 1, - text = "合成", - Eid = 11006, - second_index = 2, - table = { { id = 845, type = 0, count = 1000 }, { id = 4, type = 4, count = 250000 } }, + table = { { id = 844, type = 0, count = 1000 }, { id = 4, type = 4, count = 250000 } }, }, }, }, diff --git a/LogicServer/data/config/drop/dropgroup.config b/LogicServer/data/config/drop/dropgroup.config index 5a4a8bd..6921d69 100755 --- a/LogicServer/data/config/drop/dropgroup.config +++ b/LogicServer/data/config/drop/dropgroup.config @@ -2195,6 +2195,26 @@ DropGroupConfig = { type = 1, group = { { rate = 100, id = 2100179 } }, }, + [100877] = { + id = 100877, + type = 1, + group = { { rate = 100, id = 2100180 } }, + }, + [100878] = { + id = 100878, + type = 1, + group = { { rate = 100, id = 2100181 } }, + }, + [100879] = { + id = 100879, + type = 1, + group = { { rate = 100, id = 2100182 } }, + }, + [100880] = { + id = 100880, + type = 1, + group = { { rate = 100, id = 2100183 } }, + }, [110001] = { id = 110001, type = 2, diff --git a/LogicServer/data/config/drop/droptable.config b/LogicServer/data/config/drop/droptable.config index f4fb752..01a9890 100755 --- a/LogicServer/data/config/drop/droptable.config +++ b/LogicServer/data/config/drop/droptable.config @@ -10221,4 +10221,92 @@ DropTableConfig = { weeklimit = {}, limitopenserverDay = 1, }, + -- 天龙套装 + [2100180] = { + id = 2100180, + type = 2, + drop = { + { rate = 100, type = 0, id = 803, count = 1 }, + { rate = 100, type = 0, id = 804, count = 1 }, + { rate = 100, type = 0, id = 805, count = 1 }, + { rate = 100, type = 0, id = 806, count = 1 }, + { rate = 100, type = 0, id = 807, count = 1 }, + { rate = 100, type = 0, id = 808, count = 1 }, + { rate = 100, type = 0, id = 809, count = 1 }, + { rate = 100, type = 0, id = 810, count = 1 }, + { rate = 100, type = 0, id = 811, count = 1 }, + { rate = 100, type = 0, id = 812, count = 1 }, + }, + weeklimit = {}, + limitopenserverDay = 1, + }, + --天之天龙套 + [2100181] = { + id = 2100181, + type = 2, + drop = { + { rate = 100, type = 0, id = 813, count = 1 }, + { rate = 100, type = 0, id = 814, count = 1 }, + { rate = 100, type = 0, id = 815, count = 1 }, + { rate = 100, type = 0, id = 816, count = 1 }, + { rate = 100, type = 0, id = 817, count = 1 }, + { rate = 100, type = 0, id = 818, count = 1 }, + { rate = 100, type = 0, id = 819, count = 1 }, + { rate = 100, type = 0, id = 820, count = 1 }, + { rate = 100, type = 0, id = 821, count = 1 }, + { rate = 100, type = 0, id = 822, count = 1 }, + }, + weeklimit = {}, + limitopenserverDay = 1, + }, + --金牛套 + [2100182] = { + id = 2100182, + type = 2, + drop = { + { rate = 100, type = 0, id = 779, count = 1 }, + { rate = 100, type = 0, id = 780, count = 1 }, + { rate = 100, type = 0, id = 781, count = 1 }, + { rate = 100, type = 0, id = 782, count = 1 }, + { rate = 100, type = 0, id = 783, count = 1 }, + { rate = 100, type = 0, id = 784, count = 1 }, + { rate = 100, type = 0, id = 785, count = 1 }, + { rate = 100, type = 0, id = 786, count = 1 }, + { rate = 100, type = 0, id = 787, count = 1 }, + { rate = 100, type = 0, id = 788, count = 1 }, + { rate = 100, type = 0, id = 789, count = 1 }, + { rate = 100, type = 0, id = 790, count = 1 }, + { rate = 10, type = 0, id = 1264, count = 1 }, + { rate = 10, type = 0, id = 1265, count = 1 }, + { rate = 10, type = 0, id = 1266, count = 1 }, + { rate = 10, type = 0, id = 1267, count = 1 }, + }, + weeklimit = {}, + limitopenserverDay = 1, + }, + --金牛炎套 + [2100182] = { + id = 2100182, + type = 2, + drop = { + { rate = 100, type = 0, id = 791, count = 1 }, + { rate = 100, type = 0, id = 792, count = 1 }, + { rate = 100, type = 0, id = 793, count = 1 }, + { rate = 100, type = 0, id = 794, count = 1 }, + { rate = 100, type = 0, id = 795, count = 1 }, + { rate = 100, type = 0, id = 796, count = 1 }, + { rate = 100, type = 0, id = 797, count = 1 }, + { rate = 100, type = 0, id = 798, count = 1 }, + { rate = 100, type = 0, id = 799, count = 1 }, + { rate = 10, type = 0, id = 800, count = 1 }, + { rate = 10, type = 0, id = 801, count = 1 }, + { rate = 100, type = 0, id = 802, count = 1 }, + { rate = 10, type = 0, id = 1372, count = 1 }, + { rate = 10, type = 0, id = 1373, count = 1 }, + { rate = 10, type = 0, id = 1374, count = 1 }, + { rate = 10, type = 0, id = 1375, count = 1 }, + }, + weeklimit = {}, + limitopenserverDay = 1, + }, } diff --git a/LogicServer/data/config/item/StdItems.config b/LogicServer/data/config/item/StdItems.config index d54a2f3..6cf0a56 100755 --- a/LogicServer/data/config/item/StdItems.config +++ b/LogicServer/data/config/item/StdItems.config @@ -46011,6 +46011,7 @@ StdItems = { }, [1379] = { dup = 9999, + showQuality = 5, denyDestroy = 1, isShowUseBtn = 1, iseffect = 124, @@ -46028,12 +46029,12 @@ StdItems = { type = 136, dealType = 0, conds = {}, - id = 1144, + id = 1379, denyDeal = 1, suitId = 0, desc = "打开后随机获得天之王者套装中的任意一件,获得随机奖励", recordLog = 1, - name = "天之王者随机宝箱", + name = "天之王者宝箱", trade = 3, dropBroadcast = -1, itemlvl = 3, @@ -46041,4 +46042,136 @@ StdItems = { dropGroupid = 100876, existScenes = { -1 }, }, + [1380] = { + dup = 9999, + showQuality = 5, + denyDestroy = 1, + isShowUseBtn = 1, + iseffect = 124, + forcetips = 2, + suggVocation = 0, + staitcAttrs = {}, + denySell = 1, + time = 0, + dealPrice = 10, + colGroup = 0, + cdTime = 0, + icon = 13509, + recoverid = 0, + packageType = 2, + type = 136, + dealType = 0, + conds = {}, + id = 1380, + denyDeal = 1, + suitId = 0, + desc = "打开后随机获得天龙套装中的任意一件,获得随机奖励", + recordLog = 1, + name = "天龙宝箱", + trade = 3, + dropBroadcast = -1, + itemlvl = 3, + shape = 0, + dropGroupid = 100877, + existScenes = { -1 }, + }, + [1381] = { + dup = 9999, + showQuality = 5, + denyDestroy = 1, + isShowUseBtn = 1, + iseffect = 124, + forcetips = 2, + suggVocation = 0, + staitcAttrs = {}, + denySell = 1, + time = 0, + dealPrice = 10, + colGroup = 0, + cdTime = 0, + icon = 13509, + recoverid = 0, + packageType = 2, + type = 136, + dealType = 0, + conds = {}, + id = 1381, + denyDeal = 1, + suitId = 0, + desc = "打开后随机获得天之天龙套装中的任意一件,获得随机奖励", + recordLog = 1, + name = "天之天龙宝箱", + trade = 3, + dropBroadcast = -1, + itemlvl = 3, + shape = 0, + dropGroupid = 100878, + existScenes = { -1 }, + }, + [1382] = { + dup = 9999, + showQuality = 5, + denyDestroy = 1, + isShowUseBtn = 1, + iseffect = 124, + forcetips = 2, + suggVocation = 0, + staitcAttrs = {}, + denySell = 1, + time = 0, + dealPrice = 10, + colGroup = 0, + cdTime = 0, + icon = 13509, + recoverid = 0, + packageType = 2, + type = 136, + dealType = 0, + conds = {}, + id = 1382, + denyDeal = 1, + suitId = 0, + desc = "打开后随机获得金牛套装中的任意一件,获得随机奖励", + recordLog = 1, + name = "金牛宝箱", + trade = 3, + dropBroadcast = -1, + itemlvl = 3, + shape = 0, + dropGroupid = 100879, + existScenes = { -1 }, + }, + [1383] = { + dup = 9999, + showQuality = 5, + denyDestroy = 1, + isShowUseBtn = 1, + iseffect = 124, + forcetips = 2, + suggVocation = 0, + staitcAttrs = {}, + denySell = 1, + time = 0, + dealPrice = 10, + colGroup = 0, + cdTime = 0, + icon = 13509, + recoverid = 0, + packageType = 2, + type = 136, + dealType = 0, + conds = {}, + id = 1383, + denyDeal = 1, + suitId = 0, + desc = "打开后随机获得金牛[炎]套装中的任意一件,获得随机奖励", + recordLog = 1, + name = "金牛[炎]宝箱", + trade = 3, + dropBroadcast = -1, + itemlvl = 3, + shape = 0, + dropGroupid = 100880, + existScenes = { -1 }, + }, }