diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 546ea08e7..4943a341b 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -10,7 +10,7 @@ "race": 1, "job": 2, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "13001", @@ -68,7 +68,7 @@ "race": 1, "job": 1, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "13002", @@ -126,7 +126,7 @@ "race": 1, "job": 2, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "13003", @@ -184,7 +184,7 @@ "race": 1, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "13004", @@ -242,7 +242,7 @@ "race": 1, "job": 3, "type": 1, - "ip": 1, + "ip": 9, "sd": 1, "handbook": -1, "prefab": "13005", @@ -300,7 +300,7 @@ "race": 1, "job": 2, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": -1, "prefab": "14001", @@ -358,7 +358,7 @@ "race": 1, "job": 2, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": -1, "prefab": "14002", @@ -416,7 +416,7 @@ "race": 1, "job": 4, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": 1, "prefab": "14003", @@ -474,7 +474,7 @@ "race": 1, "job": 3, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "14004", @@ -532,7 +532,7 @@ "race": 1, "job": 1, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": -1, "prefab": "14005", @@ -590,7 +590,7 @@ "race": 1, "job": 4, "type": 1, - "ip": 1, + "ip": 9, "sd": 1, "handbook": -1, "prefab": "14006", @@ -648,7 +648,7 @@ "race": 1, "job": 2, "type": 1, - "ip": 1, + "ip": 9, "sd": 1, "handbook": 1, "prefab": "14007", @@ -706,7 +706,7 @@ "race": 1, "job": 1, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "15001", @@ -764,7 +764,7 @@ "race": 1, "job": 1, "type": 1, - "ip": 1, + "ip": 8, "sd": 1, "handbook": -1, "prefab": "15002", @@ -822,7 +822,7 @@ "race": 1, "job": 1, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "15003", @@ -880,7 +880,7 @@ "race": 1, "job": 4, "type": 1, - "ip": 1, + "ip": 2, "sd": 1, "handbook": 1, "prefab": "15004", @@ -938,7 +938,7 @@ "race": 2, "job": 3, "type": 1, - "ip": 1, + "ip": 2, "sd": 1, "handbook": -1, "prefab": "23001", @@ -996,7 +996,7 @@ "race": 2, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "23002", @@ -1112,7 +1112,7 @@ "race": 2, "job": 4, "type": 1, - "ip": 1, + "ip": 12, "sd": 1, "handbook": -1, "prefab": "23004", @@ -1170,7 +1170,7 @@ "race": 2, "job": 1, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "24001", @@ -1228,7 +1228,7 @@ "race": 2, "job": 1, "type": 1, - "ip": 1, + "ip": 10, "sd": 1, "handbook": 1, "prefab": "24002", @@ -1286,7 +1286,7 @@ "race": 2, "job": 4, "type": 1, - "ip": 1, + "ip": 10, "sd": 1, "handbook": 1, "prefab": "24003", @@ -1344,7 +1344,7 @@ "race": 2, "job": 1, "type": 1, - "ip": 1, + "ip": 10, "sd": 1, "handbook": 1, "prefab": "24004", @@ -1402,7 +1402,7 @@ "race": 2, "job": 3, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": -1, "prefab": "24005", @@ -1460,7 +1460,7 @@ "race": 2, "job": 3, "type": 1, - "ip": 1, + "ip": 2, "sd": 1, "handbook": -1, "prefab": "24006", @@ -1518,7 +1518,7 @@ "race": 2, "job": 3, "type": 1, - "ip": 1, + "ip": 2, "sd": 1, "handbook": -1, "prefab": "24007", @@ -1576,7 +1576,7 @@ "race": 2, "job": 1, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": -1, "prefab": "24008", @@ -1634,7 +1634,7 @@ "race": 2, "job": 4, "type": 1, - "ip": 1, + "ip": 9, "sd": 1, "handbook": -1, "prefab": "24009", @@ -1692,7 +1692,7 @@ "race": 2, "job": 2, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": 1, "prefab": "25001", @@ -1750,7 +1750,7 @@ "race": 2, "job": 3, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "25002", @@ -1808,7 +1808,7 @@ "race": 2, "job": 4, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": -1, "prefab": "25003", @@ -1866,7 +1866,7 @@ "race": 2, "job": 3, "type": 1, - "ip": 1, + "ip": 9, "sd": 1, "handbook": 1, "prefab": "25004", @@ -1924,7 +1924,7 @@ "race": 3, "job": 3, "type": 1, - "ip": 1, + "ip": 3, "sd": 1, "handbook": -1, "prefab": "33001", @@ -1982,7 +1982,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 3, "sd": 1, "handbook": -1, "prefab": "33002", @@ -2040,7 +2040,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "33003", @@ -2098,7 +2098,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 12, "sd": 1, "handbook": -1, "prefab": "33004", @@ -2156,7 +2156,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": -1, "prefab": "33005", @@ -2272,7 +2272,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "34001", @@ -2388,7 +2388,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 10, "sd": 1, "handbook": -1, "prefab": "34003", @@ -2446,7 +2446,7 @@ "race": 3, "job": 3, "type": 1, - "ip": 1, + "ip": 3, "sd": 1, "handbook": -1, "prefab": "34004", @@ -2504,7 +2504,7 @@ "race": 3, "job": 4, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "34005", @@ -2562,7 +2562,7 @@ "race": 3, "job": 4, "type": 1, - "ip": 1, + "ip": 10, "sd": 1, "handbook": 1, "prefab": "34006", @@ -2620,7 +2620,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "34007", @@ -2678,7 +2678,7 @@ "race": 3, "job": 4, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": -1, "prefab": "34008", @@ -2736,7 +2736,7 @@ "race": 2, "job": 2, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": 1, "prefab": "35001", @@ -2794,9 +2794,9 @@ "race": 3, "job": 4, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "35002", "rotation": "0|0|0", "icon": "35002", @@ -2852,7 +2852,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 10, "sd": 1, "handbook": 1, "prefab": "35003", @@ -2910,7 +2910,7 @@ "race": 3, "job": 1, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "35004", @@ -2968,7 +2968,7 @@ "race": 3, "job": 3, "type": 1, - "ip": 1, + "ip": 12, "sd": 1, "handbook": -1, "prefab": "35005", @@ -3026,7 +3026,7 @@ "race": 3, "job": 3, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": -1, "prefab": "35006", @@ -3084,7 +3084,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 12, "sd": 1, "handbook": -1, "prefab": "43001", @@ -3142,7 +3142,7 @@ "race": 4, "job": 4, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "43002", @@ -3200,7 +3200,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "43003", @@ -3258,7 +3258,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "43004", @@ -3316,7 +3316,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": -1, "prefab": "43005", @@ -3374,7 +3374,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 9, "sd": 1, "handbook": -1, "prefab": "43006", @@ -3432,7 +3432,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 11, "sd": 1, "handbook": -1, "prefab": "43007", @@ -3490,7 +3490,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "44001", @@ -3548,7 +3548,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "44002", @@ -3606,7 +3606,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "44003", @@ -3664,7 +3664,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "44004", @@ -3722,7 +3722,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": 1, "prefab": "44006", @@ -3780,7 +3780,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 4, "sd": 1, "handbook": -1, "prefab": "45001", @@ -3838,7 +3838,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 7, "sd": 1, "handbook": -1, "prefab": "45002", @@ -3896,7 +3896,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 1, + "ip": 3, "sd": 1, "handbook": 1, "prefab": "45003", @@ -3954,7 +3954,7 @@ "race": 4, "job": 1, "type": 1, - "ip": 1, + "ip": 5, "sd": 1, "handbook": -1, "prefab": "45004", @@ -6394,7 +6394,7 @@ "type": 1, "ip": 1, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "35002", "rotation": "0|0|0", "icon": "11009", diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index 98233ba40..230b1ef1f 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -60,18 +60,7 @@ ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ], + "award": [], "title": { "key": "mainline_title_10001", "text": "第1关：功夫世界" @@ -138,7 +127,7 @@ "previoustage": 102, "order": 3, "chapter": 1, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -194,18 +183,7 @@ ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40003 - } - ], + "award": [], "title": { "key": "mainline_title_10004", "text": "第4关：乌龟大师" @@ -374,18 +352,7 @@ ], "captainId": "", "battlescene": "bg_zhandoulmboss", - "award": [ - { - "a": "item", - "t": "1", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 40007 - } - ], + "award": [], "title": { "key": "mainline_title_10008", "text": "第6关：乌龟大师" @@ -586,7 +553,7 @@ "previoustage": 202, "order": 3, "chapter": 2, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -1034,7 +1001,7 @@ "previoustage": 302, "order": 3, "chapter": 3, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -1482,7 +1449,7 @@ "previoustage": 402, "order": 3, "chapter": 4, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -1930,7 +1897,7 @@ "previoustage": 502, "order": 3, "chapter": 5, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -2378,7 +2345,7 @@ "previoustage": 602, "order": 3, "chapter": 6, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -2826,7 +2793,7 @@ "previoustage": 702, "order": 3, "chapter": 7, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -3274,7 +3241,7 @@ "previoustage": 802, "order": 3, "chapter": 8, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -3722,7 +3689,7 @@ "previoustage": 902, "order": 3, "chapter": 9, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -4170,7 +4137,7 @@ "previoustage": 1002, "order": 3, "chapter": 10, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -4618,7 +4585,7 @@ "previoustage": 1102, "order": 3, "chapter": 11, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -5066,7 +5033,7 @@ "previoustage": 1202, "order": 3, "chapter": 12, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -5514,7 +5481,7 @@ "previoustage": 102, "order": 3, "chapter": 1, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -5962,7 +5929,7 @@ "previoustage": 202, "order": 3, "chapter": 2, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -6410,7 +6377,7 @@ "previoustage": 302, "order": 3, "chapter": 3, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -6858,7 +6825,7 @@ "previoustage": 402, "order": 3, "chapter": 4, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -7306,7 +7273,7 @@ "previoustage": 502, "order": 3, "chapter": 5, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -7754,7 +7721,7 @@ "previoustage": 602, "order": 3, "chapter": 6, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -8202,7 +8169,7 @@ "previoustage": 702, "order": 3, "chapter": 7, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -8650,7 +8617,7 @@ "previoustage": 802, "order": 3, "chapter": 8, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -9098,7 +9065,7 @@ "previoustage": 902, "order": 3, "chapter": 9, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -9546,7 +9513,7 @@ "previoustage": 1002, "order": 3, "chapter": 10, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -9994,7 +9961,7 @@ "previoustage": 1102, "order": 3, "chapter": 11, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -10442,7 +10409,7 @@ "previoustage": 1202, "order": 3, "chapter": 12, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -10890,7 +10857,7 @@ "previoustage": 102, "order": 3, "chapter": 1, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -11338,7 +11305,7 @@ "previoustage": 202, "order": 3, "chapter": 2, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -11786,7 +11753,7 @@ "previoustage": 302, "order": 3, "chapter": 3, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -12234,7 +12201,7 @@ "previoustage": 402, "order": 3, "chapter": 4, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -12682,7 +12649,7 @@ "previoustage": 502, "order": 3, "chapter": 5, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -13130,7 +13097,7 @@ "previoustage": 602, "order": 3, "chapter": 6, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -13578,7 +13545,7 @@ "previoustage": 702, "order": 3, "chapter": 7, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -14026,7 +13993,7 @@ "previoustage": 802, "order": 3, "chapter": 8, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -14474,7 +14441,7 @@ "previoustage": 902, "order": 3, "chapter": 9, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -14922,7 +14889,7 @@ "previoustage": 1002, "order": 3, "chapter": 10, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -15370,7 +15337,7 @@ "previoustage": 1102, "order": 3, "chapter": 11, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 @@ -15818,7 +15785,7 @@ "previoustage": 1202, "order": 3, "chapter": 12, - "Episodetype": 7, + "Episodetype": 5, "Episodelocation": { "x": 1277, "y": 1729 diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index ea53b8c40..9f4edc123 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -56,7 +56,7 @@ "key": "opencond_name_10004", "text": "好友" }, - "main": 999, + "main": 1, "optional": "", "wkqbx": 0, "kqbx": 0, @@ -75,7 +75,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -143,7 +143,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -177,7 +177,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -194,7 +194,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -279,7 +279,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -296,7 +296,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -313,7 +313,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -330,7 +330,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -347,7 +347,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -364,7 +364,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -381,7 +381,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { @@ -398,7 +398,7 @@ }, "main": 999, "optional": "", - "wkqbx": 0, + "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", "prompt": { diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 1c536961d..b8541c0f8 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -6,7 +6,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 100102 }, { "id": 10002, @@ -15,7 +16,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 100101 }, { "id": 10003, @@ -24,7 +26,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 100103 }, { "id": 10004, @@ -33,7 +36,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 0 }, { "id": 10005, @@ -42,7 +46,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 0 }, { "id": 10006, @@ -51,7 +56,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 0 }, { "id": 10007, @@ -60,7 +66,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 100101 }, { "id": 10008, @@ -69,7 +76,8 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 100104 }, { "id": 10009, @@ -78,25 +86,28 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 0 }, { "id": 100010, "num": 2, - "preTid": 0, - "gotoLevel": 0, - "needItem": [ - 0 - ] - }, - { - "id": 100011, - "num": 1, "preTid": 105, "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 100105 + }, + { + "id": 100011, + "num": 1, + "preTid": 0, + "gotoLevel": 101, + "needItem": [ + 0 + ], + "nextTid": 100105 }, { "id": 100012, @@ -105,6 +116,7 @@ "gotoLevel": 0, "needItem": [ 0 - ] + ], + "nextTid": 0 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index f7c018cc7..97bfdbcc1 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -16,7 +16,7 @@ 10001, 10002 ], - "storyEnd": 0, + "storyEnd": 1, "nextTid": 100101, "reward": [ { @@ -70,7 +70,7 @@ 10003, 10004 ], - "storyEnd": 0, + "storyEnd": 1, "nextTid": 100103, "reward": [], "CD": 0, @@ -94,7 +94,7 @@ 10006, 10007 ], - "storyEnd": 0, + "storyEnd": 1, "nextTid": 100101, "reward": [], "CD": 0, @@ -123,7 +123,7 @@ { "id": 1006, "objType": 2, - "location": "middle", + "location": "right", "modelaction": "", "modelstate": 0, "rotation": { @@ -137,7 +137,7 @@ 10008, 10009 ], - "storyEnd": 0, + "storyEnd": 1, "nextTid": 100104, "reward": [], "CD": 0, @@ -161,7 +161,7 @@ 100011, 100012 ], - "storyEnd": 0, + "storyEnd": 1, "nextTid": 100105, "reward": [], "CD": 0, @@ -186,65 +186,5 @@ "reward": [], "CD": 0, "endTid": -1 - }, - { - "id": 1009, - "objType": 2, - "location": "middle", - "modelaction": "", - "modelstate": 0, - "rotation": { - "x": 0, - "y": -180, - "z": 0 - }, - "point": "model_04", - "storyBegin": 12, - "chooseId": [], - "storyEnd": 0, - "nextTid": -1, - "reward": [], - "CD": 0, - "endTid": -1 - }, - { - "id": 1010, - "objType": 2, - "location": "middle", - "modelaction": "", - "modelstate": 0, - "rotation": { - "x": 0, - "y": -180, - "z": 0 - }, - "point": "model_05", - "storyBegin": 13, - "chooseId": [], - "storyEnd": 0, - "nextTid": -1, - "reward": [], - "CD": 0, - "endTid": -1 - }, - { - "id": 1011, - "objType": 1, - "location": "middle", - "modelaction": "", - "modelstate": 0, - "rotation": { - "x": 0, - "y": -180, - "z": 0 - }, - "point": "model_06", - "storyBegin": 14, - "chooseId": [], - "storyEnd": 0, - "nextTid": -1, - "reward": [], - "CD": 0, - "endTid": -1 } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 6f239627b..9c00c6b76 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -1669,8 +1669,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - -200, - 1 + -200 ], "FollowSK": [], "SucFollowSK": [], @@ -1707,8 +1706,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - -250, - 1 + -250 ], "FollowSK": [], "SucFollowSK": [], @@ -7378,9 +7376,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - 150, - 1, - 1 + 150 ], "FollowSK": [], "SucFollowSK": [], @@ -7509,5 +7505,1884 @@ ], "FailFollowSK": [], "MustHit": false + }, + { + "Id": 224002011, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001322, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002111, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 550 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002112, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 550 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002113, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001211, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002121, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002122, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002131, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 650 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002132, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 650 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002141, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 700 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002142, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 700 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002151, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 750 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002152, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 750 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002161, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 800 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002162, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "Type=Rand", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 800 + ], + "FollowSK": [], + "SucFollowSK": [ + 124002113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002211, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 424002211, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002212, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 424002212, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002213, + "EmitPR": 1000, + "From": 8, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001401, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002311, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002312, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002322, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 350 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002332, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 400 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002342, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 450 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 224002352, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 500 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007011, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001313, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007111, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 5, + 500 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007112 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007112, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001007, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007121, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 5, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007122 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007122, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001007, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007131, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 5, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007132 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007132, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001007, + 600, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007141, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 5, + 700 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007142 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007142, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001007, + 600, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007151, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 5, + 700 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007152 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007152, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001007, + 700, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007161, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 5, + 800 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007162 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007162, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001007, + 700, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007211, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 414007211, + 6, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007212, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007213, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 13, + "Argu": [ + 3, + -99 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007214, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001403, + 1000, + 1, + 0 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007311, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 5, + 800 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007312, + 214007313 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007312, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 300, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007313, + "EmitPR": 1000, + "From": 9, + "Where": "AttrThan=5", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 300, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007321, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 5, + 850 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007322, + 214007323 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007322, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 300, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007323, + "EmitPR": 1000, + "From": 9, + "Where": "AttrThan=5", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 300, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007331, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 5, + 850 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007332, + 214007333 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007332, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 400, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007333, + "EmitPR": 1000, + "From": 9, + "Where": "AttrThan=5", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 400, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007341, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 5, + 900 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007342, + 214007343 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007342, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 400, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007343, + "EmitPR": 1000, + "From": 9, + "Where": "AttrThan=5", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 400, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007351, + "EmitPR": 1000, + "From": 2, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 5, + 900 + ], + "FollowSK": [], + "SucFollowSK": [ + 214007352, + 214007353 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007352, + "EmitPR": 1000, + "From": 9, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 500, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214007353, + "EmitPR": 1000, + "From": 9, + "Where": "AttrThan=5", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001104, + 500, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003011, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001324, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003111, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 500 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003112 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003112, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003113, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001011, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003121, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 550 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003122 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003122, + "EmitPR": 500, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003131, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 550 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003132 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003132, + "EmitPR": 750, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003141, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003142 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003142, + "EmitPR": 750, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003151, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 700 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003152 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003152, + "EmitPR": 750, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003211, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 414003311, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003212, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001003, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003213, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1500 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003214 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003214, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 800, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003223, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1600 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003224 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003224, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 800, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003233, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1600 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003234 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003234, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003243, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1800 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003244 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003244, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003311, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 3, + 4, + 500 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003312 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003312, + "EmitPR": 400, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003321, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 3, + 4, + 550 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003322 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003322, + "EmitPR": 400, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003331, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 3, + 4, + 550 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003332 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003332, + "EmitPR": 500, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003341, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 3, + 4, + 600 + ], + "FollowSK": [], + "SucFollowSK": [ + 214003342 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 214003342, + "EmitPR": 500, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003011, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001321, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003111, + "EmitPR": 1000, + "From": 4, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300, + 1, + 1, + 55 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003112, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 4, + "Argu": [ + 1, + 1, + 150 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003211, + "EmitPR": 1000, + "From": 3, + "Where": "", + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 445003211, + 99, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003212, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001125, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003311, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 1, + -1, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003312, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001111, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 245003313, + "EmitPR": 1000, + "From": 1, + "Where": "", + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 4, + "Argu": [ + 2, + 1, + 350 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index d976d3bd9..48d0b44b2 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -5493,5 +5493,1306 @@ }, "buffid": [], "map": "" + }, + { + "id": 124002011, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_124002011", + "text": "牙仙队长技" + }, + "ico": "jn_dzj_01", + "act": "", + "Type": 3, + "CD": -1, + "Target": 1, + "ChildSkill": { + "Id": [ + 224002011 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002111, + "level": 1, + "MaxLV": 6, + "Name": { + "key": "skillname_124002111", + "text": "牙仙1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002111, + 224002112 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002111, + "level": 2, + "MaxLV": 6, + "Name": { + "key": "skillname_124002111", + "text": "牙仙1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002121, + 224002122 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002111, + "level": 3, + "MaxLV": 6, + "Name": { + "key": "skillname_124002111", + "text": "牙仙1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002131, + 224002132 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002111, + "level": 4, + "MaxLV": 6, + "Name": { + "key": "skillname_124002111", + "text": "牙仙1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002141, + 224002142 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002111, + "level": 5, + "MaxLV": 6, + "Name": { + "key": "skillname_124002111", + "text": "牙仙1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002151, + 224002152 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002111, + "level": 6, + "MaxLV": 6, + "Name": { + "key": "skillname_124002111", + "text": "牙仙1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002161, + 224002162 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002211, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_124002211", + "text": "牙仙2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 2, + "CD": -1, + "Target": 3, + "ChildSkill": { + "Id": [ + 224002211, + 224002212 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002311, + "level": 1, + "MaxLV": 6, + "Name": { + "key": "skillname_124002311", + "text": "牙仙3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002311, + 224002312 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002311, + "level": 2, + "MaxLV": 6, + "Name": { + "key": "skillname_124002311", + "text": "牙仙3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002311, + 224002322 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002311, + "level": 3, + "MaxLV": 6, + "Name": { + "key": "skillname_124002311", + "text": "牙仙3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002311, + 224002332 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002311, + "level": 4, + "MaxLV": 6, + "Name": { + "key": "skillname_124002311", + "text": "牙仙3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002311, + 224002342 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002311, + "level": 5, + "MaxLV": 6, + "Name": { + "key": "skillname_124002311", + "text": "牙仙3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002311, + 224002352 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 124002311, + "level": 6, + "MaxLV": 6, + "Name": { + "key": "skillname_124002311", + "text": "牙仙3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Target": 2, + "ChildSkill": { + "Id": [ + 224002311, + 224002352 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007011, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_114007011", + "text": "格里斯特王子队长技" + }, + "ico": "jn_dzj_01", + "act": "", + "Type": 3, + "CD": -1, + "Target": 1, + "ChildSkill": { + "Id": [ + 214007011 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007111, + "level": 1, + "MaxLV": 6, + "Name": { + "key": "skillname_114007111", + "text": "格里斯特王子1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007111 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007111, + "level": 2, + "MaxLV": 6, + "Name": { + "key": "skillname_114007111", + "text": "格里斯特王子1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007121 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007111, + "level": 3, + "MaxLV": 6, + "Name": { + "key": "skillname_114007111", + "text": "格里斯特王子1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007131 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007111, + "level": 4, + "MaxLV": 6, + "Name": { + "key": "skillname_114007111", + "text": "格里斯特王子1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007141 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007111, + "level": 5, + "MaxLV": 6, + "Name": { + "key": "skillname_114007111", + "text": "格里斯特王子1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007151 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007111, + "level": 6, + "MaxLV": 6, + "Name": { + "key": "skillname_114007111", + "text": "格里斯特王子1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007161 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007211, + "level": 1, + "MaxLV": 3, + "Name": { + "key": "skillname_114007211", + "text": "格里斯特王子2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 2, + "CD": 6, + "Target": 3, + "ChildSkill": { + "Id": [ + 214007211, + 214007211 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007211, + "level": 2, + "MaxLV": 3, + "Name": { + "key": "skillname_114007211", + "text": "格里斯特王子2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 2, + "CD": 5, + "Target": 3, + "ChildSkill": { + "Id": [ + 214007211, + 214007211 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007211, + "level": 3, + "MaxLV": 3, + "Name": { + "key": "skillname_114007211", + "text": "格里斯特王子2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 2, + "CD": 4, + "Target": 3, + "ChildSkill": { + "Id": [ + 214007211, + 214007211 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007311, + "level": 1, + "MaxLV": 6, + "Name": { + "key": "skillname_114007311", + "text": "格里斯特王子3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007311, + 214007312, + 214007313 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007311, + "level": 2, + "MaxLV": 6, + "Name": { + "key": "skillname_114007311", + "text": "格里斯特王子3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007321, + 214007322, + 214007323 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007311, + "level": 3, + "MaxLV": 6, + "Name": { + "key": "skillname_114007311", + "text": "格里斯特王子3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007331, + 214007332, + 214007333 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007311, + "level": 4, + "MaxLV": 6, + "Name": { + "key": "skillname_114007311", + "text": "格里斯特王子3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007341, + 214007342, + 214007343 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007311, + "level": 5, + "MaxLV": 6, + "Name": { + "key": "skillname_114007311", + "text": "格里斯特王子3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007351, + 214007352, + 214007353 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114007311, + "level": 6, + "MaxLV": 6, + "Name": { + "key": "skillname_114007311", + "text": "格里斯特王子3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 214007351, + 214007352, + 214007353 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003011, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_114003011", + "text": "亚丝翠队长技" + }, + "ico": "jn_dzj_01", + "act": "", + "Type": 3, + "CD": -1, + "Target": 1, + "ChildSkill": { + "Id": [ + 214003011 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003111, + "level": 1, + "MaxLV": 5, + "Name": { + "key": "skillname_114003111", + "text": "亚丝翠1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003111 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003111, + "level": 2, + "MaxLV": 5, + "Name": { + "key": "skillname_114003111", + "text": "亚丝翠1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003121 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003111, + "level": 3, + "MaxLV": 5, + "Name": { + "key": "skillname_114003111", + "text": "亚丝翠1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003131 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003111, + "level": 4, + "MaxLV": 5, + "Name": { + "key": "skillname_114003111", + "text": "亚丝翠1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003141 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003111, + "level": 5, + "MaxLV": 5, + "Name": { + "key": "skillname_114003111", + "text": "亚丝翠1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003151 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003211, + "level": 1, + "MaxLV": 5, + "Name": { + "key": "skillname_114003211", + "text": "亚丝翠2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003211, + 214003213 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003211, + "level": 2, + "MaxLV": 5, + "Name": { + "key": "skillname_114003211", + "text": "亚丝翠2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003211, + 214003223 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003211, + "level": 3, + "MaxLV": 5, + "Name": { + "key": "skillname_114003211", + "text": "亚丝翠2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003211, + 214003233 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003211, + "level": 4, + "MaxLV": 5, + "Name": { + "key": "skillname_114003211", + "text": "亚丝翠2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003211, + 214003243 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003211, + "level": 5, + "MaxLV": 5, + "Name": { + "key": "skillname_114003211", + "text": "亚丝翠2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003211, + 214003243 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003311, + "level": 1, + "MaxLV": 5, + "Name": { + "key": "skillname_114003311", + "text": "亚丝翠3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003311 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003311, + "level": 2, + "MaxLV": 5, + "Name": { + "key": "skillname_114003311", + "text": "亚丝翠3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003321 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003311, + "level": 3, + "MaxLV": 5, + "Name": { + "key": "skillname_114003311", + "text": "亚丝翠3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003331 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003311, + "level": 4, + "MaxLV": 5, + "Name": { + "key": "skillname_114003311", + "text": "亚丝翠3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003341 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 114003311, + "level": 5, + "MaxLV": 5, + "Name": { + "key": "skillname_114003311", + "text": "亚丝翠3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Target": 2, + "ChildSkill": { + "Id": [ + 214003113, + 214003341 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 145003011, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_145003011", + "text": "盖队长技" + }, + "ico": "jn_dzj_01", + "act": "", + "Type": 3, + "CD": -1, + "Target": 1, + "ChildSkill": { + "Id": [ + 245003011 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 145003111, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_145003111", + "text": "盖1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 245003111, + 245003112 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 145003211, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_145003211", + "text": "盖2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 2, + "CD": 0, + "Target": 3, + "ChildSkill": { + "Id": [ + 245003211 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" + }, + { + "id": 145003311, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_145003311", + "text": "盖3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 1, + "ChildSkill": { + "Id": [ + 245003311, + 245003312, + 245003313 + ] + }, + "Desc": { + "key": "", + "text": "" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 0073681da..fce53bc39 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -879,6 +879,34 @@ "buffeffect": "", "buffpos": "" }, + { + "Id": 390001125, + "Name": { + "key": "skill_buff_390001125", + "text": "护盾" + }, + "Desc": { + "key": "skill_buffdes_390001125", + "text": "增加护盾" + }, + "BuffType": 21, + "EffectArgu": [ + 2, + 1, + 500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": 0, + "AddEffect": false, + "RemoveType": true, + "OverlayTimes": 1, + "SameID": false, + "buffIcon": "", + "buffeffect": "", + "buffpos": "" + }, { "Id": 390001201, "Name": { @@ -915,7 +943,9 @@ }, "BuffType": 0, "EffectArgu": [ + 5, 100, + 10, 50 ], "BufParNum": 1, @@ -1101,6 +1131,32 @@ "buffeffect": "", "buffpos": "" }, + { + "Id": 390001211, + "Name": { + "key": "skill_buff_390001211", + "text": "童真" + }, + "Desc": { + "key": "skill_buffdes_390001211", + "text": "状态携带者受击5次后，【童真】自动引爆，对该目标及随机2个地方目标造成该状态释放者攻击力85%的伤害，并有50%概率对被花粉影响的目标附加2回合【沉默】" + }, + "BuffType": 6, + "EffectArgu": [ + 500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": 0, + "AddEffect": false, + "RemoveType": false, + "OverlayTimes": 5, + "SameID": false, + "buffIcon": "", + "buffeffect": "", + "buffpos": "" + }, { "Id": 390001301, "Name": { @@ -1703,18 +1759,41 @@ "Id": 390001402, "Name": { "key": "skill_buff_390001402", - "text": "属性转换" + "text": "损失属性转换" }, "Desc": { "key": "skill_buffdes_390001402", "text": "自身每损失10%最大生命值，伤害增加5%" }, - "BuffType": 32, + "BuffType": 1, "EffectArgu": [ - 12, - 100, - 36, - 50 + 500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": 0, + "AddEffect": false, + "RemoveType": false, + "OverlayTimes": 1, + "SameID": false, + "buffIcon": "", + "buffeffect": "", + "buffpos": "" + }, + { + "Id": 390001403, + "Name": { + "key": "skill_buff_390001403", + "text": "属性对比" + }, + "Desc": { + "key": "skill_buffdes_390001403", + "text": "目标防御比自身低时，自身伤害提升，每1%差值提供1%额外伤害，最高40%" + }, + "BuffType": 1, + "EffectArgu": [ + 500 ], "BufParNum": 1, "RelyCheckArgu": [], diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index ba042759f..a421f8e53 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -372,5 +372,67 @@ "Callback": [ 915005214 ] + }, + { + "Id": 424002211, + "When": "AtkStart", + "TargetCheck": 3, + "AddCon": "Target=9,EffID=390001211", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 124002213 + ] + }, + { + "Id": 424002212, + "When": "SufEnd", + "TargetCheck": 3, + "AddCon": "Target=8,EffID=390001211", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 124002111, + 124002112 + ] + }, + { + "Id": 414007211, + "When": "SufEnd", + "TargetCheck": 3, + "AddCon": "", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 214007212, + 214007213 + ] + }, + { + "Id": 414003311, + "When": "AtkEnd", + "TargetCheck": 3, + "AddCon": "", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 924004212 + ] + }, + { + "Id": 445003211, + "When": "SufEnd", + "TargetCheck": 3, + "AddCon": "", + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 245003212 + ] } ] \ No newline at end of file diff --git a/modules/mainline/api_getReward.go b/modules/mainline/api_getReward.go index 685e0ee64..bbb9a2990 100644 --- a/modules/mainline/api_getReward.go +++ b/modules/mainline/api_getReward.go @@ -29,7 +29,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MainlineGetRew code = pb.ErrorCode_DBError return } - if _obj.AwaredID != pb.AwaredType_TypeReceived { + if _obj.AwaredID == pb.AwaredType_TypeReceived { code = pb.ErrorCode_MainlineRepeatReward // 重复领奖 return } diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go index dbf68ce90..5293bb071 100644 --- a/sys/configure/structs/game.rdtaskChooseData.go +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -16,6 +16,7 @@ type GameRdtaskChooseData struct { PreTid int32 GotoLevel int32 NeedItem []int32 + NextTid int32 } const TypeId_GameRdtaskChooseData = -1833024780 @@ -43,6 +44,7 @@ func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err err } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nextTid"].(float64); !_ok_ { err = errors.New("nextTid error"); return }; _v.NextTid = int32(_tempNum_) } return }