Version: 2.73.0 DataVer: 573

2024-09-26 23:21:28 +00:00
parent 69adbfa720
commit 41a6d2b67c
691 changed files with 874233 additions and 85315 deletions
--- a/master/mstCombineSkill.json
+++ b/master/mstCombineSkill.json
@@ -2590,6 +2590,60 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 105700,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [4],
+    "itemIds": [6001]
+}, {
+    "id": 105700,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6001]
+}, {
+    "id": 105700,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [4],
+    "itemIds": [6101]
+}, {
+    "id": 105700,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10, 12],
+    "itemIds": [6101, 6503]
+}, {
+    "id": 105700,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [4, 24],
+    "itemIds": [6201, 6503]
+}, {
+    "id": 105700,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [10, 5],
+    "itemIds": [6201, 6502]
+}, {
+    "id": 105700,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [10, 5],
+    "itemIds": [6502, 6513]
+}, {
+    "id": 105700,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [15, 8],
+    "itemIds": [6513, 6529]
+}, {
+    "id": 105700,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 200100,
    "skillLv": 1,
@@ -4858,6 +4912,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 204700,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6002]
+}, {
+    "id": 204700,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6002]
+}, {
+    "id": 204700,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6102]
+}, {
+    "id": 204700,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 5],
+    "itemIds": [6102, 6510]
+}, {
+    "id": 204700,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 10],
+    "itemIds": [6202, 6510]
+}, {
+    "id": 204700,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 10],
+    "itemIds": [6202, 6505]
+}, {
+    "id": 204700,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [20, 4],
+    "itemIds": [6505, 6539]
+}, {
+    "id": 204700,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [11, 10],
+    "itemIds": [6539, 6548]
+}, {
+    "id": 204700,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 300100,
    "skillLv": 1,
@@ -14416,6 +14524,168 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 604700,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6006]
+}, {
+    "id": 604700,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6006]
+}, {
+    "id": 604700,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6106]
+}, {
+    "id": 604700,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 3],
+    "itemIds": [6106, 6521]
+}, {
+    "id": 604700,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 6],
+    "itemIds": [6206, 6521]
+}, {
+    "id": 604700,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 3],
+    "itemIds": [6206, 6507]
+}, {
+    "id": 604700,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [6, 3],
+    "itemIds": [6507, 6517]
+}, {
+    "id": 604700,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [8, 72],
+    "itemIds": [6517, 6554]
+}, {
+    "id": 604700,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 604800,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [4],
+    "itemIds": [6006]
+}, {
+    "id": 604800,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6006]
+}, {
+    "id": 604800,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [4],
+    "itemIds": [6106]
+}, {
+    "id": 604800,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10, 10],
+    "itemIds": [6106, 6527]
+}, {
+    "id": 604800,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [4, 20],
+    "itemIds": [6206, 6527]
+}, {
+    "id": 604800,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [10, 5],
+    "itemIds": [6206, 6502]
+}, {
+    "id": 604800,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [10, 4],
+    "itemIds": [6502, 6501]
+}, {
+    "id": 604800,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [12, 8],
+    "itemIds": [6501, 6542]
+}, {
+    "id": 604800,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 604900,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5],
+    "itemIds": [6006]
+}, {
+    "id": 604900,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12],
+    "itemIds": [6006]
+}, {
+    "id": 604900,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5],
+    "itemIds": [6106]
+}, {
+    "id": 604900,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 3],
+    "itemIds": [6106, 6520]
+}, {
+    "id": 604900,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 6],
+    "itemIds": [6206, 6520]
+}, {
+    "id": 604900,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 5],
+    "itemIds": [6206, 6510]
+}, {
+    "id": 604900,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [10, 6],
+    "itemIds": [6510, 6547]
+}, {
+    "id": 604900,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [18, 72],
+    "itemIds": [6547, 6554]
+}, {
+    "id": 604900,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 700100,
    "skillLv": 1,
@@ -17440,6 +17710,60 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 901600,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6003, 6004, 6005]
+}, {
+    "id": 901600,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6001, 6002, 6006, 6007]
+}, {
+    "id": 901600,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6103, 6104, 6105]
+}, {
+    "id": 901600,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6101, 6102, 6106, 6107]
+}, {
+    "id": 901600,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 5, 5],
+    "itemIds": [6203, 6204, 6205]
+}, {
+    "id": 901600,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [5, 5, 5, 5],
+    "itemIds": [6201, 6202, 6206, 6207]
+}, {
+    "id": 901600,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [12],
+    "itemIds": [6545]
+}, {
+    "id": 901600,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6542]
+}, {
+    "id": 901600,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 1000100,
    "skillLv": 1,
@@ -18196,6 +18520,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 1001600,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [5, 5],
+    "itemIds": [6003, 6004]
+}, {
+    "id": 1001600,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [12, 12],
+    "itemIds": [6003, 6004]
+}, {
+    "id": 1001600,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [5, 5],
+    "itemIds": [6103, 6104]
+}, {
+    "id": 1001600,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12, 12],
+    "itemIds": [6103, 6104]
+}, {
+    "id": 1001600,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [5, 5],
+    "itemIds": [6203, 6204]
+}, {
+    "id": 1001600,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [12, 12],
+    "itemIds": [6203, 6204]
+}, {
+    "id": 1001600,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [5, 5],
+    "itemIds": [6528, 6521]
+}, {
+    "id": 1001600,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [9, 9],
+    "itemIds": [6506, 6544]
+}, {
+    "id": 1001600,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 1100100,
    "skillLv": 1,
@@ -18844,6 +19222,60 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 1101500,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6502]
+}, {
+    "id": 1101500,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [10],
+    "itemIds": [6511]
+}, {
+    "id": 1101500,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [12],
+    "itemIds": [6501]
+}, {
+    "id": 1101500,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12],
+    "itemIds": [6523]
+}, {
+    "id": 1101500,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [12],
+    "itemIds": [6520]
+}, {
+    "id": 1101500,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [15],
+    "itemIds": [6545]
+}, {
+    "id": 1101500,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [15],
+    "itemIds": [6525]
+}, {
+    "id": 1101500,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6550]
+}, {
+    "id": 1101500,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 2300100,
    "skillLv": 1,
@@ -19654,6 +20086,60 @@
    "qp": 20000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 2501100,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6512]
