diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index 82ad88e16..d71c69c8e 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -8,7 +8,7 @@ "suittype": 0, "suitintr": { "key": "suit_equip_10001", - "text": "初心者套装" + "text": "攻势套装" }, "pos": 0, "star": 1, @@ -44,8 +44,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10002", + "text": "攻势套装" }, "pos": 1, "star": 1, @@ -81,8 +81,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10003", + "text": "攻势套装" }, "pos": 2, "star": 1, @@ -120,8 +120,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10004", + "text": "攻势套装" }, "pos": 3, "star": 1, @@ -157,8 +157,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10005", + "text": "攻势套装" }, "pos": 4, "star": 1, @@ -196,8 +196,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10006", + "text": "攻势套装" }, "pos": 5, "star": 1, @@ -233,8 +233,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10007", + "text": "攻势套装" }, "pos": 0, "star": 2, @@ -270,8 +270,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10008", + "text": "攻势套装" }, "pos": 1, "star": 2, @@ -307,8 +307,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10009", + "text": "攻势套装" }, "pos": 2, "star": 2, @@ -346,8 +346,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10010", + "text": "攻势套装" }, "pos": 3, "star": 2, @@ -383,8 +383,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10011", + "text": "攻势套装" }, "pos": 4, "star": 2, @@ -422,8 +422,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10012", + "text": "攻势套装" }, "pos": 5, "star": 2, @@ -459,8 +459,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10013", + "text": "攻势套装" }, "pos": 0, "star": 3, @@ -496,8 +496,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10014", + "text": "攻势套装" }, "pos": 1, "star": 3, @@ -533,8 +533,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10015", + "text": "攻势套装" }, "pos": 2, "star": 3, @@ -572,8 +572,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10016", + "text": "攻势套装" }, "pos": 3, "star": 3, @@ -609,8 +609,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10017", + "text": "攻势套装" }, "pos": 4, "star": 3, @@ -648,8 +648,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10018", + "text": "攻势套装" }, "pos": 5, "star": 3, @@ -685,8 +685,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10019", + "text": "攻势套装" }, "pos": 0, "star": 4, @@ -722,8 +722,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10020", + "text": "攻势套装" }, "pos": 1, "star": 4, @@ -759,8 +759,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10021", + "text": "攻势套装" }, "pos": 2, "star": 4, @@ -798,8 +798,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10022", + "text": "攻势套装" }, "pos": 3, "star": 4, @@ -835,8 +835,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10023", + "text": "攻势套装" }, "pos": 4, "star": 4, @@ -874,8 +874,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10024", + "text": "攻势套装" }, "pos": 5, "star": 4, @@ -911,8 +911,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10025", + "text": "攻势套装" }, "pos": 0, "star": 5, @@ -948,8 +948,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10026", + "text": "攻势套装" }, "pos": 1, "star": 5, @@ -985,8 +985,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10027", + "text": "攻势套装" }, "pos": 2, "star": 5, @@ -1024,8 +1024,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10028", + "text": "攻势套装" }, "pos": 3, "star": 5, @@ -1061,8 +1061,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10029", + "text": "攻势套装" }, "pos": 4, "star": 5, @@ -1100,8 +1100,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10030", + "text": "攻势套装" }, "pos": 5, "star": 5, @@ -1137,8 +1137,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10031", + "text": "攻势套装" }, "pos": 0, "star": 6, @@ -1174,8 +1174,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10032", + "text": "攻势套装" }, "pos": 1, "star": 6, @@ -1211,8 +1211,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10033", + "text": "攻势套装" }, "pos": 2, "star": 6, @@ -1250,8 +1250,8 @@ }, "suittype": 0, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10034", + "text": "攻势套装" }, "pos": 3, "star": 6, @@ -1287,8 +1287,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10035", + "text": "攻势套装" }, "pos": 4, "star": 6, @@ -1326,8 +1326,8 @@ }, "suittype": 100, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10036", + "text": "攻势套装" }, "pos": 5, "star": 6, @@ -1363,8 +1363,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10002", + "text": "逐风套装" }, "pos": 0, "star": 1, @@ -1400,8 +1400,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10003", + "text": "逐风套装" }, "pos": 1, "star": 1, @@ -1437,8 +1437,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10004", + "text": "逐风套装" }, "pos": 2, "star": 1, @@ -1476,8 +1476,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10005", + "text": "逐风套装" }, "pos": 3, "star": 1, @@ -1513,8 +1513,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10006", + "text": "逐风套装" }, "pos": 4, "star": 1, @@ -1552,8 +1552,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10007", + "text": "逐风套装" }, "pos": 5, "star": 1, @@ -1589,8 +1589,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10008", + "text": "逐风套装" }, "pos": 0, "star": 2, @@ -1626,8 +1626,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10009", + "text": "逐风套装" }, "pos": 1, "star": 2, @@ -1663,8 +1663,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10010", + "text": "逐风套装" }, "pos": 2, "star": 2, @@ -1702,8 +1702,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10011", + "text": "逐风套装" }, "pos": 3, "star": 2, @@ -1739,8 +1739,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10012", + "text": "逐风套装" }, "pos": 4, "star": 2, @@ -1778,8 +1778,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10013", + "text": "逐风套装" }, "pos": 5, "star": 2, @@ -1815,8 +1815,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10014", + "text": "逐风套装" }, "pos": 0, "star": 3, @@ -1852,8 +1852,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10015", + "text": "逐风套装" }, "pos": 1, "star": 3, @@ -1889,8 +1889,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10016", + "text": "逐风套装" }, "pos": 2, "star": 3, @@ -1928,8 +1928,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10017", + "text": "逐风套装" }, "pos": 3, "star": 3, @@ -1965,8 +1965,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10018", + "text": "逐风套装" }, "pos": 4, "star": 3, @@ -2004,8 +2004,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10019", + "text": "逐风套装" }, "pos": 5, "star": 3, @@ -2041,8 +2041,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10020", + "text": "逐风套装" }, "pos": 0, "star": 4, @@ -2078,8 +2078,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10021", + "text": "逐风套装" }, "pos": 1, "star": 4, @@ -2115,8 +2115,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10022", + "text": "逐风套装" }, "pos": 2, "star": 4, @@ -2154,8 +2154,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10023", + "text": "逐风套装" }, "pos": 3, "star": 4, @@ -2191,8 +2191,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10024", + "text": "逐风套装" }, "pos": 4, "star": 4, @@ -2230,8 +2230,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10025", + "text": "逐风套装" }, "pos": 5, "star": 4, @@ -2267,8 +2267,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10026", + "text": "逐风套装" }, "pos": 0, "star": 5, @@ -2304,8 +2304,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10027", + "text": "逐风套装" }, "pos": 1, "star": 5, @@ -2341,8 +2341,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10028", + "text": "逐风套装" }, "pos": 2, "star": 5, @@ -2380,8 +2380,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10029", + "text": "逐风套装" }, "pos": 3, "star": 5, @@ -2417,8 +2417,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10030", + "text": "逐风套装" }, "pos": 4, "star": 5, @@ -2456,8 +2456,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10031", + "text": "逐风套装" }, "pos": 5, "star": 5, @@ -2493,8 +2493,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10032", + "text": "逐风套装" }, "pos": 0, "star": 6, @@ -2530,8 +2530,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10033", + "text": "逐风套装" }, "pos": 1, "star": 6, @@ -2567,8 +2567,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10034", + "text": "逐风套装" }, "pos": 2, "star": 6, @@ -2606,8 +2606,8 @@ }, "suittype": 1, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10035", + "text": "逐风套装" }, "pos": 3, "star": 6, @@ -2643,8 +2643,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10036", + "text": "逐风套装" }, "pos": 4, "star": 6, @@ -2682,8 +2682,8 @@ }, "suittype": 101, "suitintr": { - "key": "suit_equip_10001", - "text": "初心者套装" + "key": "suit_equip_10037", + "text": "逐风套装" }, "pos": 5, "star": 6, diff --git a/bin/json/game_equipintensify.json b/bin/json/game_equipintensify.json index 71b0e3da9..f22e9a819 100644 --- a/bin/json/game_equipintensify.json +++ b/bin/json/game_equipintensify.json @@ -7,7 +7,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 16851 } ], "bonus": 0, @@ -23,12 +23,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 21064 } ], "bonus": 300, "activation": false, - "probability": 1000, + "probability": 900, "num": 2 }, { @@ -39,7 +39,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 23936 } ], "bonus": 600, @@ -55,12 +55,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 24681 } ], "bonus": 900, "activation": true, - "probability": 850, + "probability": 800, "num": 4 }, { @@ -71,12 +71,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 25319 } ], "bonus": 1200, "activation": false, - "probability": 800, + "probability": 700, "num": 5 }, { @@ -87,12 +87,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 25532 } ], "bonus": 1500, "activation": false, - "probability": 750, + "probability": 600, "num": 6 }, { @@ -103,12 +103,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 32699 } ], "bonus": 1800, "activation": true, - "probability": 700, + "probability": 400, "num": 7 }, { @@ -119,12 +119,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 34516 } ], "bonus": 2100, "activation": false, - "probability": 650, + "probability": 400, "num": 8 }, { @@ -135,12 +135,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 36560 } ], "bonus": 2400, "activation": false, - "probability": 600, + "probability": 400, "num": 9 }, { @@ -151,12 +151,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 40874 } ], "bonus": 2700, "activation": true, - "probability": 550, + "probability": 400, "num": 10 }, { @@ -167,12 +167,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 43372 } ], "bonus": 3000, "activation": false, - "probability": 500, + "probability": 400, "num": 11 }, { @@ -183,12 +183,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 48879 } ], "bonus": 3300, "activation": false, - "probability": 450, + "probability": 300, "num": 12 }, { @@ -199,12 +199,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 56453 } ], "bonus": 3600, "activation": true, - "probability": 400, + "probability": 200, "num": 13 }, { @@ -215,12 +215,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 59520 } ], "bonus": 3900, "activation": false, - "probability": 350, + "probability": 200, "num": 14 }, { @@ -231,12 +231,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 62225 } ], "bonus": 4200, "activation": false, - "probability": 300, + "probability": 150, "num": 15 }, { @@ -246,7 +246,7 @@ "need": [], "bonus": 4500, "activation": true, - "probability": 250, + "probability": 100, "num": -1 }, { @@ -257,7 +257,7 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 13480 } ], "bonus": 0, @@ -273,12 +273,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 16850 } ], "bonus": 300, "activation": false, - "probability": 1000, + "probability": 900, "num": 2 }, { @@ -289,7 +289,7 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 19149 } ], "bonus": 600, @@ -305,12 +305,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 19744 } ], "bonus": 900, "activation": true, - "probability": 850, + "probability": 800, "num": 4 }, { @@ -321,12 +321,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 20255 } ], "bonus": 1200, "activation": false, - "probability": 800, + "probability": 700, "num": 5 }, { @@ -337,12 +337,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 20425 } ], "bonus": 1500, "activation": false, - "probability": 750, + "probability": 600, "num": 6 }, { @@ -353,12 +353,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 26159 } ], "bonus": 1800, "activation": true, - "probability": 700, + "probability": 400, "num": 7 }, { @@ -369,12 +369,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 27613 } ], "bonus": 2100, "activation": false, - "probability": 650, + "probability": 400, "num": 8 }, { @@ -385,12 +385,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 29248 } ], "bonus": 2400, "activation": false, - "probability": 600, + "probability": 400, "num": 9 }, { @@ -401,12 +401,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 32699 } ], "bonus": 2700, "activation": true, - "probability": 550, + "probability": 400, "num": 10 }, { @@ -417,12 +417,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 34698 } ], "bonus": 3000, "activation": false, - "probability": 500, + "probability": 400, "num": 11 }, { @@ -433,12 +433,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 39103 } ], "bonus": 3300, "activation": false, - "probability": 450, + "probability": 300, "num": 12 }, { @@ -449,12 +449,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 45163 } ], "bonus": 3600, "activation": true, - "probability": 400, + "probability": 200, "num": 13 }, { @@ -465,12 +465,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 47616 } ], "bonus": 3900, "activation": false, - "probability": 350, + "probability": 200, "num": 14 }, { @@ -481,12 +481,12 @@ { "a": "attr", "t": "gold", - "n": 20000 + "n": 49780 } ], "bonus": 4200, "activation": false, - "probability": 300, + "probability": 150, "num": 15 }, { @@ -496,7 +496,7 @@ "need": [], "bonus": 4500, "activation": true, - "probability": 250, + "probability": 100, "num": -1 }, { @@ -507,7 +507,7 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 10784 } ], "bonus": 0, @@ -523,12 +523,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 13480 } ], "bonus": 300, "activation": false, - "probability": 1000, + "probability": 900, "num": 2 }, { @@ -539,7 +539,7 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 15318 } ], "bonus": 600, @@ -555,12 +555,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 15795 } ], "bonus": 900, "activation": true, - "probability": 850, + "probability": 800, "num": 4 }, { @@ -571,12 +571,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 16203 } ], "bonus": 1200, "activation": false, - "probability": 800, + "probability": 700, "num": 5 }, { @@ -587,12 +587,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 16340 } ], "bonus": 1500, "activation": false, - "probability": 750, + "probability": 600, "num": 6 }, { @@ -603,12 +603,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 20927 } ], "bonus": 1800, "activation": true, - "probability": 700, + "probability": 400, "num": 7 }, { @@ -619,12 +619,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 22090 } ], "bonus": 2100, "activation": false, - "probability": 650, + "probability": 400, "num": 8 }, { @@ -635,12 +635,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 23398 } ], "bonus": 2400, "activation": false, - "probability": 600, + "probability": 400, "num": 9 }, { @@ -651,12 +651,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 26159 } ], "bonus": 2700, "activation": true, - "probability": 550, + "probability": 400, "num": 10 }, { @@ -667,12 +667,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 27758 } ], "bonus": 3000, "activation": false, - "probability": 500, + "probability": 400, "num": 11 }, { @@ -683,12 +683,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 31282 } ], "bonus": 3300, "activation": false, - "probability": 450, + "probability": 300, "num": 12 }, { @@ -699,12 +699,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 36130 } ], "bonus": 3600, "activation": true, - "probability": 400, + "probability": 200, "num": 13 }, { @@ -715,12 +715,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 38092 } ], "bonus": 3900, "activation": false, - "probability": 350, + "probability": 200, "num": 14 }, { @@ -731,12 +731,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 39824 } ], "bonus": 4200, "activation": false, - "probability": 300, + "probability": 150, "num": 15 }, { @@ -746,7 +746,7 @@ "need": [], "bonus": 4500, "activation": true, - "probability": 250, + "probability": 100, "num": -1 }, { @@ -757,7 +757,7 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 8626 } ], "bonus": 0, @@ -773,12 +773,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 10783 } ], "bonus": 300, "activation": false, - "probability": 1000, + "probability": 900, "num": 2 }, { @@ -789,7 +789,7 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 12254 } ], "bonus": 600, @@ -805,12 +805,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 12636 } ], "bonus": 900, "activation": true, - "probability": 850, + "probability": 800, "num": 4 }, { @@ -821,12 +821,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 12962 } ], "bonus": 1200, "activation": false, - "probability": 800, + "probability": 700, "num": 5 }, { @@ -837,12 +837,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 13072 } ], "bonus": 1500, "activation": false, - "probability": 750, + "probability": 600, "num": 6 }, { @@ -853,12 +853,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 16742 } ], "bonus": 1800, "activation": true, - "probability": 700, + "probability": 400, "num": 7 }, { @@ -869,12 +869,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 17672 } ], "bonus": 2100, "activation": false, - "probability": 650, + "probability": 400, "num": 8 }, { @@ -885,12 +885,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 18718 } ], "bonus": 2400, "activation": false, - "probability": 600, + "probability": 400, "num": 9 }, { @@ -901,12 +901,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 20927 } ], "bonus": 2700, "activation": true, - "probability": 550, + "probability": 400, "num": 10 }, { @@ -917,12 +917,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 22206 } ], "bonus": 3000, "activation": false, - "probability": 500, + "probability": 400, "num": 11 }, { @@ -933,12 +933,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 25026 } ], "bonus": 3300, "activation": false, - "probability": 450, + "probability": 300, "num": 12 }, { @@ -949,12 +949,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 28904 } ], "bonus": 3600, "activation": true, - "probability": 400, + "probability": 200, "num": 13 }, { @@ -965,12 +965,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 30474 } ], "bonus": 3900, "activation": false, - "probability": 350, + "probability": 200, "num": 14 }, { @@ -981,12 +981,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 31859 } ], "bonus": 4200, "activation": false, - "probability": 300, + "probability": 150, "num": 15 }, { @@ -996,7 +996,7 @@ "need": [], "bonus": 4500, "activation": true, - "probability": 250, + "probability": 100, "num": -1 }, { @@ -1007,7 +1007,7 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 6900 } ], "bonus": 0, @@ -1023,12 +1023,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 8626 } ], "bonus": 300, "activation": false, - "probability": 1000, + "probability": 900, "num": 2 }, { @@ -1039,7 +1039,7 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 9802 } ], "bonus": 600, @@ -1055,12 +1055,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 10108 } ], "bonus": 900, "activation": true, - "probability": 850, + "probability": 800, "num": 4 }, { @@ -1071,12 +1071,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 10369 } ], "bonus": 1200, "activation": false, - "probability": 800, + "probability": 700, "num": 5 }, { @@ -1087,12 +1087,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 10457 } ], "bonus": 1500, "activation": false, - "probability": 750, + "probability": 600, "num": 6 }, { @@ -1103,12 +1103,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 13393 } ], "bonus": 1800, "activation": true, - "probability": 700, + "probability": 400, "num": 7 }, { @@ -1119,12 +1119,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 14137 } ], "bonus": 2100, "activation": false, - "probability": 650, + "probability": 400, "num": 8 }, { @@ -1135,12 +1135,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 14974 } ], "bonus": 2400, "activation": false, - "probability": 600, + "probability": 400, "num": 9 }, { @@ -1151,12 +1151,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 16742 } ], "bonus": 2700, "activation": true, - "probability": 550, + "probability": 400, "num": 10 }, { @@ -1167,12 +1167,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 17764 } ], "bonus": 3000, "activation": false, - "probability": 500, + "probability": 400, "num": 11 }, { @@ -1183,12 +1183,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 20020 } ], "bonus": 3300, "activation": false, - "probability": 450, + "probability": 300, "num": 12 }, { @@ -1199,12 +1199,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 23123 } ], "bonus": 3600, "activation": true, - "probability": 400, + "probability": 200, "num": 13 }, { @@ -1215,12 +1215,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 24379 } ], "bonus": 3900, "activation": false, - "probability": 350, + "probability": 200, "num": 14 }, { @@ -1231,12 +1231,12 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 25487 } ], "bonus": 4200, "activation": false, - "probability": 300, + "probability": 150, "num": 15 }, { @@ -1246,7 +1246,7 @@ "need": [], "bonus": 4500, "activation": true, - "probability": 250, + "probability": 100, "num": -1 }, { @@ -1257,7 +1257,7 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 5520 } ], "bonus": 0, @@ -1273,12 +1273,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 6901 } ], "bonus": 300, "activation": false, - "probability": 1000, + "probability": 900, "num": 2 }, { @@ -1289,7 +1289,7 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 7841 } ], "bonus": 600, @@ -1305,12 +1305,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 8086 } ], "bonus": 900, "activation": true, - "probability": 850, + "probability": 800, "num": 4 }, { @@ -1321,12 +1321,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 8295 } ], "bonus": 1200, "activation": false, - "probability": 800, + "probability": 700, "num": 5 }, { @@ -1337,12 +1337,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 8365 } ], "bonus": 1500, "activation": false, - "probability": 750, + "probability": 600, "num": 6 }, { @@ -1353,12 +1353,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 10714 } ], "bonus": 1800, "activation": true, - "probability": 700, + "probability": 400, "num": 7 }, { @@ -1369,12 +1369,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 11310 } ], "bonus": 2100, "activation": false, - "probability": 650, + "probability": 400, "num": 8 }, { @@ -1385,12 +1385,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 11979 } ], "bonus": 2400, "activation": false, - "probability": 600, + "probability": 400, "num": 9 }, { @@ -1401,12 +1401,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 13393 } ], "bonus": 2700, "activation": true, - "probability": 550, + "probability": 400, "num": 10 }, { @@ -1417,12 +1417,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 14211 } ], "bonus": 3000, "activation": false, - "probability": 500, + "probability": 400, "num": 11 }, { @@ -1433,12 +1433,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 16016 } ], "bonus": 3300, "activation": false, - "probability": 450, + "probability": 300, "num": 12 }, { @@ -1449,12 +1449,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 18498 } ], "bonus": 3600, "activation": true, - "probability": 400, + "probability": 200, "num": 13 }, { @@ -1465,12 +1465,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 19503 } ], "bonus": 3900, "activation": false, - "probability": 350, + "probability": 200, "num": 14 }, { @@ -1481,12 +1481,12 @@ { "a": "attr", "t": "gold", - "n": 60000 + "n": 20389 } ], "bonus": 4200, "activation": false, - "probability": 300, + "probability": 150, "num": 15 }, { @@ -1496,7 +1496,7 @@ "need": [], "bonus": 4500, "activation": true, - "probability": 250, + "probability": 100, "num": -1 } ] \ No newline at end of file diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json index e524aa502..e3d0e176b 100644 --- a/bin/json/game_equipsuit.json +++ b/bin/json/game_equipsuit.json @@ -4,8 +4,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13001", + "text": "攻势套装" }, "skillintr": { "key": "equip_13215", @@ -23,8 +23,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13002", + "text": "逐风套装" }, "skillintr": { "key": "equip_13215", @@ -42,8 +42,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13003", + "text": "寒霜套装" }, "skillintr": { "key": "equip_13215", @@ -61,8 +61,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13004", + "text": "渴血套装" }, "skillintr": { "key": "equip_13215", @@ -80,8 +80,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13005", + "text": "愈合套装" }, "skillintr": { "key": "equip_13215", @@ -99,8 +99,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13006", + "text": "祈愿套装" }, "skillintr": { "key": "equip_13215", @@ -118,8 +118,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13007", + "text": "脉冲套装" }, "skillintr": { "key": "equip_13215", @@ -137,8 +137,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13008", + "text": "裁决套装" }, "skillintr": { "key": "equip_13215", @@ -156,8 +156,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13009", + "text": "炼心套装" }, "skillintr": { "key": "equip_13215", @@ -175,8 +175,8 @@ "suitnum": 4, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13010", + "text": "庇佑套装" }, "skillintr": { "key": "equip_13215", @@ -190,12 +190,12 @@ ] }, { - "suittype": 100, + "suittype": 10, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13011", + "text": "牧神套装" }, "skillintr": { "key": "equip_13215", @@ -209,12 +209,12 @@ ] }, { - "suittype": 101, + "suittype": 11, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13012", + "text": "玄武套装" }, "skillintr": { "key": "equip_13215", @@ -228,12 +228,12 @@ ] }, { - "suittype": 102, + "suittype": 12, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13013", + "text": "箭神套装" }, "skillintr": { "key": "equip_13215", @@ -247,12 +247,12 @@ ] }, { - "suittype": 103, + "suittype": 13, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13014", + "text": "预言套装 " }, "skillintr": { "key": "equip_13215", @@ -266,12 +266,12 @@ ] }, { - "suittype": 104, + "suittype": 14, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13015", + "text": "月盾套装" }, "skillintr": { "key": "equip_13215", @@ -285,12 +285,12 @@ ] }, { - "suittype": 105, + "suittype": 15, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13214", - "text": "圆月套装" + "key": "suit_13016", + "text": "破妄套装" }, "skillintr": { "key": "equip_13215", @@ -304,12 +304,50 @@ ] }, { - "suittype": 106, + "suittype": 16, "suitnum": 2, "skill": 225001214, "skillname": { - "key": "equip_13213", - "text": "神龙套装" + "key": "suit_13017", + "text": "诅咒套装" + }, + "skillintr": { + "key": "equip_13215", + "text": "暴击率+20%" + }, + "SetBonuses": [ + [ + "crit", + 0.2 + ] + ] + }, + { + "suittype": 17, + "suitnum": 2, + "skill": 225001214, + "skillname": { + "key": "suit_13018", + "text": "守护套装" + }, + "skillintr": { + "key": "equip_13215", + "text": "暴击率+20%" + }, + "SetBonuses": [ + [ + "crit", + 0.2 + ] + ] + }, + { + "suittype": 18, + "suitnum": 2, + "skill": 225001214, + "skillname": { + "key": "suit_13019", + "text": "御免套装" }, "skillintr": { "key": "equip_13215", diff --git a/bin/json/game_libraryfetter.json b/bin/json/game_libraryfetter.json index 7536307f9..99d42dab5 100644 --- a/bin/json/game_libraryfetter.json +++ b/bin/json/game_libraryfetter.json @@ -27,7 +27,7 @@ { "a": "attr", "t": "gold", - "n": 1000 + "n": 2000 }, { "a": "attr", diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json index 6e6ea30a4..75aaaeb32 100644 --- a/bin/json/game_rdtask.json +++ b/bin/json/game_rdtask.json @@ -158,19 +158,8 @@ 101 ], "sidequest": [ - 2008 - ] - }, - { - "id": 100208, - "group": 2, - "type": 2, - "preTid": 100207, - "condition": [ - 101 - ], - "sidequest": [ - 2009 + 2008, + 2006 ] } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 43d03d493..31cfaf0de 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -3,6 +3,10 @@ "id": 10001, "num": 1, "preTid": 0, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -13,6 +17,10 @@ "id": 10002, "num": 2, "preTid": 104, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -23,6 +31,10 @@ "id": 10003, "num": 1, "preTid": 0, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -33,6 +45,10 @@ "id": 10004, "num": 1, "preTid": 0, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -43,6 +59,10 @@ "id": 10005, "num": 2, "preTid": 105, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -53,6 +73,10 @@ "id": 10006, "num": 1, "preTid": 105, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -63,6 +87,10 @@ "id": 10007, "num": 2, "preTid": 0, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -73,6 +101,10 @@ "id": 10008, "num": 3, "preTid": 0, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 @@ -83,6 +115,14 @@ "id": 10009, "num": 1, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "gotoLevel": 0, "needItem": [ 0 @@ -93,6 +133,14 @@ "id": 100010, "num": 2, "preTid": 105, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "gotoLevel": 0, "needItem": [ 0 @@ -103,6 +151,14 @@ "id": 100011, "num": 1, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "gotoLevel": 101, "needItem": [ 0 @@ -113,6 +169,14 @@ "id": 100012, "num": 2, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "gotoLevel": 0, "needItem": [ 0 @@ -123,6 +187,14 @@ "id": 20001, "num": 1, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "gotoLevel": 0, "needItem": [ 0 @@ -133,6 +205,16 @@ "id": 20002, "num": 2, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "gotoLevel": 0, "needItem": [ 0 @@ -143,6 +225,16 @@ "id": 20003, "num": 1, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "gotoLevel": 0, "needItem": [ 0 @@ -153,7 +245,17 @@ "id": 20004, "num": 1, "preTid": 0, - "gotoLevel": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], + "gotoLevel": 101, "needItem": [ 0 ], @@ -163,6 +265,16 @@ "id": 20005, "num": 1, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "gotoLevel": 0, "needItem": [ 0 @@ -173,6 +285,16 @@ "id": 20006, "num": 1, "preTid": 0, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "gotoLevel": 0, "needItem": [ 0 @@ -183,6 +305,10 @@ "id": 20007, "num": 1, "preTid": 0, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "gotoLevel": 0, "needItem": [ 0 diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index b0ce878b2..be9f1aafb 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -3,21 +3,29 @@ "id": 1001, "objType": 1, "location": "middle", + "point": "model_07", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "Enter", - "modelstate": 0, "rotation": { "x": 0, "y": 90, "z": 0 }, - "point": "model_07", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 1, + "timeline": "", "chooseId": [ 10001, 10002 ], + "endTid": -1, "storyEnd": 1, - "nextTid": 100101, "reward": [ { "ChooseId": 10001, @@ -50,204 +58,250 @@ ] } ], - "CD": 0, - "endTid": -1 + "nextTid": 100101, + "CD": 0 }, { "id": 1002, "objType": 1, "location": "middle", + "point": "model_04", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -150, "z": 0 }, - "point": "model_04", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 2, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 1, - "nextTid": -1, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": -1, + "CD": 0 }, { "id": 1003, "objType": 2, "location": "right", + "point": "icon_03", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "icon_03", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 6, + "timeline": "", "chooseId": [ 10003, 10004 ], + "endTid": -1, "storyEnd": 1, - "nextTid": 100103, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100103, + "CD": 0 }, { "id": 1004, "objType": 1, "location": "middle", + "point": "model_04", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -150, "z": 0 }, - "point": "model_04", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 3, + "timeline": "", "chooseId": [ 10005, 10006, 10007 ], + "endTid": -1, "storyEnd": 1, - "nextTid": 100101, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100101, + "CD": 0 }, { "id": 1005, "objType": 1, "location": "middle", + "point": "model_07", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": 90, "z": 0 }, - "point": "model_07", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 4, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": -1, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": -1, + "CD": 0 }, { "id": 1006, "objType": 2, "location": "right", + "point": "icon_03", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "icon_03", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 8, + "timeline": "", "chooseId": [ 10008, 10009 ], + "endTid": -1, "storyEnd": 1, - "nextTid": 100104, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100104, + "CD": 0 }, { "id": 1007, "objType": 2, "location": "left", + "point": "icon_01", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "icon_01", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 10, + "timeline": "", "chooseId": [ 100010, 100011, 100012 ], + "endTid": -1, "storyEnd": 1, - "nextTid": 100105, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100105, + "CD": 0 }, { "id": 1008, "objType": 2, "location": "", + "point": "icon_04", + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "icon_04", + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", "storyBegin": 12, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 1, - "nextTid": 0, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 0, + "CD": 0 }, { "id": 2001, "objType": 1, "location": "middle", + "point": "model_02", + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "model_02", - "storyBegin": 201, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [ 20001, 20002 ], + "endTid": -1, "storyEnd": 0, - "nextTid": 100202, - "reward": [], - "CD": 0, - "endTid": -1 - }, - { - "id": 2002, - "objType": 1, - "location": "middle", - "modelaction": "", - "modelstate": 0, - "rotation": { - "x": 0, - "y": -180, - "z": 0 - }, - "point": "model_02", - "storyBegin": 202, - "chooseId": [ - 20003 - ], - "storyEnd": 0, - "nextTid": 0, "reward": [ { "ChooseId": 20001, @@ -270,67 +324,137 @@ ] } ], - "CD": 0, - "endTid": -1 + "nextTid": 100202, + "CD": 0 + }, + { + "id": 2002, + "objType": 1, + "location": "middle", + "point": "model_02", + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", + "chooseId": [ + 20003 + ], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": 0, + "CD": 0 }, { "id": 2003, "objType": 1, "location": "middle", + "point": "model_03", + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "modelaction": "Enter", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "model_03", - "storyBegin": 203, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": -1, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": -1, + "CD": 0 }, { "id": 2004, "objType": 1, "location": "middle", + "point": "model_03", + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "modelaction": "Enter", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "model_03", - "storyBegin": 203, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": -1, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": -1, + "CD": 0 }, { "id": 2005, "objType": 2, "location": "right", + "point": "icon_05", + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": 0, "z": 0 }, - "point": "icon_05", - "storyBegin": 204, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [ 20004 ], + "endTid": -1, "storyEnd": 0, - "nextTid": 100205, "reward": [ { "ChooseId": 20004, @@ -343,113 +467,179 @@ ] } ], - "CD": 0, - "endTid": -1 + "nextTid": 100205, + "CD": 0 }, { "id": 2006, "objType": 1, "location": "middle", + "point": "model_02", + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "modelaction": "Enter", - "modelstate": 0, "rotation": { "x": 0, "y": 90, "z": 0 }, - "point": "model_02", - "storyBegin": 205, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": -1, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": -1, + "CD": 0 }, { "id": 2007, "objType": 1, "location": "middle", + "point": "model_03", + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "modelaction": "Enter", - "modelstate": 0, "rotation": { "x": 0, "y": -90, "z": 0 }, - "point": "model_03", - "storyBegin": 206, - "chooseId": [ - 20005 - ], + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", + "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": 100207, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100207, + "CD": 0 }, { "id": 2008, - "objType": 2, - "location": "left", - "modelaction": "", - "modelstate": 0, + "objType": 1, + "location": "middle", + "point": "model_03", + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], + "modelaction": "Enter", "rotation": { "x": 0, - "y": 0, + "y": -90, "z": 0 }, - "point": "icon_01", - "storyBegin": 207, - "chooseId": [ - 20006 - ], + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", + "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": 100208, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100208, + "CD": 0 }, { "id": 2009, "objType": 1, "location": "middle", + "point": "model_02", + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": -180, "z": 0 }, - "point": "model_02", - "storyBegin": 207, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [], + "endTid": -1, "storyEnd": 0, - "nextTid": 0, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 0, + "CD": 0 }, { "id": 2010, "objType": 2, "location": "right", + "point": "icon_05", + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], "modelaction": "", - "modelstate": 0, "rotation": { "x": 0, "y": 0, "z": 0 }, - "point": "icon_05", - "storyBegin": 207, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "storyBegin": 0, + "timeline": "", "chooseId": [ 20007 ], + "endTid": -1, "storyEnd": 0, - "nextTid": 100206, "reward": [], - "CD": 0, - "endTid": -1 + "nextTid": 100206, + "CD": 0 } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.RdtaskSideData.go b/sys/configure/structs/Game.RdtaskSideData.go index feb14189e..8d4e6ec07 100644 --- a/sys/configure/structs/Game.RdtaskSideData.go +++ b/sys/configure/structs/Game.RdtaskSideData.go @@ -15,17 +15,25 @@ type GameRdtaskSideData struct { Id int32 ObjType int32 Location string - Modelaction string - Modelstate int32 - Rotation serialization.Vector3 Point string + Entity []string + EntityChange []string + EntityStateChange []string + EntityInteractive []bool + Modelaction string + Rotation serialization.Vector3 + Modelstate int32 + Popup string + Special string + Boxreplace string StoryBegin int32 + Timeline string ChooseId []int32 - StoryEnd int32 - NextTid int32 - Reward []*GameChooseReward - CD int32 EndTid int32 + StoryEnd int32 + Reward []*GameChooseReward + NextTid int32 + CD int32 } const TypeId_GameRdtaskSideData = 865145588 @@ -38,8 +46,64 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["objType"].(float64); !_ok_ { err = errors.New("objType error"); return }; _v.ObjType = int32(_tempNum_) } { var _ok_ bool; if _v.Location, _ok_ = _buf["location"].(string); !_ok_ { err = errors.New("location error"); return } } + { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Entity"].([]interface{}); !_ok_ { err = errors.New("Entity error"); return } + + _v.Entity = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Entity = append(_v.Entity, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EntityChange"].([]interface{}); !_ok_ { err = errors.New("EntityChange error"); return } + + _v.EntityChange = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EntityChange = append(_v.EntityChange, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EntityStateChange"].([]interface{}); !_ok_ { err = errors.New("EntityStateChange error"); return } + + _v.EntityStateChange = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EntityStateChange = append(_v.EntityStateChange, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EntityInteractive"].([]interface{}); !_ok_ { err = errors.New("EntityInteractive error"); return } + + _v.EntityInteractive = make([]bool, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ bool + { var _ok_ bool; if _list_v_, _ok_ = _e_.(bool); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EntityInteractive = append(_v.EntityInteractive, _list_v_) + } + } + { var _ok_ bool; if _v.Modelaction, _ok_ = _buf["modelaction"].(string); !_ok_ { err = errors.New("modelaction error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["modelstate"].(float64); !_ok_ { err = errors.New("modelstate error"); return }; _v.Modelstate = int32(_tempNum_) } { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["rotation"].(map[string]interface{}); !_ok_ { err = errors.New("rotation error"); return } var _x_, _y_, _z_ float32; { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } @@ -48,8 +112,12 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error _v.Rotation = serialization.NewVector3(_x_, _y_, _z_) } - { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["modelstate"].(float64); !_ok_ { err = errors.New("modelstate error"); return }; _v.Modelstate = int32(_tempNum_) } + { var _ok_ bool; if _v.Popup, _ok_ = _buf["popup"].(string); !_ok_ { err = errors.New("popup error"); return } } + { var _ok_ bool; if _v.Special, _ok_ = _buf["special"].(string); !_ok_ { err = errors.New("special error"); return } } + { var _ok_ bool; if _v.Boxreplace, _ok_ = _buf["boxreplace"].(string); !_ok_ { err = errors.New("boxreplace error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyBegin"].(float64); !_ok_ { err = errors.New("storyBegin error"); return }; _v.StoryBegin = int32(_tempNum_) } + { var _ok_ bool; if _v.Timeline, _ok_ = _buf["timeline"].(string); !_ok_ { err = errors.New("timeline error"); return } } { var _arr_ []interface{} var _ok_ bool @@ -64,8 +132,8 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endTid"].(float64); !_ok_ { err = errors.New("endTid error"); return }; _v.EndTid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyEnd"].(float64); !_ok_ { err = errors.New("storyEnd error"); return }; _v.StoryEnd = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nextTid"].(float64); !_ok_ { err = errors.New("nextTid error"); return }; _v.NextTid = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -80,8 +148,8 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nextTid"].(float64); !_ok_ { err = errors.New("nextTid error"); return }; _v.NextTid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CD"].(float64); !_ok_ { err = errors.New("CD error"); return }; _v.CD = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endTid"].(float64); !_ok_ { err = errors.New("endTid error"); return }; _v.EndTid = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go index 5293bb071..823210034 100644 --- a/sys/configure/structs/game.rdtaskChooseData.go +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -14,6 +14,10 @@ type GameRdtaskChooseData struct { Id int32 Num int32 PreTid int32 + Entity []string + EntityChange []string + EntityStateChange []string + EntityInteractive []bool GotoLevel int32 NeedItem []int32 NextTid int32 @@ -29,6 +33,62 @@ func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Entity"].([]interface{}); !_ok_ { err = errors.New("Entity error"); return } + + _v.Entity = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Entity = append(_v.Entity, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EntityChange"].([]interface{}); !_ok_ { err = errors.New("EntityChange error"); return } + + _v.EntityChange = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EntityChange = append(_v.EntityChange, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EntityStateChange"].([]interface{}); !_ok_ { err = errors.New("EntityStateChange error"); return } + + _v.EntityStateChange = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EntityStateChange = append(_v.EntityStateChange, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EntityInteractive"].([]interface{}); !_ok_ { err = errors.New("EntityInteractive error"); return } + + _v.EntityInteractive = make([]bool, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ bool + { var _ok_ bool; if _list_v_, _ok_ = _e_.(bool); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EntityInteractive = append(_v.EntityInteractive, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gotoLevel"].(float64); !_ok_ { err = errors.New("gotoLevel error"); return }; _v.GotoLevel = int32(_tempNum_) } { var _arr_ []interface{}