diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index 1949663..cd27c03 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -1225,57 +1225,6 @@ ItemMergeConfig = { redpoint = 2, }, }, - [10] = { - [11001] = { - circle = 0, - compose = { id = 1379, type = 0, count = 1 }, - index = 1, - text = "合成", - Eid = 11001, - second_index = 2, - table = { { id = 842, type = 0, count = 500 }, { id = 4, type = 4, count = 10000 } }, - openserverday = 1, - level = 1, - }, - [11002] = { - circle = 0, - compose = { id = 1380, type = 0, count = 1 }, - index = 1, - text = "合成", - Eid = 11002, - second_index = 2, - table = { { id = 843, type = 0, count = 500 }, { id = 4, type = 4, count = 20000 } }, - openserverday = 1, - level = 1, - }, - [11003] = { - circle = 0, - compose = { id = 1381, type = 0, count = 1 }, - index = 1, - text = "合成", - Eid = 11003, - second_index = 2, - table = { { id = 846, type = 0, count = 500 }, { id = 4, type = 4, count = 30000 } }, - }, - [11004] = { - circle = 0, - compose = { id = 1382, type = 0, count = 1 }, - index = 1, - text = "合成", - Eid = 11004, - second_index = 2, - table = { { id = 847, type = 0, count = 500 }, { id = 4, type = 4, count = 100000 } }, - }, - [11005] = { - circle = 0, - compose = { id = 1383, type = 0, count = 1 }, - index = 1, - text = "合成", - Eid = 11005, - second_index = 2, - table = { { id = 844, type = 0, count = 1000 }, { id = 4, type = 4, count = 250000 } }, - }, - }, }, [2] = { [1] = { @@ -1935,19 +1884,55 @@ ItemMergeConfig = { }, }, [3] = { - [3301] = { + [11001] = { circle = 0, - compose = { id = 0, type = 133, count = 8000000 }, - index = 3, - text = "兑换", - Eid = 3301, - second_index = 3, - buttontxt10 = "合成10次", - mergebutton10 = 1, - table = { { id = 301, type = 0, count = 1 } }, + compose = { id = 1379, type = 0, count = 1 }, + index = 1, + text = "合成", + Eid = 11001, + second_index = 2, + table = { { id = 842, type = 0, count = 500 }, { id = 4, type = 4, count = 10000 } }, openserverday = 1, level = 1, }, + [11002] = { + circle = 0, + compose = { id = 1380, type = 0, count = 1 }, + index = 1, + text = "合成", + Eid = 11002, + second_index = 2, + table = { { id = 843, type = 0, count = 500 }, { id = 4, type = 4, count = 20000 } }, + openserverday = 1, + level = 1, + }, + [11003] = { + circle = 0, + compose = { id = 1381, type = 0, count = 1 }, + index = 1, + text = "合成", + Eid = 11003, + second_index = 2, + table = { { id = 846, type = 0, count = 500 }, { id = 4, type = 4, count = 30000 } }, + }, + [11004] = { + circle = 0, + compose = { id = 1382, type = 0, count = 1 }, + index = 1, + text = "合成", + Eid = 11004, + second_index = 2, + table = { { id = 847, type = 0, count = 500 }, { id = 4, type = 4, count = 100000 } }, + }, + [11005] = { + circle = 0, + compose = { id = 1383, type = 0, count = 1 }, + index = 1, + text = "合成", + Eid = 11005, + second_index = 2, + table = { { id = 844, type = 0, count = 1000 }, { id = 4, type = 4, count = 250000 } }, + }, }, }, [4] = { @@ -4088,62 +4073,6 @@ ItemMergeConfig = { openserverday = 1, level = 1, }, - [7206] = { - circle = 0, - compose = { id = 0, type = 4, count = 1000 }, - index = 7, - buttontxt10 = "合成10次", - mergebutton10 = 1, - text = "兑换", - clicklimit = 1, - Eid = 7206, - second_index = 1, - table = { { id = 1244, type = 0, count = 10 } }, - openserverday = 1, - level = 1, - }, - [7207] = { - circle = 0, - compose = { id = 0, type = 4, count = 3000 }, - index = 7, - buttontxt10 = "合成10次", - mergebutton10 = 1, - text = "兑换", - clicklimit = 1, - Eid = 7207, - second_index = 1, - table = { { id = 1245, type = 0, count = 10 } }, - openserverday = 1, - level = 1, - }, - [7208] = { - circle = 0, - compose = { id = 0, type = 4, count = 5000 }, - index = 7, - buttontxt10 = "合成10次", - mergebutton10 = 1, - text = "兑换", - clicklimit = 1, - Eid = 7208, - second_index = 1, - table = { { id = 1246, type = 0, count = 10 } }, - openserverday = 1, - level = 1, - }, - [7209] = { - circle = 0, - compose = { id = 0, type = 4, count = 10000 }, - index = 7, - buttontxt10 = "合成10次", - mergebutton10 = 1, - text = "兑换", - clicklimit = 1, - Eid = 7209, - second_index = 1, - table = { { id = 1247, type = 0, count = 10 } }, - openserverday = 1, - level = 1, - }, }, [3] = { [239] = { diff --git a/LogicServer/data/config/Merge/Merge.config b/LogicServer/data/config/Merge/Merge.config index 2e979c8..a7b47ff 100755 --- a/LogicServer/data/config/Merge/Merge.config +++ b/LogicServer/data/config/Merge/Merge.config @@ -81,15 +81,6 @@ MergeConfig = { dayconds = 60, name = "星月装备", }, - [10] = { - rebornconds = 2, - index = 10, - Uitype = 1, - id = 1, - levelconds = 1, - dayconds = 1, - name = "王者装备", - }, }, [2] = { [1] = { @@ -173,7 +164,7 @@ MergeConfig = { id = 3, levelconds = 1, dayconds = 1, - name = "多倍经验", + name = "高阶装备", }, }, [4] = {