diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index cce109a..e841df3 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -1883,7 +1883,7 @@ ItemMergeConfig = { mergebutton10 = 1, Eid = 132, second_index = 2, - table = { { id = 841, type = 0, count = 3 }, { id = 2, type = 2, count = 1000000 } }, + table = { { id = 841, type = 0, count = 3 }, { id = 2, type = 2, count = 100000 } }, openserverday = 15, level = 1, }, @@ -1900,6 +1900,71 @@ ItemMergeConfig = { openserverday = 1, level = 1, }, + [3201] = { + circle = 0, + compose = { id = 843, type = 0, count = 1 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3201, + second_index = 2, + table = { { id = 842, type = 0, count = 10 }, { id = 3, type = 3, count = 500 } }, + openserverday = 15, + level = 1, + }, + [3202] = { + circle = 0, + compose = { id = 846, type = 0, count = 1 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3202, + second_index = 2, + table = { { id = 843, type = 0, count = 10 }, { id = 4, type = 4, count = 50 } }, + openserverday = 15, + level = 1, + }, + [3203] = { + circle = 0, + compose = { id = 847, type = 0, count = 1 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3203, + second_index = 2, + table = { { id = 846, type = 0, count = 10 }, { id = 4, type = 4, count = 100 } }, + openserverday = 15, + level = 1, + }, + [3204] = { + circle = 0, + compose = { id = 844, type = 0, count = 1 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3204, + second_index = 2, + table = { { id = 847, type = 0, count = 10 }, { id = 4, type = 4, count = 200 } }, + openserverday = 15, + level = 1, + }, + [3205] = { + circle = 0, + compose = { id = 845, type = 0, count = 1 }, + index = 3, + text = "兑换", + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 3205, + second_index = 2, + table = { { id = 844, type = 0, count = 10 }, { id = 4, type = 4, count = 500 } }, + openserverday = 15, + level = 1, + }, }, [3] = { [11001] = {