Version: 2.26.0 DataVer: 321

2022-06-22 10:51:03 +00:00
parent dd3e5d6f4f
commit 18b4af2f51
569 changed files with 750603 additions and 46015 deletions
--- a/master/mstCombineSkill.json
+++ b/master/mstCombineSkill.json
@@ -1888,6 +1888,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 104400,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [4],
+    "itemIds": [6001]
+}, {
+    "id": 104400,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6001]
+}, {
+    "id": 104400,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [4],
+    "itemIds": [6101]
+}, {
+    "id": 104400,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10, 12],
+    "itemIds": [6101, 6516]
+}, {
+    "id": 104400,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [4, 24],
+    "itemIds": [6201, 6516]
+}, {
+    "id": 104400,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [10, 12],
+    "itemIds": [6201, 6503]
+}, {
+    "id": 104400,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [24, 15],
+    "itemIds": [6503, 6533]
+}, {
+    "id": 104400,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [45, 20],
+    "itemIds": [6533, 6538]
+}, {
+    "id": 104400,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 104500,
    "skillLv": 1,
@@ -1942,6 +1996,222 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 104600,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6001]
+}, {
+    "id": 104600,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6001]
+}, {
+    "id": 104600,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6101]
+}, {
+    "id": 104600,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 15],
+    "itemIds": [6101, 6516]
+}, {
+    "id": 104600,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 29],
+    "itemIds": [6201, 6516]
+}, {
+    "id": 104600,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 4],
+    "itemIds": [6201, 6509]
+}, {
+    "id": 104600,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [8, 3],
+    "itemIds": [6509, 6506]
+}, {
+    "id": 104600,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [8, 10],
+    "itemIds": [6506, 6548]
+}, {
+    "id": 104600,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 104700,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [4],
+    "itemIds": [6001]
+}, {
+    "id": 104700,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6001]
+}, {
+    "id": 104700,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [4],
+    "itemIds": [6101]
+}, {
+    "id": 104700,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10, 4],
+    "itemIds": [6101, 6532]
+}, {
+    "id": 104700,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [4, 8],
+    "itemIds": [6201, 6532]
+}, {
+    "id": 104700,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [10, 12],
+    "itemIds": [6201, 6503]
+}, {
+    "id": 104700,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [24, 5],
+    "itemIds": [6503, 6538]
+}, {
+    "id": 104700,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [15, 20],
+    "itemIds": [6538, 6547]
+}, {
+    "id": 104700,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 104800,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [4],
+    "itemIds": [6001]
+}, {
+    "id": 104800,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6001]
+}, {
+    "id": 104800,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [4],
+    "itemIds": [6101]
+}, {
+    "id": 104800,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10, 8],
+    "itemIds": [6101, 6505]
+}, {
+    "id": 104800,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [4, 16],
+    "itemIds": [6201, 6505]
+}, {
+    "id": 104800,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [10, 12],
+    "itemIds": [6201, 6522]
+}, {
+    "id": 104800,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [24, 5],
+    "itemIds": [6522, 6543]
+}, {
+    "id": 104800,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [15, 20],
+    "itemIds": [6543, 6545]
+}, {
+    "id": 104800,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 104900,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6001]
+}, {
+    "id": 104900,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6001]
+}, {
+    "id": 104900,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6101]
+}, {
+    "id": 104900,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 5],
+    "itemIds": [6101, 6508]
+}, {
+    "id": 104900,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 10],
+    "itemIds": [6201, 6508]
+}, {
+    "id": 104900,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 5],
+    "itemIds": [6201, 6515]
+}, {
+    "id": 104900,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [10, 6],
+    "itemIds": [6515, 6532]
+}, {
+    "id": 104900,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [18, 10],
+    "itemIds": [6532, 6548]
+}, {
+    "id": 104900,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 200100,
    "skillLv": 1,
@@ -3886,6 +4156,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 204100,
+    "skillLv": 1,
+    "qp": 10000,
+    "itemNums": [2],
+    "itemIds": [6002]
+}, {
+    "id": 204100,
+    "skillLv": 2,
+    "qp": 20000,
+    "itemNums": [4],
+    "itemIds": [6002]
+}, {
+    "id": 204100,
+    "skillLv": 3,
+    "qp": 60000,
+    "itemNums": [2],
+    "itemIds": [6102]
+}, {
+    "id": 204100,
+    "skillLv": 4,
+    "qp": 80000,
+    "itemNums": [4, 2],
+    "itemIds": [6102, 6515]
+}, {
+    "id": 204100,
+    "skillLv": 5,
+    "qp": 200000,
+    "itemNums": [2, 4],
+    "itemIds": [6202, 6515]
+}, {
+    "id": 204100,
+    "skillLv": 6,
+    "qp": 250000,
+    "itemNums": [4, 4],
+    "itemIds": [6202, 6505]
+}, {
+    "id": 204100,
+    "skillLv": 7,
+    "qp": 500000,
+    "itemNums": [7, 6],
+    "itemIds": [6505, 6534]
+}, {
+    "id": 204100,
+    "skillLv": 8,
+    "qp": 600000,
+    "itemNums": [18, 8],
+    "itemIds": [6534, 6541]
+}, {
+    "id": 204100,
+    "skillLv": 9,
+    "qp": 1000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 204200,
    "skillLv": 1,
@@ -5992,6 +6316,60 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 304600,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6003]
+}, {
+    "id": 304600,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6003]
+}, {
+    "id": 304600,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6103]
+}, {
+    "id": 304600,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 4],
+    "itemIds": [6103, 6509]
+}, {
+    "id": 304600,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 8],
+    "itemIds": [6203, 6509]
+}, {
+    "id": 304600,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 12],
+    "itemIds": [6203, 6512]
+}, {
+    "id": 304600,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [24, 6],
+    "itemIds": [6512, 6535]
+}, {
+    "id": 304600,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [18, 24],
+    "itemIds": [6535, 6537]
+}, {
+    "id": 304600,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 400100,
    "skillLv": 1,
@@ -7558,6 +7936,60 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 403700,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6004]
+}, {
+    "id": 403700,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6004]
+}, {
+    "id": 403700,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6104]
+}, {
+    "id": 403700,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 5],
+    "itemIds": [6104, 6526]
+}, {
+    "id": 403700,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 10],
+    "itemIds": [6204, 6526]
+}, {
+    "id": 403700,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 5],
+    "itemIds": [6204, 6510]
+}, {
+    "id": 403700,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [10, 4],
+    "itemIds": [6510, 6539]
+}, {
+    "id": 403700,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [11, 24],
+    "itemIds": [6539, 6545]
+}, {
+    "id": 403700,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 403800,
    "skillLv": 1,
@@ -11932,6 +12364,60 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 604100,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [4],
+    "itemIds": [6006]
+}, {
+    "id": 604100,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6006]
+}, {
+    "id": 604100,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [4],
+    "itemIds": [6106]
+}, {
+    "id": 604100,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10, 5],
+    "itemIds": [6106, 6502]
+}, {
+    "id": 604100,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [4, 10],
+    "itemIds": [6206, 6502]
+}, {
+    "id": 604100,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [10, 4],
+    "itemIds": [6206, 6511]
+}, {
+    "id": 604100,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [8, 5],
+    "itemIds": [6511, 6538]
+}, {
+    "id": 604100,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [15, 8],
+    "itemIds": [6538, 6531]
+}, {
+    "id": 604100,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 700100,
    "skillLv": 1,
@@ -14308,6 +14794,114 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 901000,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6002, 6004, 6005]
+}, {
+    "id": 901000,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6001, 6003, 6006, 6007]
+}, {
+    "id": 901000,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6102, 6104, 6105]
+}, {
+    "id": 901000,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6101, 6103, 6106, 6107]
+}, {
+    "id": 901000,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6202, 6204, 6205]
+}, {
+    "id": 901000,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6201, 6203, 6206, 6207]
+}, {
+    "id": 901000,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [12],
+    "itemIds": [6532]
+}, {
+    "id": 901000,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6540]
+}, {
+    "id": 901000,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 901100,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6002, 6005, 6007]
+}, {
+    "id": 901100,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6001, 6003, 6004, 6006]
+}, {
+    "id": 901100,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6102, 6105, 6107]
+}, {
+    "id": 901100,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6101, 6103, 6104, 6106]
+}, {
+    "id": 901100,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6202, 6205, 6207]
+}, {
+    "id": 901100,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6201, 6203, 6204, 6206]
+}, {
+    "id": 901100,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [12],
+    "itemIds": [6541]
+}, {
+    "id": 901100,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6547]
+}, {
+    "id": 901100,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 1000100,
    "skillLv": 1,
@@ -14740,6 +15334,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 1001000,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5, 5],
+    "itemIds": [6005, 6006]
+}, {
+    "id": 1001000,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12, 12],
+    "itemIds": [6005, 6006]
+}, {
+    "id": 1001000,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5, 5],
+    "itemIds": [6105, 6106]
+}, {
+    "id": 1001000,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 12],
+    "itemIds": [6105, 6106]
+}, {
+    "id": 1001000,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 5],
+    "itemIds": [6205, 6206]
+}, {
+    "id": 1001000,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 12],
+    "itemIds": [6205, 6206]
+}, {
+    "id": 1001000,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [5, 5],
+    "itemIds": [6547, 6544]
+}, {
+    "id": 1001000,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [9, 9],
+    "itemIds": [6517, 6548]
+}, {
+    "id": 1001000,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 1100100,
    "skillLv": 1,
@@ -15172,6 +15820,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 1101000,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6516]
+}, {
+    "id": 1101000,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [10],
+    "itemIds": [6522]
+}, {
+    "id": 1101000,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [12],
+    "itemIds": [6508]
+}, {
+    "id": 1101000,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12],
+    "itemIds": [6533]
+}, {
+    "id": 1101000,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [12],
+    "itemIds": [6541]
+}, {
+    "id": 1101000,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [15],
+    "itemIds": [6520]
+}, {
+    "id": 1101000,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [15],
+    "itemIds": [6529]
+}, {
+    "id": 1101000,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6540]
+}, {
+    "id": 1101000,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 2300100,
    "skillLv": 1,
@@ -15658,6 +16360,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 2500600,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6505]
+}, {
+    "id": 2500600,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [10],
+    "itemIds": [6502]
+}, {
+    "id": 2500600,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [12],
+    "itemIds": [6511]
+}, {
+    "id": 2500600,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12],
+    "itemIds": [6514]
+}, {
+    "id": 2500600,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [12],
+    "itemIds": [6536]
+}, {
+    "id": 2500600,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [15],
+    "itemIds": [6518]
+}, {
+    "id": 2500600,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [15],
+    "itemIds": [6546]
+}, {
+    "id": 2500600,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6544]
+}, {
+    "id": 2500600,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 2500700,
    "skillLv": 1,