+}, {
+    "id": 2501100,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [10],
+    "itemIds": [6501]
+}, {
+    "id": 2501100,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [12],
+    "itemIds": [6509]
+}, {
+    "id": 2501100,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12],
+    "itemIds": [6507]
+}, {
+    "id": 2501100,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [12],
+    "itemIds": [6528]
+}, {
+    "id": 2501100,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [15],
+    "itemIds": [6506]
+}, {
+    "id": 2501100,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [15],
+    "itemIds": [6531]
+}, {
+    "id": 2501100,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6553]
+}, {
+    "id": 2501100,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 2800100,
    "skillLv": 1,
@@ -19870,6 +20356,114 @@
    "qp": 10000000,
    "itemNums": [1],
    "itemIds": [6999]
+}, {
+    "id": 2800500,
+    "skillLv": 1,
+    "qp": 100000,
+    "itemNums": [8],
+    "itemIds": [6503]
+}, {
+    "id": 2800500,
+    "skillLv": 2,
+    "qp": 200000,
+    "itemNums": [8],
+    "itemIds": [6515]
+}, {
+    "id": 2800500,
+    "skillLv": 3,
+    "qp": 600000,
+    "itemNums": [10],
+    "itemIds": [6514]
+}, {
+    "id": 2800500,
+    "skillLv": 4,
+    "qp": 800000,
+    "itemNums": [10],
+    "itemIds": [6520]
+}, {
+    "id": 2800500,
+    "skillLv": 5,
+    "qp": 2000000,
+    "itemNums": [10],
+    "itemIds": [6529]
+}, {
+    "id": 2800500,
+    "skillLv": 6,
+    "qp": 2500000,
+    "itemNums": [12],
+    "itemIds": [6536]
+}, {
+    "id": 2800500,
+    "skillLv": 7,
+    "qp": 5000000,
+    "itemNums": [12],
+    "itemIds": [6545]
+}, {
+    "id": 2800500,
+    "skillLv": 8,
+    "qp": 6000000,
+    "itemNums": [12],
+    "itemIds": [6553]
+}, {
+    "id": 2800500,
+    "skillLv": 9,
+    "qp": 10000000,
+    "itemNums": [1],
+    "itemIds": [6999]
+}, {
+    "id": 3300100,
+    "skillLv": 1,
+    "qp": 200000,
+    "itemNums": [10],
+    "itemIds": [6512]
+}, {
+    "id": 3300100,
+    "skillLv": 2,
+    "qp": 400000,
+    "itemNums": [10],
+    "itemIds": [6515]
+}, {
+    "id": 3300100,
+    "skillLv": 3,
+    "qp": 1200000,
+    "itemNums": [12],
+    "itemIds": [6501]
+}, {
+    "id": 3300100,
+    "skillLv": 4,
+    "qp": 1600000,
+    "itemNums": [12],
+    "itemIds": [6514]
+}, {
+    "id": 3300100,
+    "skillLv": 5,
+    "qp": 4000000,
+    "itemNums": [12],
+    "itemIds": [6509]
+}, {
+    "id": 3300100,
+    "skillLv": 6,
+    "qp": 5000000,
+    "itemNums": [15],
+    "itemIds": [6517]
+}, {
+    "id": 3300100,
+    "skillLv": 7,
+    "qp": 10000000,
+    "itemNums": [15],
+    "itemIds": [6529]
+}, {
+    "id": 3300100,
+    "skillLv": 8,
+    "qp": 12000000,
+    "itemNums": [15],
+    "itemIds": [6506]
+}, {
+    "id": 3300100,
+    "skillLv": 9,
+    "qp": 20000000,
+    "itemNums": [1],
+    "itemIds": [6999]
 }, {
    "id": 9000001,
    "skillLv": 1,