diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index cabdd5396..ac3c6f87e 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -10,6 +10,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "13001", "rotation": "0|0|0", @@ -52,6 +54,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "13002", "rotation": "0|0|0", @@ -94,6 +98,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "13003", "rotation": "0|0|0", @@ -136,6 +142,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "13004", "rotation": "0|0|0", @@ -178,6 +186,8 @@ "race": 1, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "13005", "rotation": "0|0|0", @@ -220,6 +230,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14001", "rotation": "0|0|0", @@ -262,6 +274,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14002", "rotation": "0|0|0", @@ -304,6 +318,8 @@ "race": 1, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14003", "rotation": "0|0|0", @@ -346,6 +362,8 @@ "race": 1, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14004", "rotation": "0|0|0", @@ -388,6 +406,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14005", "rotation": "0|0|0", @@ -430,6 +450,8 @@ "race": 1, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14006", "rotation": "0|0|0", @@ -472,6 +494,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14007", "rotation": "0|0|0", @@ -514,6 +538,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "15001", "rotation": "0|0|0", @@ -556,6 +582,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "15002", "rotation": "0|0|0", @@ -598,6 +626,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "15003", "rotation": "0|0|0", @@ -640,6 +670,8 @@ "race": 1, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "15004", "rotation": "0|0|0", @@ -682,6 +714,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "23001", "rotation": "0|0|0", @@ -724,6 +758,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "23002", "rotation": "0|0|0", @@ -766,6 +802,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "23003", "rotation": "0|0|0", @@ -808,6 +846,8 @@ "race": 2, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "23004", "rotation": "0|0|0", @@ -850,6 +890,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24001", "rotation": "0|0|0", @@ -892,6 +934,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24002", "rotation": "0|0|0", @@ -934,6 +978,8 @@ "race": 2, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": 1, "prefab": "24003", "rotation": "0|0|0", @@ -976,6 +1022,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24004", "rotation": "0|0|0", @@ -1018,6 +1066,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24005", "rotation": "0|0|0", @@ -1060,6 +1110,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24006", "rotation": "0|0|0", @@ -1102,6 +1154,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24007", "rotation": "0|0|0", @@ -1144,6 +1198,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24008", "rotation": "0|0|0", @@ -1186,6 +1242,8 @@ "race": 2, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24009", "rotation": "0|0|0", @@ -1228,6 +1286,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": 1, "prefab": "25001", "rotation": "0|0|0", @@ -1270,6 +1330,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "25002", "rotation": "0|0|0", @@ -1312,6 +1374,8 @@ "race": 2, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "25003", "rotation": "0|0|0", @@ -1354,6 +1418,8 @@ "race": 2, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": 1, "prefab": "25004", "rotation": "0|0|0", @@ -1396,6 +1462,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "33001", "rotation": "0|0|0", @@ -1438,6 +1506,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "33002", "rotation": "0|0|0", @@ -1480,6 +1550,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "33003", "rotation": "0|0|0", @@ -1522,6 +1594,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "33004", "rotation": "0|0|0", @@ -1564,6 +1638,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "33005", "rotation": "0|0|0", @@ -1606,6 +1682,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "33006", "rotation": "0|0|0", @@ -1648,6 +1726,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34001", "rotation": "0|0|0", @@ -1690,6 +1770,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34002", "rotation": "0|0|0", @@ -1732,6 +1814,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34003", "rotation": "0|0|0", @@ -1774,6 +1858,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34004", "rotation": "0|0|0", @@ -1816,6 +1902,8 @@ "race": 3, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34005", "rotation": "0|0|0", @@ -1858,6 +1946,8 @@ "race": 3, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": 1, "prefab": "34006", "rotation": "0|0|0", @@ -1900,6 +1990,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34007", "rotation": "0|0|0", @@ -1942,6 +2034,8 @@ "race": 3, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34008", "rotation": "0|0|0", @@ -1984,6 +2078,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35001", "rotation": "0|0|0", @@ -2026,6 +2122,8 @@ "race": 3, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": 1, "prefab": "35002", "rotation": "0|0|0", @@ -2068,6 +2166,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35003", "rotation": "0|0|0", @@ -2110,6 +2210,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35004", "rotation": "0|0|0", @@ -2152,6 +2254,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35005", "rotation": "0|0|0", @@ -2194,6 +2298,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35006", "rotation": "0|0|0", @@ -2236,6 +2342,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43001", "rotation": "0|0|0", @@ -2278,6 +2386,8 @@ "race": 4, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43002", "rotation": "0|0|0", @@ -2320,6 +2430,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43003", "rotation": "0|0|0", @@ -2362,6 +2474,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43004", "rotation": "0|0|0", @@ -2404,6 +2518,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43005", "rotation": "0|0|0", @@ -2446,6 +2562,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43006", "rotation": "0|0|0", @@ -2488,6 +2606,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43007", "rotation": "0|0|0", @@ -2530,6 +2650,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44001", "rotation": "0|0|0", @@ -2572,6 +2694,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44002", "rotation": "0|0|0", @@ -2614,6 +2738,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44003", "rotation": "0|0|0", @@ -2656,6 +2782,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44004", "rotation": "0|0|0", @@ -2698,6 +2826,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44006", "rotation": "0|0|0", @@ -2740,6 +2870,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "45001", "rotation": "0|0|0", @@ -2782,6 +2914,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "45002", "rotation": "0|0|0", @@ -2824,6 +2958,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "45003", "rotation": "0|0|0", @@ -2866,6 +3002,8 @@ "race": 4, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "45004", "rotation": "0|0|0", @@ -2908,6 +3046,8 @@ "race": 4, "job": 5, "type": 2, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43901", "rotation": "0|0|0", @@ -2950,6 +3090,8 @@ "race": 4, "job": 5, "type": 3, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "42911", "rotation": "0|0|0", @@ -2992,6 +3134,8 @@ "race": 4, "job": 5, "type": 3, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43911", "rotation": "0|0|0", @@ -3034,6 +3178,8 @@ "race": 4, "job": 5, "type": 3, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44911", "rotation": "0|0|0", @@ -3076,6 +3222,8 @@ "race": 4, "job": 5, "type": 4, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "43921", "rotation": "0|0|0", @@ -3118,6 +3266,8 @@ "race": 4, "job": 5, "type": 4, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44921", "rotation": "0|0|0", @@ -3160,6 +3310,8 @@ "race": 4, "job": 5, "type": 4, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "45921", "rotation": "0|0|0", @@ -3202,6 +3354,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51001", "rotation": "0|0|0", @@ -3244,6 +3398,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51002", "rotation": "0|0|0", @@ -3286,6 +3442,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51003", "rotation": "0|0|0", @@ -3328,6 +3486,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51004", "rotation": "0|0|0", @@ -3370,6 +3530,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51005", "rotation": "0|0|0", @@ -3412,6 +3574,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51006", "rotation": "0|0|0", @@ -3454,6 +3618,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51007", "rotation": "0|0|0", @@ -3496,6 +3662,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51008", "rotation": "0|0|0", @@ -3538,6 +3706,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51009", "rotation": "0|0|0", @@ -3580,6 +3750,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51010", "rotation": "0|0|0", @@ -3622,6 +3794,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51011", "rotation": "0|0|0", @@ -3664,6 +3838,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51012", "rotation": "0|0|0", @@ -3706,6 +3882,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51013", "rotation": "0|0|0", @@ -3748,6 +3926,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "51014", "rotation": "0|0|0", @@ -3790,6 +3970,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": 0, "prefab": "54001", "rotation": "0|0|0", @@ -3832,6 +4014,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "53001", "rotation": "0|0|0", @@ -3874,6 +4058,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "53002", "rotation": "0|0|0", @@ -3916,6 +4102,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "53003", "rotation": "0|0|0", @@ -3958,6 +4146,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "53004", "rotation": "0|0|0", @@ -4000,6 +4190,8 @@ "race": 4, "job": 1, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "53005", "rotation": "0|0|0", @@ -4042,6 +4234,8 @@ "race": 4, "job": 3, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "53006", "rotation": "0|0|0", @@ -4084,6 +4278,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55001", "rotation": "0|0|0", @@ -4126,6 +4322,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55002", "rotation": "0|0|0", @@ -4168,6 +4366,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55003", "rotation": "0|0|0", @@ -4210,6 +4410,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55004", "rotation": "0|0|0", @@ -4252,6 +4454,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55005", "rotation": "0|0|0", @@ -4294,6 +4498,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55006", "rotation": "0|0|0", @@ -4336,6 +4542,8 @@ "race": 4, "job": 2, "type": 5, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55007", "rotation": "0|0|0", @@ -4378,6 +4586,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "25001", "rotation": "0|0|0", @@ -4420,6 +4630,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34004", "rotation": "0|0|0", @@ -4462,6 +4674,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "25004", "rotation": "0|0|0", @@ -4506,6 +4720,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14006", "rotation": "0|0|0", @@ -4548,6 +4764,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "25003", "rotation": "0|0|0", @@ -4590,6 +4808,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "14003", "rotation": "0|0|0", @@ -4632,6 +4852,8 @@ "race": 3, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35002", "rotation": "0|0|0", @@ -4674,6 +4896,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34001", "rotation": "0|0|0", @@ -4716,6 +4940,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "25001", "rotation": "0|0|0", @@ -4758,6 +4984,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "35001", "rotation": "0|0|0", @@ -4800,6 +5028,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44006", "rotation": "0|0|0", @@ -4842,6 +5072,8 @@ "race": 4, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "34006", "rotation": "0|0|0", @@ -4886,6 +5118,8 @@ "race": 4, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -4931,6 +5165,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -4973,6 +5209,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5015,6 +5253,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "55007", "rotation": "0|0|0", @@ -5057,6 +5297,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5099,6 +5341,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5141,6 +5385,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5185,6 +5431,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5227,6 +5475,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5271,6 +5521,8 @@ "race": 2, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "24003", "rotation": "0|0|0", @@ -5313,6 +5565,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "44005", "rotation": "0|0|0", @@ -5355,6 +5609,8 @@ "race": 1, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "15005", "rotation": "0|0|0", @@ -5397,6 +5653,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "63002", "rotation": "", @@ -5437,6 +5695,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "63003", "rotation": "", @@ -5477,6 +5737,8 @@ "race": 1, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "63004", "rotation": "", @@ -5517,6 +5779,8 @@ "race": 1, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "64003", "rotation": "", @@ -5557,6 +5821,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "74002", "rotation": "", @@ -5597,6 +5863,8 @@ "race": 2, "job": 4, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "74003", "rotation": "", @@ -5637,6 +5905,8 @@ "race": 2, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "74004", "rotation": "", @@ -5677,6 +5947,8 @@ "race": 3, "job": 1, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "83002", "rotation": "", @@ -5717,6 +5989,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "83006", "rotation": "", @@ -5757,6 +6031,8 @@ "race": 3, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "84002", "rotation": "", @@ -5797,6 +6073,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "94002", "rotation": "", @@ -5837,6 +6115,8 @@ "race": 4, "job": 3, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "94005", "rotation": "0|0|0", @@ -5879,6 +6159,8 @@ "race": 1, "job": 2, "type": 1, + "ip": 1, + "sd": 1, "handbook": -1, "prefab": "64007", "rotation": "0|0|0", diff --git a/bin/json/game_linestorychapter.json b/bin/json/game_linestorychapter.json new file mode 100644 index 000000000..55f72bd7d --- /dev/null +++ b/bin/json/game_linestorychapter.json @@ -0,0 +1,19 @@ +[ + { + "id": 1, + "stroy": 101, + "name": "line_1007", + "cond": [ + 101 + ], + "img": "", + "taskid": [ + 1001, + 1002, + 1003, + 1004, + 1005, + 1006 + ] + } +] \ No newline at end of file diff --git a/bin/json/game_linestorystagetask.json b/bin/json/game_linestorystagetask.json new file mode 100644 index 000000000..1386f77fd --- /dev/null +++ b/bin/json/game_linestorystagetask.json @@ -0,0 +1,75 @@ +[ + { + "id": 100101, + "posTId": -1, + "nextTId": 100102, + "cond": [ + 101, + 102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "jump": "heronewlist" + }, + { + "id": 100102, + "posTId": 100101, + "nextTId": 100103, + "cond": [ + 104 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "jump": "roleupgrade" + }, + { + "id": 100103, + "posTId": 100102, + "nextTId": 100104, + "cond": [ + 106 + ], + "reward": [], + "jump": "equistrengthen" + }, + { + "id": 100104, + "posTId": 100103, + "nextTId": 100105, + "cond": [ + 108 + ], + "reward": [], + "jump": "roleupgrade" + }, + { + "id": 100105, + "posTId": 100103, + "nextTId": -1, + "cond": [ + 109 + ], + "reward": [], + "jump": "roleupgrade" + } +] \ No newline at end of file diff --git a/bin/json/game_linestorytask.json b/bin/json/game_linestorytask.json new file mode 100644 index 000000000..afe8b540f --- /dev/null +++ b/bin/json/game_linestorytask.json @@ -0,0 +1,134 @@ +[ + { + "id": 1001, + "preTId": -1, + "stageTId": [ + 100101, + 100102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "finish": 0, + "ending": 1 + }, + { + "id": 1002, + "preTId": 1001, + "stageTId": [ + 100101, + 100102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "finish": 0, + "ending": 1 + }, + { + "id": 1003, + "preTId": 1002, + "stageTId": [ + 100101, + 100102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "finish": 0, + "ending": 1 + }, + { + "id": 1004, + "preTId": 1002, + "stageTId": [ + 100101, + 100102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "finish": 1, + "ending": 0 + }, + { + "id": 1005, + "preTId": 1003, + "stageTId": [ + 100101, + 100102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "finish": 0, + "ending": 1 + }, + { + "id": 1006, + "preTId": 1005, + "stageTId": [ + 100101, + 100102 + ], + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 + } + ], + "finish": 1, + "ending": 1 + } +] \ No newline at end of file diff --git a/bin/json/game_model.json b/bin/json/game_model.json index ccef68bc1..5e865f616 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -2,7 +2,8 @@ { "id": "12003", "preson": "12003", - "presonshow": "", + "presonshow": "12003", + "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25004", "img": "sbkp_js_12003", @@ -23,7 +24,8 @@ { "id": "13001", "preson": "13001", - "presonshow": "", + "presonshow": "13001", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13001", "img": "sbkp_js_24003", @@ -44,7 +46,8 @@ { "id": "13002", "preson": "13002", - "presonshow": "", + "presonshow": "13002", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13002", "img": "sbkp_js_24003", @@ -65,7 +68,8 @@ { "id": "13003", "preson": "13003", - "presonshow": "", + "presonshow": "13003", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13003", "img": "sbkp_js_24003", @@ -86,7 +90,8 @@ { "id": "13004", "preson": "13004", - "presonshow": "", + "presonshow": "13004", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13004", "img": "sbkp_js_24003", @@ -107,7 +112,8 @@ { "id": "13005", "preson": "13005", - "presonshow": "", + "presonshow": "13005", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13005", "img": "sbkp_js_24003", @@ -128,7 +134,8 @@ { "id": "14001", "preson": "14001", - "presonshow": "", + "presonshow": "14001", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14001", "img": "sbkp_js_24003", @@ -149,7 +156,8 @@ { "id": "14002", "preson": "14002", - "presonshow": "", + "presonshow": "14002", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14002", "img": "sbkp_js_24003", @@ -170,7 +178,8 @@ { "id": "14003", "preson": "14003", - "presonshow": "", + "presonshow": "14003", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14003", "img": "sbkp_js_24003", @@ -191,7 +200,8 @@ { "id": "14004", "preson": "14004", - "presonshow": "", + "presonshow": "14004", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14004", "img": "sbkp_js_24003", @@ -212,7 +222,8 @@ { "id": "14005", "preson": "14005", - "presonshow": "", + "presonshow": "14005", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14005", "img": "sbkp_js_24003", @@ -233,7 +244,8 @@ { "id": "14006", "preson": "14006", - "presonshow": "", + "presonshow": "14006", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14006", "img": "sbkp_js_24003", @@ -254,7 +266,8 @@ { "id": "14007", "preson": "14007", - "presonshow": "", + "presonshow": "14007", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14007", "img": "sbkp_js_24003", @@ -275,7 +288,8 @@ { "id": "15001", "preson": "15001", - "presonshow": "", + "presonshow": "15001", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15001", "img": "sbkp_js_24003", @@ -296,7 +310,8 @@ { "id": "15002", "preson": "15002", - "presonshow": "", + "presonshow": "15002", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15002", "img": "sbkp_js_24003", @@ -317,7 +332,8 @@ { "id": "15003", "preson": "15003", - "presonshow": "", + "presonshow": "15003", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15003", "img": "sbkp_js_24003", @@ -338,7 +354,8 @@ { "id": "15004", "preson": "15004", - "presonshow": "", + "presonshow": "15004", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15004", "img": "sbkp_js_24003", @@ -359,7 +376,8 @@ { "id": "15005", "preson": "15005", - "presonshow": "", + "presonshow": "15005", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15005", "img": "sbkp_js_24003", @@ -380,7 +398,8 @@ { "id": "23001", "preson": "23001", - "presonshow": "", + "presonshow": "23001", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23001", "img": "sbkp_js_24003", @@ -401,7 +420,8 @@ { "id": "23002", "preson": "23002", - "presonshow": "", + "presonshow": "23002", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23002", "img": "sbkp_js_24003", @@ -422,7 +442,8 @@ { "id": "23003", "preson": "23003", - "presonshow": "", + "presonshow": "23003", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23003", "img": "sbkp_js_24003", @@ -443,7 +464,8 @@ { "id": "23004", "preson": "23004", - "presonshow": "", + "presonshow": "23004", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23004", "img": "sbkp_js_24003", @@ -464,7 +486,8 @@ { "id": "24001", "preson": "24001", - "presonshow": "", + "presonshow": "24001", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_24001", "img": "sbkp_js_24003", @@ -485,7 +508,8 @@ { "id": "24002", "preson": "24002", - "presonshow": "", + "presonshow": "24002", + "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_24002", "img": "sbkp_js_24003", @@ -506,7 +530,8 @@ { "id": "24003", "preson": "24003", - "presonshow": "", + "presonshow": "24003", + "height": 1, "ico": "tx_js_24003", "fight": "ytx_js_24003", "img": "sbkp_js_24003", @@ -527,7 +552,8 @@ { "id": "24004", "preson": "24004", - "presonshow": "", + "presonshow": "24004", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24004", "img": "sbkp_js_25001", @@ -548,7 +574,8 @@ { "id": "24005", "preson": "24005", - "presonshow": "", + "presonshow": "24005", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24005", "img": "sbkp_js_25001", @@ -569,7 +596,8 @@ { "id": "24006", "preson": "24006", - "presonshow": "", + "presonshow": "24006", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24006", "img": "sbkp_js_25001", @@ -590,7 +618,8 @@ { "id": "24007", "preson": "24007", - "presonshow": "", + "presonshow": "24007", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24007", "img": "sbkp_js_25001", @@ -611,7 +640,8 @@ { "id": "24008", "preson": "24008", - "presonshow": "", + "presonshow": "24008", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24008", "img": "sbkp_js_25001", @@ -632,7 +662,8 @@ { "id": "24009", "preson": "24009", - "presonshow": "", + "presonshow": "24009", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24009", "img": "sbkp_js_25001", @@ -654,6 +685,7 @@ "id": "25001", "preson": "25001", "presonshow": "25001_exhibition", + "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_25001", "img": "sbkp_js_25001", @@ -674,7 +706,8 @@ { "id": "25002", "preson": "25002", - "presonshow": "", + "presonshow": "25002", + "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25002", "img": "sbkp_js_25004", @@ -695,7 +728,8 @@ { "id": "25003", "preson": "25003", - "presonshow": "", + "presonshow": "25003", + "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25003", "img": "sbkp_js_25004", @@ -717,6 +751,7 @@ "id": "25004", "preson": "11003", "presonshow": "25004_exhibition", + "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25004", "img": "sbkp_js_25004", @@ -737,7 +772,8 @@ { "id": "33001", "preson": "33001", - "presonshow": "", + "presonshow": "33001", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33001", "img": "sbkp_js_34006", @@ -758,7 +794,8 @@ { "id": "33002", "preson": "33002", - "presonshow": "", + "presonshow": "33002", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33002", "img": "sbkp_js_34006", @@ -779,7 +816,8 @@ { "id": "33003", "preson": "33003", - "presonshow": "", + "presonshow": "33003", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33003", "img": "sbkp_js_34006", @@ -800,7 +838,8 @@ { "id": "33004", "preson": "33004", - "presonshow": "", + "presonshow": "33004", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33004", "img": "sbkp_js_34006", @@ -821,7 +860,8 @@ { "id": "33005", "preson": "33005", - "presonshow": "", + "presonshow": "33005", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33005", "img": "sbkp_js_34006", @@ -842,7 +882,8 @@ { "id": "33006", "preson": "33006", - "presonshow": "", + "presonshow": "33006", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33006", "img": "sbkp_js_34006", @@ -863,7 +904,8 @@ { "id": "34001", "preson": "34001", - "presonshow": "", + "presonshow": "34001", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34001", "img": "sbkp_js_34006", @@ -884,7 +926,8 @@ { "id": "34002", "preson": "34002", - "presonshow": "", + "presonshow": "34002", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34002", "img": "sbkp_js_34006", @@ -905,7 +948,8 @@ { "id": "34003", "preson": "34003", - "presonshow": "", + "presonshow": "34003", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34003", "img": "sbkp_js_34006", @@ -926,7 +970,8 @@ { "id": "34004", "preson": "34004", - "presonshow": "", + "presonshow": "34004", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34004", "img": "sbkp_js_34006", @@ -947,7 +992,8 @@ { "id": "34005", "preson": "34005", - "presonshow": "", + "presonshow": "34005", + "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34005", "img": "sbkp_js_34006", @@ -968,7 +1014,8 @@ { "id": "34006", "preson": "34006", - "presonshow": "", + "presonshow": "34006", + "height": 1, "ico": "tx_js_34006", "fight": "ytx_js_34006", "img": "sbkp_js_34006", @@ -989,7 +1036,8 @@ { "id": "34007", "preson": "34007", - "presonshow": "", + "presonshow": "34007", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_34007", "img": "sbkp_js_35002", @@ -1010,7 +1058,8 @@ { "id": "34008", "preson": "34008", - "presonshow": "", + "presonshow": "34008", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_34008", "img": "sbkp_js_35002", @@ -1032,6 +1081,7 @@ "id": "35001", "preson": "35001", "presonshow": "35001", + "height": 1, "ico": "tx_js_35001", "fight": "ytx_js_35001", "img": "sbkp_js_35001", @@ -1052,7 +1102,8 @@ { "id": "35002", "preson": "35002", - "presonshow": "", + "presonshow": "35002", + "height": 1, "ico": "tx_js_35002", "fight": "ytx_js_35002", "img": "sbkp_js_35002", @@ -1073,7 +1124,8 @@ { "id": "35003", "preson": "35003", - "presonshow": "", + "presonshow": "35003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35003", "img": "sbkp_js_35002", @@ -1094,7 +1146,8 @@ { "id": "35004", "preson": "35004", - "presonshow": "", + "presonshow": "35004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35004", "img": "sbkp_js_35002", @@ -1115,7 +1168,8 @@ { "id": "35005", "preson": "35005", - "presonshow": "", + "presonshow": "35005", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35005", "img": "sbkp_js_35002", @@ -1136,7 +1190,8 @@ { "id": "35006", "preson": "35006", - "presonshow": "", + "presonshow": "35006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35006", "img": "sbkp_js_35002", @@ -1157,7 +1212,8 @@ { "id": "43001", "preson": "43001", - "presonshow": "", + "presonshow": "43001", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43001", "img": "sbkp_js_35002", @@ -1178,7 +1234,8 @@ { "id": "43002", "preson": "43002", - "presonshow": "", + "presonshow": "43002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43002", "img": "sbkp_js_35002", @@ -1199,7 +1256,8 @@ { "id": "43003", "preson": "43003", - "presonshow": "", + "presonshow": "43003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43003", "img": "sbkp_js_35002", @@ -1220,7 +1278,8 @@ { "id": "43004", "preson": "43004", - "presonshow": "", + "presonshow": "43004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43004", "img": "sbkp_js_35002", @@ -1241,7 +1300,8 @@ { "id": "43005", "preson": "43005", - "presonshow": "", + "presonshow": "43005", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43005", "img": "sbkp_js_35002", @@ -1262,7 +1322,8 @@ { "id": "43006", "preson": "43006", - "presonshow": "", + "presonshow": "43006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43006", "img": "sbkp_js_35002", @@ -1283,7 +1344,8 @@ { "id": "43007", "preson": "43007", - "presonshow": "", + "presonshow": "43007", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43007", "img": "sbkp_js_35002", @@ -1304,7 +1366,8 @@ { "id": "44001", "preson": "44001", - "presonshow": "", + "presonshow": "44001", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44001", "img": "sbkp_js_35002", @@ -1325,7 +1388,8 @@ { "id": "44002", "preson": "44002", - "presonshow": "", + "presonshow": "44002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44002", "img": "sbkp_js_35002", @@ -1346,7 +1410,8 @@ { "id": "44003", "preson": "44003", - "presonshow": "", + "presonshow": "44003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44003", "img": "sbkp_js_35002", @@ -1367,7 +1432,8 @@ { "id": "44004", "preson": "44004", - "presonshow": "", + "presonshow": "44004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44004", "img": "sbkp_js_35002", @@ -1389,6 +1455,7 @@ "id": "44005", "preson": "44005", "presonshow": "44005", + "height": 1, "ico": "tx_js_44005", "fight": "ytx_js_44005", "img": "sbkp_js_44005", @@ -1410,6 +1477,7 @@ "id": "44006", "preson": "44006", "presonshow": "44006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44006", "img": "sbkp_js_35002", @@ -1430,7 +1498,8 @@ { "id": "45001", "preson": "45001", - "presonshow": "", + "presonshow": "45001", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_45001", "img": "sbkp_js_35002", @@ -1451,7 +1520,8 @@ { "id": "45002", "preson": "45002", - "presonshow": "", + "presonshow": "45002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_45002", "img": "sbkp_js_35002", @@ -1472,7 +1542,8 @@ { "id": "45003", "preson": "45003", - "presonshow": "", + "presonshow": "45003", + "height": 1, "ico": "tx_hhjs_45003", "fight": "ytx_js_45003", "img": "sbkp_js_45003", @@ -1493,7 +1564,8 @@ { "id": "45004", "preson": "45004", - "presonshow": "", + "presonshow": "45004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_45004", "img": "sbkp_js_35002", @@ -1514,7 +1586,8 @@ { "id": "43901", "preson": "43901", - "presonshow": "", + "presonshow": "43901", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43901", "img": "sbkp_js_35002", @@ -1535,7 +1608,8 @@ { "id": "42911", "preson": "42911", - "presonshow": "", + "presonshow": "42911", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_42911", "img": "sbkp_js_35002", @@ -1556,7 +1630,8 @@ { "id": "43911", "preson": "43911", - "presonshow": "", + "presonshow": "43911", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43911", "img": "sbkp_js_35002", @@ -1577,7 +1652,8 @@ { "id": "44911", "preson": "44911", - "presonshow": "", + "presonshow": "44911", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44911", "img": "sbkp_js_35002", @@ -1598,7 +1674,8 @@ { "id": "43921", "preson": "43921", - "presonshow": "", + "presonshow": "43921", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35002", "img": "sbkp_js_35002", @@ -1619,7 +1696,8 @@ { "id": "44921", "preson": "44921", - "presonshow": "", + "presonshow": "44921", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35002", "img": "sbkp_js_35002", @@ -1640,7 +1718,8 @@ { "id": "45921", "preson": "45921", - "presonshow": "", + "presonshow": "45921", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35002", "img": "sbkp_js_35002", @@ -1661,7 +1740,8 @@ { "id": "51001", "preson": "51001", - "presonshow": "", + "presonshow": "51001", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51001", "img": "sbkp_js_35002", @@ -1682,7 +1762,8 @@ { "id": "51002", "preson": "51002", - "presonshow": "", + "presonshow": "51002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51002", "img": "sbkp_js_35002", @@ -1703,7 +1784,8 @@ { "id": "51003", "preson": "51003", - "presonshow": "", + "presonshow": "51003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51003", "img": "sbkp_js_35002", @@ -1724,7 +1806,8 @@ { "id": "51004", "preson": "51004", - "presonshow": "", + "presonshow": "51004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51004", "img": "sbkp_js_35002", @@ -1745,7 +1828,8 @@ { "id": "51005", "preson": "51005", - "presonshow": "", + "presonshow": "51005", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51005", "img": "sbkp_js_35002", @@ -1766,7 +1850,8 @@ { "id": "51006", "preson": "51006", - "presonshow": "", + "presonshow": "51006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51006", "img": "sbkp_js_35002", @@ -1787,7 +1872,8 @@ { "id": "51007", "preson": "51007", - "presonshow": "", + "presonshow": "51007", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51007", "img": "sbkp_js_35002", @@ -1808,7 +1894,8 @@ { "id": "51008", "preson": "51008", - "presonshow": "", + "presonshow": "51008", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51008", "img": "sbkp_js_35002", @@ -1829,7 +1916,8 @@ { "id": "51009", "preson": "51009", - "presonshow": "", + "presonshow": "51009", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51009", "img": "sbkp_js_35002", @@ -1850,7 +1938,8 @@ { "id": "51010", "preson": "51010", - "presonshow": "", + "presonshow": "51010", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51010", "img": "sbkp_js_35002", @@ -1871,7 +1960,8 @@ { "id": "51011", "preson": "51011", - "presonshow": "", + "presonshow": "51011", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51011", "img": "sbkp_js_35002", @@ -1892,7 +1982,8 @@ { "id": "51012", "preson": "51012", - "presonshow": "", + "presonshow": "51012", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51012", "img": "sbkp_js_35002", @@ -1913,7 +2004,8 @@ { "id": "51013", "preson": "51013", - "presonshow": "", + "presonshow": "51013", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51013", "img": "sbkp_js_35002", @@ -1934,7 +2026,8 @@ { "id": "51014", "preson": "51014", - "presonshow": "", + "presonshow": "51014", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51014", "img": "sbkp_js_35002", @@ -1955,7 +2048,8 @@ { "id": "53001", "preson": "53001", - "presonshow": "", + "presonshow": "53001", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53001", "img": "sbkp_js_35002", @@ -1976,7 +2070,8 @@ { "id": "53002", "preson": "53002", - "presonshow": "", + "presonshow": "53002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53002", "img": "sbkp_js_35002", @@ -1997,7 +2092,8 @@ { "id": "53003", "preson": "53003", - "presonshow": "", + "presonshow": "53003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53003", "img": "sbkp_js_35002", @@ -2018,7 +2114,8 @@ { "id": "53004", "preson": "53004", - "presonshow": "", + "presonshow": "53004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53004", "img": "sbkp_js_35002", @@ -2039,7 +2136,8 @@ { "id": "53005", "preson": "53005", - "presonshow": "", + "presonshow": "53005", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53005", "img": "sbkp_js_35002", @@ -2060,7 +2158,8 @@ { "id": "53006", "preson": "53006", - "presonshow": "", + "presonshow": "53006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53006", "img": "sbkp_js_35002", @@ -2081,7 +2180,8 @@ { "id": "55001", "preson": "55001", - "presonshow": "", + "presonshow": "55001", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55001", "img": "sbkp_js_35002", @@ -2102,7 +2202,8 @@ { "id": "55002", "preson": "55002", - "presonshow": "", + "presonshow": "55002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55002", "img": "sbkp_js_35002", @@ -2123,7 +2224,8 @@ { "id": "55003", "preson": "55002", - "presonshow": "", + "presonshow": "55002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55003", "img": "sbkp_js_35002", @@ -2144,7 +2246,8 @@ { "id": "55004", "preson": "55004", - "presonshow": "", + "presonshow": "55004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55004", "img": "sbkp_js_35002", @@ -2165,7 +2268,8 @@ { "id": "55005", "preson": "55004", - "presonshow": "", + "presonshow": "55004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55005", "img": "sbkp_js_35002", @@ -2186,7 +2290,8 @@ { "id": "55006", "preson": "55006", - "presonshow": "", + "presonshow": "55006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55006", "img": "sbkp_js_35002", @@ -2207,7 +2312,8 @@ { "id": "55007", "preson": "55007", - "presonshow": "", + "presonshow": "55007", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55007", "img": "sbkp_js_35002", @@ -2228,7 +2334,8 @@ { "id": "63002", "preson": "63002", - "presonshow": "", + "presonshow": "63002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_63002", "img": "sbkp_js_35002", @@ -2249,7 +2356,8 @@ { "id": "63003", "preson": "63003", - "presonshow": "", + "presonshow": "63003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_63003", "img": "sbkp_js_35002", @@ -2270,7 +2378,8 @@ { "id": "63004", "preson": "63004", - "presonshow": "", + "presonshow": "63004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_63004", "img": "sbkp_js_35002", @@ -2291,7 +2400,8 @@ { "id": "64003", "preson": "64003", - "presonshow": "", + "presonshow": "64003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_64003", "img": "sbkp_js_35002", @@ -2312,7 +2422,8 @@ { "id": "74002", "preson": "74002", - "presonshow": "", + "presonshow": "74002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_74002", "img": "sbkp_js_35002", @@ -2333,7 +2444,8 @@ { "id": "74003", "preson": "74003", - "presonshow": "", + "presonshow": "74003", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_74003", "img": "sbkp_js_35002", @@ -2354,7 +2466,8 @@ { "id": "74004", "preson": "74004", - "presonshow": "", + "presonshow": "74004", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_74004", "img": "sbkp_js_35002", @@ -2375,7 +2488,8 @@ { "id": "83002", "preson": "83002", - "presonshow": "", + "presonshow": "83002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_83002", "img": "sbkp_js_35002", @@ -2396,7 +2510,8 @@ { "id": "83006", "preson": "83006", - "presonshow": "", + "presonshow": "83006", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_83006", "img": "sbkp_js_35002", @@ -2417,7 +2532,8 @@ { "id": "84002", "preson": "84002", - "presonshow": "", + "presonshow": "84002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_84002", "img": "sbkp_js_35002", @@ -2438,7 +2554,8 @@ { "id": "94002", "preson": "94002", - "presonshow": "", + "presonshow": "94002", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_94002", "img": "sbkp_js_35002", @@ -2459,7 +2576,8 @@ { "id": "94005", "preson": "94005", - "presonshow": "", + "presonshow": "94005", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_94005", "img": "sbkp_js_35002", @@ -2480,7 +2598,8 @@ { "id": "64007", "preson": "64007", - "presonshow": "", + "presonshow": "64007", + "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_64007", "img": "sbkp_js_35002", diff --git a/bin/json/game_monster.json b/bin/json/game_monster.json index 96c17adcd..34b6d8a4c 100644 --- a/bin/json/game_monster.json +++ b/bin/json/game_monster.json @@ -7,7 +7,9 @@ "text": "阿宝" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250012, @@ -17,7 +19,9 @@ "text": "阿宝" }, "star": 2, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250013, @@ -27,7 +31,9 @@ "text": "阿宝" }, "star": 3, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250014, @@ -37,7 +43,9 @@ "text": "阿宝" }, "star": 4, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250015, @@ -47,7 +55,9 @@ "text": "阿宝" }, "star": 5, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 340061, @@ -57,7 +67,9 @@ "text": "冰霜杰克" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 340062, @@ -67,7 +79,9 @@ "text": "冰霜杰克" }, "star": 2, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 340063, @@ -77,7 +91,9 @@ "text": "冰霜杰克" }, "star": 3, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 340064, @@ -87,7 +103,9 @@ "text": "冰霜杰克" }, "star": 4, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 340065, @@ -97,7 +115,9 @@ "text": "冰霜杰克" }, "star": 5, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 440051, @@ -107,7 +127,9 @@ "text": "小伊" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 440052, @@ -117,7 +139,9 @@ "text": "小伊" }, "star": 2, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 440053, @@ -127,7 +151,9 @@ "text": "小伊" }, "star": 3, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 440054, @@ -137,7 +163,9 @@ "text": "小伊" }, "star": 4, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 440055, @@ -147,7 +175,9 @@ "text": "小伊" }, "star": 5, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 240031, @@ -157,7 +187,9 @@ "text": "睡神沙人" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 240032, @@ -167,7 +199,9 @@ "text": "睡神沙人" }, "star": 2, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 240033, @@ -177,7 +211,9 @@ "text": "睡神沙人" }, "star": 3, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 240034, @@ -187,7 +223,9 @@ "text": "睡神沙人" }, "star": 4, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 240035, @@ -197,7 +235,9 @@ "text": "睡神沙人" }, "star": 5, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350021, @@ -207,7 +247,9 @@ "text": "希卡普" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350022, @@ -217,7 +259,9 @@ "text": "希卡普" }, "star": 2, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350023, @@ -227,7 +271,9 @@ "text": "希卡普" }, "star": 3, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350024, @@ -237,7 +283,9 @@ "text": "希卡普" }, "star": 4, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350025, @@ -247,7 +295,9 @@ "text": "希卡普" }, "star": 5, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350011, @@ -257,7 +307,9 @@ "text": "师父" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350012, @@ -267,7 +319,9 @@ "text": "师父" }, "star": 2, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350013, @@ -277,7 +331,9 @@ "text": "师父" }, "star": 3, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350014, @@ -287,7 +343,9 @@ "text": "师父" }, "star": 4, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 350015, @@ -297,7 +355,9 @@ "text": "师父" }, "star": 5, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250041, @@ -307,7 +367,9 @@ "text": "波比" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250042, @@ -317,7 +379,9 @@ "text": "波比" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250043, @@ -327,7 +391,9 @@ "text": "波比" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250044, @@ -337,7 +403,9 @@ "text": "波比" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] }, { "monster_id": 250045, @@ -347,6 +415,8 @@ "text": "波比" }, "star": 1, - "equip": "10001|10002|10003|10004" + "equip": [ + 1 + ] } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 782d66e22..eef8c728a 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6,8 +6,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001321, 1000, @@ -26,8 +26,8 @@ "Where": [], "Order": [], "Limit": 1, + "ExecuteCnt": 2, "Type": 1, - "ExecuteCnt": 3, "Argu": [ 1, 4, @@ -47,8 +47,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -67,8 +67,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -88,8 +88,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -108,8 +108,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -129,8 +129,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -149,8 +149,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -170,8 +170,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -190,8 +190,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -211,8 +211,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -231,8 +231,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -252,8 +252,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -272,8 +272,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -292,8 +292,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 8, "ExecuteCnt": 1, + "Type": 8, "Argu": [], "FollowSK": [], "SucFollowSK": [], @@ -307,12 +307,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001001, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -326,12 +327,13 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001207, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -345,12 +347,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001208, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -364,8 +367,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425004311, 2, @@ -383,8 +386,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 2, 1, @@ -402,8 +405,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -422,12 +425,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001326, 1000, - 1 + 1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -441,8 +445,8 @@ "Where": [], "Order": [], "Limit": 1, + "ExecuteCnt": 2, "Type": 1, - "ExecuteCnt": 1, "Argu": [ 1, 4, @@ -450,7 +454,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002113" + 235002113 ], "FailFollowSK": [], "MustHit": false @@ -462,8 +466,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -471,7 +475,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002113" + 235002113 ], "FailFollowSK": [], "MustHit": false @@ -483,15 +487,15 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 9, "ExecuteCnt": 1, + "Type": 9, "Argu": [ 1, 1 ], "FollowSK": [], "SucFollowSK": [ - "235002114" + 235002114 ], "FailFollowSK": [], "MustHit": false @@ -503,11 +507,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 500, + 1, 1 ], "FollowSK": [], @@ -522,8 +527,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -531,7 +536,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002124" + 235002124 ], "FailFollowSK": [], "MustHit": false @@ -543,11 +548,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 500, + 1, 1 ], "FollowSK": [], @@ -562,8 +568,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -571,7 +577,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002134" + 235002134 ], "FailFollowSK": [], "MustHit": false @@ -583,11 +589,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 600, + 1, 1 ], "FollowSK": [], @@ -602,8 +609,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -611,7 +618,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002144" + 235002144 ], "FailFollowSK": [], "MustHit": false @@ -623,11 +630,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 600, + 1, 1 ], "FollowSK": [], @@ -642,8 +650,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -651,7 +659,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002154" + 235002154 ], "FailFollowSK": [], "MustHit": false @@ -663,11 +671,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 700, + 1, 1 ], "FollowSK": [], @@ -682,8 +691,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -691,7 +700,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002164" + 235002164 ], "FailFollowSK": [], "MustHit": false @@ -703,11 +712,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 700, + 1, 1 ], "FollowSK": [], @@ -722,11 +732,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001114, 1000, + 1, 1 ], "FollowSK": [], @@ -741,8 +752,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 435002211, -1, @@ -760,8 +771,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 10, "ExecuteCnt": 1, + "Type": 10, "Argu": [ 300 ], @@ -777,8 +788,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 0, @@ -797,11 +808,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001108, 1000, + 1, 1 ], "FollowSK": [], @@ -816,8 +828,8 @@ "Where": [], "Order": [], "Limit": 10, + "ExecuteCnt": 8, "Type": 1, - "ExecuteCnt": 3, "Argu": [ 1, 4, @@ -825,7 +837,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002312" + 235002312 ], "FailFollowSK": [], "MustHit": false @@ -837,17 +849,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 0, 1, - 1000 + 800 ], "FollowSK": [], "SucFollowSK": [ - "235002313" + 235002313 ], "FailFollowSK": [], "MustHit": false @@ -859,12 +871,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001102, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -878,8 +891,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -887,7 +900,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002322" + 235002322 ], "FailFollowSK": [], "MustHit": false @@ -899,17 +912,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 800 ], "FollowSK": [], "SucFollowSK": [ - "235002313" + 235002313 ], "FailFollowSK": [], "MustHit": false @@ -921,8 +934,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -930,7 +943,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002332" + 235002332 ], "FailFollowSK": [], "MustHit": false @@ -942,17 +955,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 900 ], "FollowSK": [], "SucFollowSK": [ - "235002313" + 235002313 ], "FailFollowSK": [], "MustHit": false @@ -964,8 +977,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -973,7 +986,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002342" + 235002342 ], "FailFollowSK": [], "MustHit": false @@ -985,17 +998,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 900 ], "FollowSK": [], "SucFollowSK": [ - "235002313" + 235002313 ], "FailFollowSK": [], "MustHit": false @@ -1007,8 +1020,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -1016,7 +1029,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "235002352" + 235002352 ], "FailFollowSK": [], "MustHit": false @@ -1028,17 +1041,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, - 0, + 1, 1, 1000 ], "FollowSK": [], "SucFollowSK": [ - "235002313" + 235002313 ], "FailFollowSK": [], "MustHit": false @@ -1050,8 +1063,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -1059,8 +1072,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "935002312", - "935002314" + 935002312, + 935002314 ], "FailFollowSK": [], "MustHit": false @@ -1072,17 +1085,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 800 ], "FollowSK": [], "SucFollowSK": [ - "935002313" + 935002313 ], "FailFollowSK": [], "MustHit": false @@ -1094,11 +1107,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001102, 1000, + 1, 1 ], "FollowSK": [], @@ -1113,8 +1127,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 6, "ExecuteCnt": 1, + "Type": 6, "Argu": [ 1, 1, @@ -1132,8 +1146,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -1141,8 +1155,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "935002322", - "935002314" + 935002322, + 935002314 ], "FailFollowSK": [], "MustHit": false @@ -1154,17 +1168,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 800 ], "FollowSK": [], "SucFollowSK": [ - "935002313" + 935002313 ], "FailFollowSK": [], "MustHit": false @@ -1176,8 +1190,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -1185,8 +1199,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "935002332", - "935002314" + 935002332, + 935002314 ], "FailFollowSK": [], "MustHit": false @@ -1198,17 +1212,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 900 ], "FollowSK": [], "SucFollowSK": [ - "935002313" + 935002313 ], "FailFollowSK": [], "MustHit": false @@ -1220,8 +1234,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -1229,8 +1243,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "935002342", - "935002314" + 935002342, + 935002314 ], "FailFollowSK": [], "MustHit": false @@ -1242,17 +1256,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ - 0, 0, 1, - 1000 + 1, + 900 ], "FollowSK": [], "SucFollowSK": [ - "935002313" + 935002313 ], "FailFollowSK": [], "MustHit": false @@ -1264,8 +1278,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 3, + "Type": 1, "Argu": [ 1, 4, @@ -1273,8 +1287,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "935002352", - "935002314" + 935002352, + 935002314 ], "FailFollowSK": [], "MustHit": false @@ -1286,17 +1300,17 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, - 0, + 1, 1, 1000 ], "FollowSK": [], "SucFollowSK": [ - "935002313" + 935002313 ], "FailFollowSK": [], "MustHit": false @@ -1308,11 +1322,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001322, 1000, + 1, 1 ], "FollowSK": [], @@ -1327,8 +1342,8 @@ "Where": [], "Order": [], "Limit": 1, + "ExecuteCnt": 3, "Type": 1, - "ExecuteCnt": 1, "Argu": [ 1, 4, @@ -1336,7 +1351,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224003112" + 224003112 ], "FailFollowSK": [], "MustHit": false @@ -1348,11 +1363,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 500, + 1, 1 ], "FollowSK": [], @@ -1367,8 +1383,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -1376,7 +1392,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224003112" + 224003112 ], "FailFollowSK": [], "MustHit": false @@ -1388,11 +1404,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 500, + 1, 1 ], "FollowSK": [], @@ -1407,8 +1424,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -1416,7 +1433,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224003112" + 224003112 ], "FailFollowSK": [], "MustHit": false @@ -1428,11 +1445,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 600, + 1, 1 ], "FollowSK": [], @@ -1447,8 +1465,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -1456,7 +1474,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224003112" + 224003112 ], "FailFollowSK": [], "MustHit": false @@ -1468,11 +1486,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 600, + 1, 1 ], "FollowSK": [], @@ -1487,8 +1506,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -1496,7 +1515,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224003112" + 224003112 ], "FailFollowSK": [], "MustHit": false @@ -1508,11 +1527,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 700, + 1, 1 ], "FollowSK": [], @@ -1527,8 +1547,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -1547,12 +1567,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001003, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -1566,8 +1587,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -1586,12 +1607,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001003, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -1605,12 +1627,13 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001002, 1000, - 1 + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -1624,8 +1647,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -1643,10 +1666,11 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ - -200 + -200, + 1 ], "FollowSK": [], "SucFollowSK": [], @@ -1660,11 +1684,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 800, + 1, 1 ], "FollowSK": [], @@ -1679,10 +1704,11 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ - -250 + -250, + 1 ], "FollowSK": [], "SucFollowSK": [], @@ -1696,11 +1722,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 800, + 1, 1 ], "FollowSK": [], @@ -1715,8 +1742,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -250 ], @@ -1732,11 +1759,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 900, + 1, 1 ], "FollowSK": [], @@ -1751,8 +1779,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -1768,11 +1796,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 900, + 1, 1 ], "FollowSK": [], @@ -1787,8 +1816,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -1804,11 +1833,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001118, 1000, + 1, 1 ], "FollowSK": [], @@ -1823,11 +1853,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001314, 1000, + 1, 1 ], "FollowSK": [], @@ -1842,8 +1873,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -1851,7 +1882,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006112" + 234006112 ], "FailFollowSK": [], "MustHit": false @@ -1863,11 +1894,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 600, + 1, 1 ], "FollowSK": [], @@ -1882,8 +1914,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -1891,7 +1923,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006122" + 234006122 ], "FailFollowSK": [], "MustHit": false @@ -1903,11 +1935,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 600, + 1, 1 ], "FollowSK": [], @@ -1922,8 +1955,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -1931,7 +1964,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006132" + 234006132 ], "FailFollowSK": [], "MustHit": false @@ -1943,11 +1976,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 700, + 1, 1 ], "FollowSK": [], @@ -1962,8 +1996,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -1971,7 +2005,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006142" + 234006142 ], "FailFollowSK": [], "MustHit": false @@ -1983,11 +2017,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 700, + 1, 1 ], "FollowSK": [], @@ -2002,8 +2037,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -2011,7 +2046,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006152" + 234006152 ], "FailFollowSK": [], "MustHit": false @@ -2023,11 +2058,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 800, + 1, 1 ], "FollowSK": [], @@ -2042,8 +2078,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2051,7 +2087,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006212" + 234006212 ], "FailFollowSK": [], "MustHit": false @@ -2063,8 +2099,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2080,8 +2116,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2089,7 +2125,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006212" + 234006212 ], "FailFollowSK": [], "MustHit": false @@ -2101,8 +2137,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2118,8 +2154,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2127,7 +2163,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006212" + 234006212 ], "FailFollowSK": [], "MustHit": false @@ -2139,8 +2175,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2156,8 +2192,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2165,7 +2201,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006212" + 234006212 ], "FailFollowSK": [], "MustHit": false @@ -2177,8 +2213,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2194,8 +2230,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2203,7 +2239,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006312" + 234006312 ], "FailFollowSK": [], "MustHit": false @@ -2215,11 +2251,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 900, + 1, 1 ], "FollowSK": [], @@ -2234,11 +2271,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001106, 900, + 1, 1 ], "FollowSK": [], @@ -2253,8 +2291,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2262,8 +2300,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006322", - "234006323" + 234006322, + 234006323 ], "FailFollowSK": [], "MustHit": false @@ -2275,11 +2313,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 900, + 1, 1 ], "FollowSK": [], @@ -2294,11 +2333,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001106, 900, + 1, 1 ], "FollowSK": [], @@ -2313,8 +2353,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2322,8 +2362,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006332", - "234006333" + 234006332, + 234006333 ], "FailFollowSK": [], "MustHit": false @@ -2335,11 +2375,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 1000, + 1, 1 ], "FollowSK": [], @@ -2354,11 +2395,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001106, 1000, + 1, 1 ], "FollowSK": [], @@ -2373,8 +2415,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2382,8 +2424,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "234006342", - "234006343" + 234006342, + 234006343 ], "FailFollowSK": [], "MustHit": false @@ -2395,11 +2437,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001008, 1000, + 1, 1 ], "FollowSK": [], @@ -2414,11 +2457,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001106, 1000, + 1, 1 ], "FollowSK": [], @@ -2433,8 +2477,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2442,8 +2486,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "934006212", - "934006213" + 934006212, + 934006213 ], "FailFollowSK": [], "MustHit": false @@ -2455,8 +2499,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2472,8 +2516,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 434006211, -1, @@ -2491,8 +2535,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2508,8 +2552,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2517,8 +2561,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "934006212", - "934006213" + 934006212, + 934006213 ], "FailFollowSK": [], "MustHit": false @@ -2530,8 +2574,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2547,8 +2591,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2556,8 +2600,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "934006212", - "934006213" + 934006212, + 934006213 ], "FailFollowSK": [], "MustHit": false @@ -2569,8 +2613,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2586,8 +2630,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -2595,8 +2639,8 @@ ], "FollowSK": [], "SucFollowSK": [ - "934006212", - "934006213" + 934006212, + 934006213 ], "FailFollowSK": [], "MustHit": false @@ -2608,8 +2652,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ -300 ], @@ -2625,11 +2669,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001323, 1000, + 1, 1 ], "FollowSK": [], @@ -2644,18 +2689,19 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 300, + 1, 5, 500 ], "FollowSK": [], "SucFollowSK": [ - "225001112" + 225001112 ], "FailFollowSK": [], "MustHit": false @@ -2667,11 +2713,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001006, 500, + 1, 1 ], "FollowSK": [], @@ -2686,18 +2733,19 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 300, + 1, 5, 600 ], "FollowSK": [], "SucFollowSK": [ - "225001122" + 225001122 ], "FailFollowSK": [], "MustHit": false @@ -2709,11 +2757,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001006, 500, + 1, 1 ], "FollowSK": [], @@ -2728,18 +2777,19 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 300, + 1, 5, 600 ], "FollowSK": [], "SucFollowSK": [ - "225001132" + 225001132 ], "FailFollowSK": [], "MustHit": false @@ -2751,11 +2801,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001006, 600, + 1, 1 ], "FollowSK": [], @@ -2770,18 +2821,19 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 300, + 1, 5, 700 ], "FollowSK": [], "SucFollowSK": [ - "225001142" + 225001142 ], "FailFollowSK": [], "MustHit": false @@ -2793,11 +2845,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001006, 600, + 1, 1 ], "FollowSK": [], @@ -2812,18 +2865,19 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 300, + 1, 5, 700 ], "FollowSK": [], "SucFollowSK": [ - "225001152" + 225001152 ], "FailFollowSK": [], "MustHit": false @@ -2835,11 +2889,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001006, 750, + 1, 1 ], "FollowSK": [], @@ -2854,8 +2909,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001211, -1, @@ -2873,11 +2928,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001209, 1000, + 1, 1 ], "FollowSK": [], @@ -2892,8 +2948,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001212, -1, @@ -2911,11 +2967,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001210, 1000, + 1, 1 ], "FollowSK": [], @@ -2930,8 +2987,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001213, -1, @@ -2949,8 +3006,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 5, @@ -2968,8 +3025,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001221, -1, @@ -2987,11 +3044,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001209, 1000, + 1, 1 ], "FollowSK": [], @@ -3006,8 +3064,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001222, -1, @@ -3025,11 +3083,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001210, 1000, + 1, 1 ], "FollowSK": [], @@ -3044,8 +3103,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001223, -1, @@ -3063,8 +3122,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 5, @@ -3082,8 +3141,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001231, -1, @@ -3101,11 +3160,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001209, 1000, + 1, 1 ], "FollowSK": [], @@ -3120,8 +3180,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001232, -1, @@ -3139,11 +3199,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001210, 1000, + 1, 1 ], "FollowSK": [], @@ -3158,8 +3219,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001233, -1, @@ -3177,8 +3238,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 5, @@ -3196,8 +3257,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001241, -1, @@ -3215,11 +3276,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001209, 1000, + 1, 1 ], "FollowSK": [], @@ -3234,8 +3296,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001242, -1, @@ -3253,11 +3315,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001210, 1000, + 1, 1 ], "FollowSK": [], @@ -3272,8 +3335,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001243, -1, @@ -3291,8 +3354,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 5, @@ -3310,8 +3373,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001251, -1, @@ -3329,11 +3392,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001209, 1000, + 1, 1 ], "FollowSK": [], @@ -3348,8 +3412,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001252, -1, @@ -3367,11 +3431,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001210, 1000, + 1, 1 ], "FollowSK": [], @@ -3386,8 +3451,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 425001253, -1, @@ -3405,8 +3470,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 5, @@ -3424,12 +3489,13 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 800, + 1, 5, 1000 ], @@ -3445,11 +3511,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001002, 1000, + 1, 1 ], "FollowSK": [], @@ -3464,11 +3531,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, + 1, 1 ], "FollowSK": [], @@ -3483,12 +3551,13 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 800, + 1, 5, 1100 ], @@ -3504,12 +3573,13 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 800, + 1, 5, 1200 ], @@ -3525,12 +3595,13 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, 800, + 1, 5, 1400 ], @@ -3546,11 +3617,12 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001302, 1000, + 1, 1 ], "FollowSK": [], @@ -3565,8 +3637,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -3574,7 +3646,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005112" + 244005112 ], "FailFollowSK": [], "MustHit": false @@ -3586,8 +3658,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 12, "ExecuteCnt": 1, + "Type": 12, "Argu": [ 150 ], @@ -3603,8 +3675,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -3612,7 +3684,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005122" + 244005122 ], "FailFollowSK": [], "MustHit": false @@ -3624,8 +3696,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 12, "ExecuteCnt": 1, + "Type": 12, "Argu": [ 150 ], @@ -3641,8 +3713,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -3650,7 +3722,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005132" + 244005132 ], "FailFollowSK": [], "MustHit": false @@ -3662,8 +3734,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 12, "ExecuteCnt": 1, + "Type": 12, "Argu": [ 150 ], @@ -3679,8 +3751,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -3688,7 +3760,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005142" + 244005142 ], "FailFollowSK": [], "MustHit": false @@ -3700,8 +3772,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 12, "ExecuteCnt": 1, + "Type": 12, "Argu": [ 150 ], @@ -3717,8 +3789,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 2, + "Type": 1, "Argu": [ 1, 4, @@ -3726,7 +3798,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005152" + 244005152 ], "FailFollowSK": [], "MustHit": false @@ -3738,8 +3810,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 12, "ExecuteCnt": 1, + "Type": 12, "Argu": [ 150 ], @@ -3755,8 +3827,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 4, + "Type": 1, "Argu": [ 1, 4, @@ -3764,7 +3836,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005212" + 244005212 ], "FailFollowSK": [], "MustHit": false @@ -3776,11 +3848,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 300, + 1, 1 ], "FollowSK": [], @@ -3795,8 +3868,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 4, + "Type": 1, "Argu": [ 1, 4, @@ -3804,7 +3877,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005222" + 244005222 ], "FailFollowSK": [], "MustHit": false @@ -3816,11 +3889,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 300, + 1, 1 ], "FollowSK": [], @@ -3835,8 +3909,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 4, + "Type": 1, "Argu": [ 1, 4, @@ -3844,7 +3918,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005232" + 244005232 ], "FailFollowSK": [], "MustHit": false @@ -3856,11 +3930,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 400, + 1, 1 ], "FollowSK": [], @@ -3875,8 +3950,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 4, + "Type": 1, "Argu": [ 1, 4, @@ -3884,7 +3959,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "244005242" + 244005242 ], "FailFollowSK": [], "MustHit": false @@ -3896,11 +3971,12 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001105, 400, + 1, 1 ], "FollowSK": [], @@ -3915,8 +3991,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -3934,11 +4010,11 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, - 1, + 0, 1, 750 ], @@ -3954,8 +4030,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444005311, 0, @@ -3973,8 +4049,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ 50 ], @@ -3990,8 +4066,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4009,11 +4085,11 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, - 1, + 0, 1, 750 ], @@ -4029,8 +4105,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4048,11 +4124,11 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, - 1, + 0, 1, 1000 ], @@ -4068,8 +4144,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4087,8 +4163,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -4107,8 +4183,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 1, -1, @@ -4129,8 +4205,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001302, 1000, @@ -4149,8 +4225,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 15, "ExecuteCnt": 1, + "Type": 15, "Argu": [ 390001119, 300, @@ -4171,8 +4247,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4180,9 +4256,9 @@ ], "FollowSK": [], "SucFollowSK": [ - "235001114", - "235001115", - "235001116" + 235001114, + 235001115, + 235001116 ], "FailFollowSK": [], "MustHit": false @@ -4196,8 +4272,8 @@ "Rand" ], "Limit": 2, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4205,9 +4281,9 @@ ], "FollowSK": [], "SucFollowSK": [ - "235001114", - "235001115", - "235001116" + 235001114, + 235001115, + 235001116 ], "FailFollowSK": [], "MustHit": false @@ -4223,8 +4299,8 @@ ], "Order": [], "Limit": 2, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001107, 1000, @@ -4247,8 +4323,8 @@ ], "Order": [], "Limit": 2, - "Type": 14, "ExecuteCnt": 1, + "Type": 14, "Argu": [ 2, 1, @@ -4273,8 +4349,8 @@ ], "Order": [], "Limit": 2, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001002, 400, @@ -4293,8 +4369,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4314,8 +4390,8 @@ "Rand" ], "Limit": 2, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4333,8 +4409,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4354,8 +4430,8 @@ "Rand" ], "Limit": 2, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4373,8 +4449,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4394,8 +4470,8 @@ "Rand" ], "Limit": 2, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4413,8 +4489,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4434,8 +4510,8 @@ "Rand" ], "Limit": 2, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4453,8 +4529,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4474,8 +4550,8 @@ "Rand" ], "Limit": 2, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4493,8 +4569,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4512,8 +4588,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001122, 1000, @@ -4532,8 +4608,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4551,8 +4627,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4570,8 +4646,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4589,8 +4665,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001119, 1000, @@ -4609,8 +4685,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001120, 1000, @@ -4629,8 +4705,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001121, 1000, @@ -4649,8 +4725,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4668,8 +4744,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4687,8 +4763,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4706,8 +4782,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 4, @@ -4726,8 +4802,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 435001211, -1, @@ -4745,8 +4821,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 2, 1, @@ -4764,8 +4840,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001123, 1000, @@ -4784,8 +4860,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001011, 1000, @@ -4804,8 +4880,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001326, 1000, @@ -4824,8 +4900,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4833,7 +4909,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224004112" + 224004112 ], "FailFollowSK": [], "MustHit": false @@ -4845,8 +4921,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001107, 600, @@ -4865,8 +4941,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4874,7 +4950,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224004122" + 224004122 ], "FailFollowSK": [], "MustHit": false @@ -4886,8 +4962,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001107, 600, @@ -4906,8 +4982,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4915,7 +4991,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224004132" + 224004132 ], "FailFollowSK": [], "MustHit": false @@ -4927,8 +5003,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001107, 700, @@ -4947,8 +5023,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4956,7 +5032,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224004142" + 224004142 ], "FailFollowSK": [], "MustHit": false @@ -4968,8 +5044,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001107, 700, @@ -4988,8 +5064,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -4997,7 +5073,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "224004152" + 224004152 ], "FailFollowSK": [], "MustHit": false @@ -5009,8 +5085,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001107, 800, @@ -5029,8 +5105,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 435001211, -1, @@ -5048,8 +5124,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001401, 1000, @@ -5068,8 +5144,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5087,8 +5163,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001003, 1000, @@ -5107,8 +5183,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001401, 1000, @@ -5127,8 +5203,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5146,8 +5222,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5165,8 +5241,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5184,8 +5260,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5203,8 +5279,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5222,8 +5298,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 435001212, -1, @@ -5241,8 +5317,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001401, 1000, @@ -5251,7 +5327,7 @@ ], "FollowSK": [], "SucFollowSK": [ - "924004213" + 924004213 ], "FailFollowSK": [], "MustHit": false @@ -5263,8 +5339,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001401, 1000, @@ -5283,8 +5359,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001321, 1000, @@ -5303,8 +5379,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5324,8 +5400,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5345,8 +5421,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001112, 1000, @@ -5366,8 +5442,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001113, 1000, @@ -5387,8 +5463,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5408,8 +5484,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001123, 1000, @@ -5429,8 +5505,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5450,8 +5526,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001133, 1000, @@ -5471,8 +5547,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5492,8 +5568,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001143, 1000, @@ -5513,8 +5589,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5534,8 +5610,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001153, 1000, @@ -5555,8 +5631,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5576,8 +5652,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 16, "ExecuteCnt": 1, + "Type": 16, "Argu": [ 390001163, 1000, @@ -5597,8 +5673,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444006211, -1, @@ -5616,8 +5692,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 18, "ExecuteCnt": 1, + "Type": 18, "Argu": [], "FollowSK": [], "SucFollowSK": [], @@ -5631,8 +5707,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001124, 1000, @@ -5651,8 +5727,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001001, 1000, @@ -5671,8 +5747,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001004, 1000, @@ -5691,8 +5767,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5710,8 +5786,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001117, 1000, @@ -5732,8 +5808,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 244006313, 300 @@ -5750,8 +5826,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -5770,8 +5846,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5791,8 +5867,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 244006323, 300 @@ -5809,8 +5885,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5830,8 +5906,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 244006333, 300 @@ -5848,8 +5924,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5869,8 +5945,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 244006343, 300 @@ -5887,8 +5963,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5908,8 +5984,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 244006353, 300 @@ -5926,8 +6002,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -5948,8 +6024,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 944006313, 300 @@ -5966,8 +6042,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, -1 @@ -5984,8 +6060,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444006311, -1, @@ -6003,8 +6079,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, 1 @@ -6021,8 +6097,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6043,8 +6119,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 944006323, 300 @@ -6061,8 +6137,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, -1 @@ -6079,8 +6155,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444006321, -1, @@ -6098,8 +6174,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, 1 @@ -6116,8 +6192,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6138,8 +6214,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 944006333, 300 @@ -6156,8 +6232,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, -1 @@ -6174,8 +6250,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444006331, -1, @@ -6193,8 +6269,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, 1 @@ -6211,8 +6287,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6233,8 +6309,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 944006343, 300 @@ -6251,8 +6327,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, -1 @@ -6269,8 +6345,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444006341, -1, @@ -6288,8 +6364,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, 1 @@ -6306,8 +6382,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6328,8 +6404,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 17, "ExecuteCnt": 1, + "Type": 17, "Argu": [ 944006353, 300 @@ -6346,8 +6422,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, -1 @@ -6364,8 +6440,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 444006351, -1, @@ -6383,8 +6459,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 13, "ExecuteCnt": 1, + "Type": 13, "Argu": [ 3, 1 @@ -6401,8 +6477,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001328, 1000, @@ -6421,8 +6497,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6442,8 +6518,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6465,8 +6541,8 @@ "NowHp.Down" ], "Limit": 2, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 1, 1, @@ -6484,8 +6560,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6505,8 +6581,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6526,8 +6602,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6547,8 +6623,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 1, "ExecuteCnt": 1, + "Type": 1, "Argu": [ 1, 4, @@ -6568,8 +6644,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 415005211, 1, @@ -6587,8 +6663,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -6607,8 +6683,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 11, "ExecuteCnt": 1, + "Type": 11, "Argu": [ 200 ], @@ -6624,8 +6700,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 2, 1, @@ -6643,8 +6719,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 7, "ExecuteCnt": 1, + "Type": 7, "Argu": [ 0, 1, @@ -6667,8 +6743,8 @@ ], "Order": [], "Limit": 10, - "Type": 3, "ExecuteCnt": 1, + "Type": 3, "Argu": [ 390001111, 1000, @@ -6687,8 +6763,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 2, 1, @@ -6706,8 +6782,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 2, 1, @@ -6725,8 +6801,8 @@ "Where": [], "Order": [], "Limit": 10, - "Type": 4, "ExecuteCnt": 1, + "Type": 4, "Argu": [ 2, 1, @@ -6744,8 +6820,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 2, "ExecuteCnt": 1, + "Type": 2, "Argu": [ 415005212, 1, @@ -6763,8 +6839,8 @@ "Where": [], "Order": [], "Limit": 1, - "Type": 19, "ExecuteCnt": 1, + "Type": 19, "Argu": [ 390001112, 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 87d53f906..d67767ac0 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -934,8 +934,8 @@ "Target": 1, "ChildSkill": { "Id": [ - 224003161, - 224003162 + 224003211, + 224003212 ] }, "Desc": "", diff --git a/cmd/bench/base.go b/cmd/bench/base.go index ff3ccda37..c45f2bd5a 100644 --- a/cmd/bench/base.go +++ b/cmd/bench/base.go @@ -28,7 +28,7 @@ func compose(parallelisms, dataSize []int, numKeys int, builders []TargetBuilder benchmarks := make([]Benchmark, 0, len(parallelisms)*len(dataSize)*len(builders)) for _, p := range parallelisms { - for _, _ = range dataSize { + for range dataSize { for _, builder := range builders { benchmarks = append(benchmarks, Benchmark{ diff --git a/modules/hunting/comp_configure.go b/modules/hunting/comp_configure.go index 2259df938..a31a30df7 100644 --- a/modules/hunting/comp_configure.go +++ b/modules/hunting/comp_configure.go @@ -10,34 +10,34 @@ import ( ) const ( - game_vikingboss = "game_vikingboss.json" - game_challenge = "game_vikingchallenge.json" + game_huntingboss = "game_huntingboss.json" + game_challenge = "game_huntingchallenge.json" ) ///配置管理基础组件 type configureComp struct { hlock sync.RWMutex modules.MCompConfigure - _vikingMap map[int64]*cfg.GameHuntingBossData + _huntingMap map[int64]*cfg.GameHuntingBossData } //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) - this._vikingMap = make(map[int64]*cfg.GameHuntingBossData, 0) - configure.RegisterConfigure(game_vikingboss, cfg.NewGameHuntingBoss, func() { - if v, err := this.GetConfigure(game_vikingboss); err == nil { + this._huntingMap = make(map[int64]*cfg.GameHuntingBossData, 0) + configure.RegisterConfigure(game_huntingboss, cfg.NewGameHuntingBoss, func() { + if v, err := this.GetConfigure(game_huntingboss); err == nil { if configure, ok := v.(*cfg.GameHuntingBoss); ok { this.hlock.Lock() defer this.hlock.Unlock() for _, value := range configure.GetDataList() { - this._vikingMap[int64(value.Type<<16)+int64(value.Difficulty)] = value + this._huntingMap[int64(value.Type<<16)+int64(value.Difficulty)] = value } return } } else { - log.Errorf("get game_vikingboss conf err:%v", err) + log.Errorf("get game_huntingboss conf err:%v", err) } return }) @@ -48,7 +48,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp // 参数: boss类型 难度 func (this *configureComp) GetHuntingBossConfigData(bossType int32, difficulty int32) (data *cfg.GameHuntingBossData) { - return this._vikingMap[int64(bossType<<16)+int64(difficulty)] + return this._huntingMap[int64(bossType<<16)+int64(difficulty)] } //加载多个配置文件 @@ -72,7 +72,7 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error) func (this *configureComp) GetHuntingBossTypeConfigData() (mapType map[int32]struct{}) { mapType = make(map[int32]struct{}, 0) - if v, err := this.GetConfigure(game_vikingboss); err == nil { + if v, err := this.GetConfigure(game_huntingboss); err == nil { if configure, ok := v.(*cfg.GameHuntingBoss); ok { this.hlock.Lock() defer this.hlock.Unlock() diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go index fc9c0cb04..45f45a06e 100644 --- a/modules/smithy/model_smithy.go +++ b/modules/smithy/model_smithy.go @@ -131,13 +131,14 @@ func (this *modelSmithy) CalculationSmithy(uid string, smithy *pb.DBSmithy) { if curTime > costTime { // 转时间戳 smithy.Clang.DeskType = order.DeskType + smithy.Clang.ETime = time.Now().Unix() + int64(curTime-costTime) smithy.Clang.STime = smithy.Clang.ETime - int64(szTime[order.DeskType]) bCooking = true // 记录下订单时间 smithy.Ctime = time.Now().Unix() - mapData["ctime"] = smithy.Ctime + break } smithy.Items = this.module.configure.GetMultipleDropReward(_smithycfg.Using, _smithycfg.Drop, smithy.Items) // 获取掉落奖励 @@ -173,6 +174,7 @@ func (this *modelSmithy) CalculationSmithy(uid string, smithy *pb.DBSmithy) { mapData["orders"] = smithy.Orders mapData["orderCostTime"] = smithy.OrderCostTime mapData["clang"] = smithy.Clang // 正在做的 + mapData["ctime"] = smithy.Ctime } func (this *modelSmithy) CalculationDeskSkillLv(uid string, Smithy *pb.DBSmithy) { diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 0f346acee..623ea307b 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -37,24 +37,21 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng return } cfg := this.module.configure.GetVikingBossConfigData(req.BossType, req.Difficulty) - if cfg != nil { + if cfg == nil { code = pb.ErrorCode_ConfigNoFound return } - // 类型校验 - BossData := this.configure.GetVikingBossConfigData(req.BossType, req.Difficulty) - if BossData != nil { - if value, ok := viking.Boss[req.BossType]; !ok { // 类型校验 - viking.Boss[req.BossType] = 0 - if value < req.Difficulty { - if value+1 != req.Difficulty { - code = pb.ErrorCode_VikingLvErr - return - } - newChallenge = true - } else { // 挑战历史 - newChallenge = false + + if value, ok := viking.Boss[req.BossType]; !ok { // 类型校验 + viking.Boss[req.BossType] = 0 + if value < req.Difficulty { + if value+1 != req.Difficulty { + code = pb.ErrorCode_VikingLvErr + return } + newChallenge = true + } else { // 挑战历史 + newChallenge = false } } diff --git a/modules/viking/api_ranklist.go b/modules/viking/api_ranklist.go index 71f9ddb2a..732796610 100644 --- a/modules/viking/api_ranklist.go +++ b/modules/viking/api_ranklist.go @@ -9,7 +9,9 @@ import ( //参数校验 func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.VikingRankListReq) (code pb.ErrorCode) { - + if req.BoosType == 0 { + code = pb.ErrorCode_ReqParameterError + } return } @@ -19,7 +21,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListR if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - szRank, err := this.module.modulerank.GetRankData() + szRank, err := this.module.modulerank.GetRankData(req.BoosType) if err != nil { code = pb.ErrorCode_DBError } diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go index c7877ea4f..566db37c0 100644 --- a/modules/viking/model_rank.go +++ b/modules/viking/model_rank.go @@ -54,9 +54,14 @@ func (this *ModelRank) ChangeUserRank(uid string, value map[string]interface{}) return this.Change(uid, value) } -func (this *ModelRank) GetRankData() (data []*pb.DBVikingRank, err error) { +func (this *ModelRank) GetRankData(bossType int32) (data []*pb.DBVikingRank, err error) { + tmpdata := make([]*pb.DBVikingRank, 0) data = make([]*pb.DBVikingRank, 0) - err = this.Redis.LRange(comm.TableVikingRank, 0, -1, &data) - + err = this.Redis.LRange(comm.TableVikingRank, 0, -1, &tmpdata) + for _, v := range tmpdata { + if v.Bosstype == bossType { + data = append(data, v) + } + } return } diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go index 194857d63..495426ab3 100644 --- a/pb/viking_msg.pb.go +++ b/pb/viking_msg.pb.go @@ -308,6 +308,8 @@ type VikingRankListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + BoosType int32 `protobuf:"varint,1,opt,name=boosType,proto3" json:"boosType"` // boss 类型 } func (x *VikingRankListReq) Reset() { @@ -342,6 +344,13 @@ func (*VikingRankListReq) Descriptor() ([]byte, []int) { return file_viking_viking_msg_proto_rawDescGZIP(), []int{6} } +func (x *VikingRankListReq) GetBoosType() int32 { + if x != nil { + return x.BoosType + } + return 0 +} + type VikingRankListResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -413,13 +422,15 @@ var file_viking_viking_msg_proto_rawDesc = []byte{ 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, - 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x13, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, - 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x12, - 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, - 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, + 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, + 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, + 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, + 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/services/worker/main.go b/services/worker/main.go index dacfd15fd..ba535ba6a 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -10,6 +10,7 @@ import ( "go_dreamfactory/modules/gm" "go_dreamfactory/modules/gourmet" "go_dreamfactory/modules/hero" + "go_dreamfactory/modules/hunting" "go_dreamfactory/modules/items" "go_dreamfactory/modules/mail" "go_dreamfactory/modules/mainline" @@ -72,6 +73,7 @@ func main() { viking.NewModule(), smithy.NewModule(), moonfantasy.NewModule(), + hunting.NewModule(), ) } diff --git a/sys/configure/structs/Game.LineStoryChapter.go b/sys/configure/structs/Game.LineStoryChapter.go new file mode 100644 index 000000000..8dbfa7202 --- /dev/null +++ b/sys/configure/structs/Game.LineStoryChapter.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameLineStoryChapter struct { + _dataMap map[int32]*GameLineStoryChapterData + _dataList []*GameLineStoryChapterData +} + +func NewGameLineStoryChapter(_buf []map[string]interface{}) (*GameLineStoryChapter, error) { + _dataList := make([]*GameLineStoryChapterData, 0, len(_buf)) + dataMap := make(map[int32]*GameLineStoryChapterData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLineStoryChapterData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameLineStoryChapter{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLineStoryChapter) GetDataMap() map[int32]*GameLineStoryChapterData { + return table._dataMap +} + +func (table *GameLineStoryChapter) GetDataList() []*GameLineStoryChapterData { + return table._dataList +} + +func (table *GameLineStoryChapter) Get(key int32) *GameLineStoryChapterData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LineStoryChapterData.go b/sys/configure/structs/Game.LineStoryChapterData.go new file mode 100644 index 000000000..1b2d8a1dc --- /dev/null +++ b/sys/configure/structs/Game.LineStoryChapterData.go @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameLineStoryChapterData struct { + Id int32 + Stroy int32 + Name string + Cond []int32 + Img string + Taskid []int32 +} + +const TypeId_GameLineStoryChapterData = -1620958734 + +func (*GameLineStoryChapterData) GetTypeId() int32 { + return -1620958734 +} + +func (_v *GameLineStoryChapterData)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["stroy"].(float64); !_ok_ { err = errors.New("stroy error"); return }; _v.Stroy = int32(_tempNum_) } + { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["cond"].([]interface{}); !_ok_ { err = errors.New("cond error"); return } + + _v.Cond = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Cond = append(_v.Cond, _list_v_) + } + } + + { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["taskid"].([]interface{}); !_ok_ { err = errors.New("taskid error"); return } + + _v.Taskid = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Taskid = append(_v.Taskid, _list_v_) + } + } + + return +} + +func DeserializeGameLineStoryChapterData(_buf map[string]interface{}) (*GameLineStoryChapterData, error) { + v := &GameLineStoryChapterData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.LineStoryStageTask.go b/sys/configure/structs/Game.LineStoryStageTask.go new file mode 100644 index 000000000..8e7461550 --- /dev/null +++ b/sys/configure/structs/Game.LineStoryStageTask.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameLineStoryStageTask struct { + _dataMap map[int32]*GameLineStoryStageTaskData + _dataList []*GameLineStoryStageTaskData +} + +func NewGameLineStoryStageTask(_buf []map[string]interface{}) (*GameLineStoryStageTask, error) { + _dataList := make([]*GameLineStoryStageTaskData, 0, len(_buf)) + dataMap := make(map[int32]*GameLineStoryStageTaskData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLineStoryStageTaskData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameLineStoryStageTask{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLineStoryStageTask) GetDataMap() map[int32]*GameLineStoryStageTaskData { + return table._dataMap +} + +func (table *GameLineStoryStageTask) GetDataList() []*GameLineStoryStageTaskData { + return table._dataList +} + +func (table *GameLineStoryStageTask) Get(key int32) *GameLineStoryStageTaskData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LineStoryStageTaskData.go b/sys/configure/structs/Game.LineStoryStageTaskData.go new file mode 100644 index 000000000..e3053387d --- /dev/null +++ b/sys/configure/structs/Game.LineStoryStageTaskData.go @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameLineStoryStageTaskData struct { + Id int32 + PosTId int32 + NextTId int32 + Cond []int32 + Reward []*Gameatn + Jump string +} + +const TypeId_GameLineStoryStageTaskData = 884678024 + +func (*GameLineStoryStageTaskData) GetTypeId() int32 { + return 884678024 +} + +func (_v *GameLineStoryStageTaskData)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["posTId"].(float64); !_ok_ { err = errors.New("posTId error"); return }; _v.PosTId = 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 + if _arr_, _ok_ = _buf["cond"].([]interface{}); !_ok_ { err = errors.New("cond error"); return } + + _v.Cond = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Cond = append(_v.Cond, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return } + + _v.Reward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Reward = append(_v.Reward, _list_v_) + } + } + + { var _ok_ bool; if _v.Jump, _ok_ = _buf["jump"].(string); !_ok_ { err = errors.New("jump error"); return } } + return +} + +func DeserializeGameLineStoryStageTaskData(_buf map[string]interface{}) (*GameLineStoryStageTaskData, error) { + v := &GameLineStoryStageTaskData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.LineStoryTask.go b/sys/configure/structs/Game.LineStoryTask.go new file mode 100644 index 000000000..4d5863d33 --- /dev/null +++ b/sys/configure/structs/Game.LineStoryTask.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameLineStoryTask struct { + _dataMap map[int32]*GameLineStoryTaskData + _dataList []*GameLineStoryTaskData +} + +func NewGameLineStoryTask(_buf []map[string]interface{}) (*GameLineStoryTask, error) { + _dataList := make([]*GameLineStoryTaskData, 0, len(_buf)) + dataMap := make(map[int32]*GameLineStoryTaskData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLineStoryTaskData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameLineStoryTask{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLineStoryTask) GetDataMap() map[int32]*GameLineStoryTaskData { + return table._dataMap +} + +func (table *GameLineStoryTask) GetDataList() []*GameLineStoryTaskData { + return table._dataList +} + +func (table *GameLineStoryTask) Get(key int32) *GameLineStoryTaskData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LineStoryTaskData.go b/sys/configure/structs/Game.LineStoryTaskData.go new file mode 100644 index 000000000..976fa566c --- /dev/null +++ b/sys/configure/structs/Game.LineStoryTaskData.go @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameLineStoryTaskData struct { + Id int32 + PreTId int32 + StageTId []int32 + Reward []*Gameatn + Finish int32 + Ending int32 +} + +const TypeId_GameLineStoryTaskData = -2080476076 + +func (*GameLineStoryTaskData) GetTypeId() int32 { + return -2080476076 +} + +func (_v *GameLineStoryTaskData)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["preTId"].(float64); !_ok_ { err = errors.New("preTId error"); return }; _v.PreTId = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["stageTId"].([]interface{}); !_ok_ { err = errors.New("stageTId error"); return } + + _v.StageTId = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.StageTId = append(_v.StageTId, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return } + + _v.Reward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Reward = append(_v.Reward, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["finish"].(float64); !_ok_ { err = errors.New("finish error"); return }; _v.Finish = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ending"].(float64); !_ok_ { err = errors.New("ending error"); return }; _v.Ending = int32(_tempNum_) } + return +} + +func DeserializeGameLineStoryTaskData(_buf map[string]interface{}) (*GameLineStoryTaskData, error) { + v := &GameLineStoryTaskData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 96199be5f..749f010ff 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -84,6 +84,9 @@ type Tables struct { Link *GameLink GetResource *GameGetResource Affix *GameAffix + LineStoryChapter *GameLineStoryChapter + LineStoryTask *GameLineStoryTask + LineStoryStageTask *GameLineStoryStageTask } func NewTables(loader JsonLoader) (*Tables, error) { @@ -529,5 +532,23 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Affix, err = NewGameAffix(buf) ; err != nil { return nil, err } + if buf, err = loader("game_linestorychapter") ; err != nil { + return nil, err + } + if tables.LineStoryChapter, err = NewGameLineStoryChapter(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_linestorytask") ; err != nil { + return nil, err + } + if tables.LineStoryTask, err = NewGameLineStoryTask(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_linestorystagetask") ; err != nil { + return nil, err + } + if tables.LineStoryStageTask, err = NewGameLineStoryStageTask(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index 5f3f17b30..d9a3f847b 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -19,6 +19,8 @@ type GameHeroData struct { Race int32 Job int32 Type int32 + Ip int32 + Sd int32 Handbook int32 Prefab string Rotation string @@ -53,6 +55,8 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ip"].(float64); !_ok_ { err = errors.New("ip error"); return }; _v.Ip = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sd"].(float64); !_ok_ { err = errors.New("sd error"); return }; _v.Sd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) } { var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } } { var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } } diff --git a/sys/configure/structs/game.modelData.go b/sys/configure/structs/game.modelData.go index ff868aaef..bc2c245b6 100644 --- a/sys/configure/structs/game.modelData.go +++ b/sys/configure/structs/game.modelData.go @@ -15,6 +15,7 @@ type GameModelData struct { Id string Preson string Presonshow string + Height float32 Ico string Fight string Img string @@ -35,6 +36,7 @@ func (_v *GameModelData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; if _v.Preson, _ok_ = _buf["preson"].(string); !_ok_ { err = errors.New("preson error"); return } } { var _ok_ bool; if _v.Presonshow, _ok_ = _buf["presonshow"].(string); !_ok_ { err = errors.New("presonshow error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["height"].(float64); !_ok_ { err = errors.New("height error"); return }; _v.Height = float32(_tempNum_) } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; if _v.Fight, _ok_ = _buf["fight"].(string); !_ok_ { err = errors.New("fight error"); return } } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } diff --git a/sys/configure/structs/game.monsterData.go b/sys/configure/structs/game.monsterData.go index 1ae728e22..8b7270be2 100644 --- a/sys/configure/structs/game.monsterData.go +++ b/sys/configure/structs/game.monsterData.go @@ -15,7 +15,7 @@ type GameMonsterData struct { HeroId string Name string Star int32 - Equip string + Equip []int32 } const TypeId_GameMonsterData = 31965864 @@ -29,7 +29,20 @@ func (_v *GameMonsterData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.HeroId, _ok_ = _buf["hero_id"].(string); !_ok_ { err = errors.New("hero_id error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; if _v.Equip, _ok_ = _buf["equip"].(string); !_ok_ { err = errors.New("equip error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["equip"].([]interface{}); !_ok_ { err = errors.New("equip error"); return } + + _v.Equip = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Equip = append(_v.Equip, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.skillAfteratkData.go b/sys/configure/structs/game.skillAfteratkData.go index 7817c98ec..06672b26d 100644 --- a/sys/configure/structs/game.skillAfteratkData.go +++ b/sys/configure/structs/game.skillAfteratkData.go @@ -17,12 +17,12 @@ type GameSkillAfteratkData struct { Where []string Order []string Limit int32 - Type int32 ExecuteCnt int32 + Type int32 Argu []int32 FollowSK []int32 - SucFollowSK []string - FailFollowSK []string + SucFollowSK []int32 + FailFollowSK []int32 MustHit bool } @@ -65,8 +65,8 @@ func (_v *GameSkillAfteratkData)Deserialize(_buf map[string]interface{}) (err er } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Limit"].(float64); !_ok_ { err = errors.New("Limit error"); return }; _v.Limit = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ExecuteCnt"].(float64); !_ok_ { err = errors.New("ExecuteCnt error"); return }; _v.ExecuteCnt = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -100,11 +100,11 @@ func (_v *GameSkillAfteratkData)Deserialize(_buf map[string]interface{}) (err er var _ok_ bool if _arr_, _ok_ = _buf["SucFollowSK"].([]interface{}); !_ok_ { err = errors.New("SucFollowSK error"); return } - _v.SucFollowSK = make([]string, 0, len(_arr_)) + _v.SucFollowSK = make([]int32, 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 } } + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } _v.SucFollowSK = append(_v.SucFollowSK, _list_v_) } } @@ -114,11 +114,11 @@ func (_v *GameSkillAfteratkData)Deserialize(_buf map[string]interface{}) (err er var _ok_ bool if _arr_, _ok_ = _buf["FailFollowSK"].([]interface{}); !_ok_ { err = errors.New("FailFollowSK error"); return } - _v.FailFollowSK = make([]string, 0, len(_arr_)) + _v.FailFollowSK = make([]int32, 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 } } + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } _v.FailFollowSK = append(_v.FailFollowSK, _list_v_) } }