diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index dfe0138..683662c 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -4030,7 +4030,7 @@ ItemMergeConfig = { }, [7206] = { circle = 0, - compose = { id = 4, type = 0, count = 1000 }, + compose = { id = 0, type = 4, count = 1000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4044,7 +4044,7 @@ ItemMergeConfig = { }, [7207] = { circle = 0, - compose = { id = 4, type = 0, count = 3000 }, + compose = { id = 0, type = 4, count = 3000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4058,7 +4058,7 @@ ItemMergeConfig = { }, [7208] = { circle = 0, - compose = { id = 4, type = 0, count = 5000 }, + compose = { id = 0, type = 4, count = 5000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4072,7 +4072,7 @@ ItemMergeConfig = { }, [7209] = { circle = 0, - compose = { id = 4, type = 0, count = 10000 }, + compose = { id = 0, type = 4, count = 10000 }, index = 7, buttontxt10 = "合成10次", mergebutton10 = 1, @@ -4146,6 +4146,66 @@ ItemMergeConfig = { level = 1, redpoint = 1, }, + [7301] = { + circle = 0, + compose = { id = 3, type = 3, count = 300 }, + index = 7, + text = "兑换", + clicklimit = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 7301, + second_index = 3, + table = { { id = 829, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + redpoint = 1, + }, + [7302] = { + circle = 0, + compose = { id = 3, type = 3, count = 6000 }, + index = 7, + text = "兑换", + clicklimit = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 7302, + second_index = 3, + table = { { id = 830, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + redpoint = 1, + }, + [7303] = { + circle = 0, + compose = { id = 3, type = 3, count = 70000 }, + index = 7, + text = "兑换", + clicklimit = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 241, + second_index = 3, + table = { { id = 831, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + redpoint = 1, + }, + [7304] = { + circle = 0, + compose = { id = 3, type = 3, count = 260000 }, + index = 7, + text = "兑换", + clicklimit = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, + Eid = 7304, + second_index = 3, + table = { { id = 832, type = 0, count = 100 } }, + openserverday = 1, + level = 1, + redpoint = 1, + }, }, }, [8] = {