diff --git a/bin/json/game_achievetask.json b/bin/json/game_achievetask.json
index 359be2237..738e2fcc7 100644
--- a/bin/json/game_achievetask.json
+++ b/bin/json/game_achievetask.json
@@ -20,7 +20,7 @@
"n": 10000
}
],
- "jump": 103
+ "jump": 102
},
{
"key": 1002,
@@ -43,7 +43,7 @@
"n": 20000
}
],
- "jump": 103
+ "jump": 102
},
{
"key": 1003,
@@ -66,7 +66,7 @@
"n": 30000
}
],
- "jump": 103
+ "jump": 104
},
{
"key": 1004,
@@ -89,7 +89,7 @@
"n": 10000
}
],
- "jump": 102
+ "jump": 104
},
{
"key": 1005,
@@ -112,7 +112,7 @@
"n": 20000
}
],
- "jump": 102
+ "jump": 104
},
{
"key": 1006,
@@ -135,7 +135,7 @@
"n": 30000
}
],
- "jump": 102
+ "jump": 104
},
{
"key": 1007,
@@ -158,7 +158,7 @@
"n": 10000
}
],
- "jump": 10022
+ "jump": 104
},
{
"key": 1008,
@@ -181,7 +181,7 @@
"n": 20000
}
],
- "jump": 10020
+ "jump": 104
},
{
"key": 1009,
@@ -204,7 +204,7 @@
"n": 30000
}
],
- "jump": 10021
+ "jump": 104
},
{
"key": 1010,
@@ -227,7 +227,7 @@
"n": 10000
}
],
- "jump": 10015
+ "jump": 104
},
{
"key": 1011,
@@ -250,7 +250,7 @@
"n": 20000
}
],
- "jump": 10015
+ "jump": 104
},
{
"key": 1012,
@@ -273,7 +273,7 @@
"n": 30000
}
],
- "jump": 10015
+ "jump": 104
},
{
"key": 1013,
@@ -296,7 +296,7 @@
"n": 10000
}
],
- "jump": 123
+ "jump": 104
},
{
"key": 1014,
@@ -319,7 +319,7 @@
"n": 20000
}
],
- "jump": 123
+ "jump": 104
},
{
"key": 1015,
@@ -342,7 +342,7 @@
"n": 30000
}
],
- "jump": 123
+ "jump": 104
},
{
"key": 1016,
@@ -365,7 +365,7 @@
"n": 10000
}
],
- "jump": 10036
+ "jump": 104
},
{
"key": 1017,
@@ -388,7 +388,7 @@
"n": 20000
}
],
- "jump": 10036
+ "jump": 104
},
{
"key": 1018,
@@ -411,7 +411,7 @@
"n": 30000
}
],
- "jump": 10036
+ "jump": 104
},
{
"key": 1019,
@@ -434,7 +434,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1020,
@@ -457,7 +457,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1021,
@@ -480,7 +480,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1022,
@@ -503,7 +503,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1023,
@@ -526,7 +526,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1024,
@@ -549,7 +549,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1025,
@@ -572,7 +572,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1026,
@@ -595,7 +595,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 104
},
{
"key": 1027,
@@ -618,7 +618,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10019
},
{
"key": 1028,
@@ -641,7 +641,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10019
},
{
"key": 1029,
@@ -664,7 +664,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10019
},
{
"key": 1030,
@@ -687,7 +687,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10019
},
{
"key": 1031,
@@ -710,7 +710,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1032,
@@ -733,7 +733,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1033,
@@ -756,7 +756,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1034,
@@ -779,7 +779,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1035,
@@ -802,7 +802,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1036,
@@ -825,7 +825,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1037,
@@ -848,7 +848,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1038,
@@ -871,7 +871,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1041,
@@ -894,7 +894,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1042,
@@ -917,7 +917,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1043,
@@ -940,7 +940,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1044,
@@ -963,7 +963,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1045,
@@ -986,7 +986,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1046,
@@ -1009,7 +1009,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1047,
@@ -1032,7 +1032,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1048,
@@ -1055,7 +1055,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1049,
@@ -1078,7 +1078,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1050,
@@ -1101,7 +1101,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1051,
@@ -1124,7 +1124,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1052,
@@ -1147,7 +1147,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1053,
@@ -1170,7 +1170,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1054,
@@ -1193,7 +1193,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1055,
@@ -1216,7 +1216,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1056,
@@ -1239,7 +1239,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1057,
@@ -1262,7 +1262,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1058,
@@ -1285,7 +1285,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1059,
@@ -1308,7 +1308,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1060,
@@ -1331,7 +1331,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1061,
@@ -1354,7 +1354,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1062,
@@ -1377,7 +1377,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1063,
@@ -1400,7 +1400,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1064,
@@ -1423,7 +1423,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1065,
@@ -1446,7 +1446,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1066,
@@ -1469,7 +1469,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1067,
@@ -1492,7 +1492,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1068,
@@ -1515,7 +1515,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1069,
@@ -1538,7 +1538,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1070,
@@ -1561,7 +1561,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1071,
@@ -1584,7 +1584,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1072,
@@ -1607,7 +1607,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1073,
@@ -1630,7 +1630,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1074,
@@ -1653,7 +1653,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1075,
@@ -1676,7 +1676,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1076,
@@ -1699,7 +1699,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1077,
@@ -1722,7 +1722,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1078,
@@ -1745,7 +1745,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1079,
@@ -1768,7 +1768,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1080,
@@ -1791,7 +1791,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1081,
@@ -1814,7 +1814,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1082,
@@ -1837,7 +1837,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1083,
@@ -1860,7 +1860,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1084,
@@ -1883,7 +1883,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1085,
@@ -1906,7 +1906,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1086,
@@ -1929,7 +1929,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1087,
@@ -1952,7 +1952,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1088,
@@ -1975,7 +1975,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1089,
@@ -1998,7 +1998,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1090,
@@ -2021,7 +2021,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1091,
@@ -2044,7 +2044,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1092,
@@ -2067,7 +2067,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1093,
@@ -2090,7 +2090,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1094,
@@ -2113,7 +2113,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1095,
@@ -2136,7 +2136,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1096,
@@ -2159,7 +2159,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1097,
@@ -2182,7 +2182,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1098,
@@ -2205,7 +2205,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1099,
@@ -2228,7 +2228,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1100,
@@ -2251,7 +2251,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1101,
@@ -2274,7 +2274,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1102,
@@ -2297,7 +2297,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1103,
@@ -2320,7 +2320,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1104,
@@ -2343,7 +2343,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1105,
@@ -2366,7 +2366,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1106,
@@ -2389,7 +2389,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1107,
@@ -2412,7 +2412,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1108,
@@ -2435,7 +2435,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1109,
@@ -2458,7 +2458,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1110,
@@ -2481,7 +2481,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1111,
@@ -2504,7 +2504,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1112,
@@ -2527,7 +2527,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1113,
@@ -2550,7 +2550,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1114,
@@ -2573,7 +2573,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1115,
@@ -2596,7 +2596,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1116,
@@ -2619,7 +2619,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1117,
@@ -2642,7 +2642,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1118,
@@ -2665,7 +2665,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1119,
@@ -2688,7 +2688,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1120,
@@ -2711,7 +2711,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1121,
@@ -2734,7 +2734,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1122,
@@ -2757,7 +2757,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1123,
@@ -2780,7 +2780,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1124,
@@ -2803,7 +2803,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1125,
@@ -2826,7 +2826,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1126,
@@ -2849,7 +2849,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1127,
@@ -2872,7 +2872,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1128,
@@ -2895,7 +2895,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1129,
@@ -2918,7 +2918,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1130,
@@ -2941,7 +2941,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1131,
@@ -2964,7 +2964,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1132,
@@ -2987,7 +2987,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1133,
@@ -3010,7 +3010,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1134,
@@ -3033,7 +3033,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1135,
@@ -3056,7 +3056,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1136,
@@ -3079,7 +3079,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1137,
@@ -3102,7 +3102,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1138,
@@ -3125,7 +3125,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1139,
@@ -3148,7 +3148,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1140,
@@ -3171,7 +3171,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1141,
@@ -3194,7 +3194,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1142,
@@ -3217,7 +3217,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1143,
@@ -3240,7 +3240,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1144,
@@ -3263,7 +3263,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1145,
@@ -3286,7 +3286,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1146,
@@ -3309,7 +3309,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1147,
@@ -3332,7 +3332,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1148,
@@ -3355,7 +3355,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1149,
@@ -3378,7 +3378,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 102
},
{
"key": 1150,
@@ -3401,7 +3401,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 122
},
{
"key": 1151,
@@ -3424,7 +3424,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 123
},
{
"key": 1152,
@@ -3447,7 +3447,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 124
},
{
"key": 1153,
@@ -3470,7 +3470,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 125
},
{
"key": 1154,
@@ -3493,7 +3493,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 122
},
{
"key": 1155,
@@ -3516,7 +3516,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1156,
@@ -3539,7 +3539,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1157,
@@ -3562,7 +3562,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1158,
@@ -3585,7 +3585,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1159,
@@ -3608,7 +3608,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1160,
@@ -3631,7 +3631,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1161,
@@ -3654,7 +3654,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1162,
@@ -3677,7 +3677,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1163,
@@ -3700,7 +3700,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1164,
@@ -3723,7 +3723,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1165,
@@ -3746,7 +3746,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1166,
@@ -3769,7 +3769,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1167,
@@ -3792,7 +3792,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1168,
@@ -3815,7 +3815,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1169,
@@ -3838,7 +3838,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1170,
@@ -3861,7 +3861,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1171,
@@ -3884,7 +3884,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1172,
@@ -3907,7 +3907,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1173,
@@ -3930,7 +3930,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1174,
@@ -3953,7 +3953,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1175,
@@ -3976,7 +3976,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1176,
@@ -3999,7 +3999,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1177,
@@ -4022,7 +4022,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1178,
@@ -4045,7 +4045,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10043
},
{
"key": 1179,
@@ -4183,7 +4183,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 115
},
{
"key": 1185,
@@ -4206,7 +4206,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 115
},
{
"key": 1186,
@@ -4229,7 +4229,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 115
},
{
"key": 1187,
@@ -4252,7 +4252,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1188,
@@ -4275,7 +4275,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1189,
@@ -4298,7 +4298,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1190,
@@ -4321,7 +4321,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1191,
@@ -4344,7 +4344,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1192,
@@ -4367,7 +4367,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1193,
@@ -4390,7 +4390,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1194,
@@ -4413,7 +4413,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1195,
@@ -4436,7 +4436,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1196,
@@ -4459,7 +4459,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1197,
@@ -4482,7 +4482,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1198,
@@ -4505,7 +4505,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1199,
@@ -4528,7 +4528,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1200,
@@ -4551,7 +4551,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10006
},
{
"key": 1201,
@@ -4574,7 +4574,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1202,
@@ -4597,7 +4597,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1203,
@@ -4620,7 +4620,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1204,
@@ -4643,7 +4643,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1205,
@@ -4666,7 +4666,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1206,
@@ -4689,7 +4689,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 103
},
{
"key": 1207,
@@ -4712,7 +4712,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1208,
@@ -4735,7 +4735,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1209,
@@ -4758,7 +4758,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 10036
},
{
"key": 1210,
@@ -4781,7 +4781,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1211,
@@ -4804,7 +4804,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1212,
@@ -4827,7 +4827,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1213,
@@ -4850,7 +4850,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1214,
@@ -4873,7 +4873,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1215,
@@ -4896,7 +4896,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1216,
@@ -4919,7 +4919,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1217,
@@ -4942,7 +4942,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1218,
@@ -4965,7 +4965,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1219,
@@ -4988,7 +4988,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1220,
@@ -5011,7 +5011,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1221,
@@ -5034,7 +5034,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1222,
@@ -5057,7 +5057,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1223,
@@ -5080,7 +5080,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1224,
@@ -5103,7 +5103,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1225,
@@ -5126,7 +5126,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1226,
@@ -5149,7 +5149,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1227,
@@ -5172,7 +5172,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1228,
@@ -5195,7 +5195,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1229,
@@ -5218,7 +5218,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1230,
@@ -5241,7 +5241,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1231,
@@ -5264,7 +5264,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1232,
@@ -5287,7 +5287,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1233,
@@ -5310,7 +5310,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1234,
@@ -5333,7 +5333,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1235,
@@ -5356,7 +5356,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1236,
@@ -5379,7 +5379,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1237,
@@ -5402,7 +5402,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1245,
@@ -5425,7 +5425,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1246,
@@ -5448,7 +5448,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1247,
@@ -5471,7 +5471,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1248,
@@ -5494,7 +5494,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1249,
@@ -5517,7 +5517,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1250,
@@ -5540,7 +5540,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1251,
@@ -5563,7 +5563,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1252,
@@ -5586,7 +5586,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1253,
@@ -5609,7 +5609,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1254,
@@ -5632,7 +5632,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1255,
@@ -5655,7 +5655,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1256,
@@ -5678,7 +5678,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1257,
@@ -5701,7 +5701,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1258,
@@ -5724,7 +5724,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1259,
@@ -5747,7 +5747,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1260,
@@ -5770,7 +5770,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1261,
@@ -5793,7 +5793,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1262,
@@ -5816,7 +5816,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1263,
@@ -5839,7 +5839,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1264,
@@ -5862,7 +5862,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1265,
@@ -5885,7 +5885,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1266,
@@ -5908,7 +5908,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1267,
@@ -5931,7 +5931,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1268,
@@ -5954,7 +5954,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1269,
@@ -5977,7 +5977,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1270,
@@ -6000,7 +6000,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1271,
@@ -6023,7 +6023,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1272,
@@ -6046,7 +6046,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1273,
@@ -6069,7 +6069,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1274,
@@ -6092,7 +6092,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1275,
@@ -6115,7 +6115,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1276,
@@ -6138,7 +6138,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1277,
@@ -6161,7 +6161,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1278,
@@ -6184,7 +6184,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1279,
@@ -6207,7 +6207,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1280,
@@ -6230,7 +6230,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1281,
@@ -6253,7 +6253,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1282,
@@ -6276,7 +6276,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1283,
@@ -6299,7 +6299,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1284,
@@ -6322,7 +6322,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1285,
@@ -6345,7 +6345,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1286,
@@ -6368,7 +6368,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1287,
@@ -6391,7 +6391,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1288,
@@ -6414,7 +6414,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1289,
@@ -6437,7 +6437,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 146
},
{
"key": 1290,
@@ -6460,7 +6460,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1291,
@@ -6483,7 +6483,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1292,
@@ -6506,7 +6506,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1293,
@@ -6529,7 +6529,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1294,
@@ -6552,7 +6552,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1295,
@@ -6575,7 +6575,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1296,
@@ -6598,7 +6598,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1297,
@@ -6621,7 +6621,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1298,
@@ -6644,7 +6644,7 @@
"n": 10000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1299,
@@ -6667,7 +6667,7 @@
"n": 20000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1300,
@@ -6690,7 +6690,7 @@
"n": 30000
}
],
- "jump": 0
+ "jump": 156
},
{
"key": 1301,
diff --git a/bin/json/game_annulartask_library.json b/bin/json/game_annulartask_library.json
index ccf240f60..877a3ea7d 100644
--- a/bin/json/game_annulartask_library.json
+++ b/bin/json/game_annulartask_library.json
@@ -5,7 +5,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1010,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -14,7 +14,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1020,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -23,7 +23,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1030,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -32,7 +32,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1040,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -41,7 +41,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1050,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -50,7 +50,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1060,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -59,7 +59,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1080,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -68,7 +68,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1090,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -77,7 +77,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1100,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -86,7 +86,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1110,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -95,7 +95,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1120,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -104,7 +104,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1130,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -113,7 +113,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1140,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -122,7 +122,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1150,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -131,7 +131,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1160,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -140,7 +140,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1170,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -149,7 +149,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1180,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -158,7 +158,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1190,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -167,7 +167,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1200,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -176,7 +176,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1210,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -185,7 +185,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1220,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -194,7 +194,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1230,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -203,7 +203,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1240,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -212,7 +212,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1250,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -221,7 +221,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1260,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -230,7 +230,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1270,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -239,7 +239,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1280,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -248,7 +248,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1290,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -257,7 +257,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1300,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -266,7 +266,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1310,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -275,7 +275,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1320,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
},
{
@@ -284,7 +284,7 @@
"lvstart": 1,
"lvend": 999,
"itemid": 1330,
- "itemwt": 100,
+ "itemwt": 1000,
"min": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 089428174..823dd0c55 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -10941,7 +10941,7 @@
},
"value": 1,
"filter": [
- 503
+ 109
],
"filter2": []
},
@@ -10999,7 +10999,7 @@
},
"value": 1,
"filter": [
- 505
+ 701
],
"filter2": []
},
@@ -29457,9 +29457,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_994",
- "text": "主角等级达到2级开启"
+ "text": "主角等级达到1级开启"
},
- "type": 20,
+ "type": 252,
"valid": 0,
"head": {
"a": "attr",
@@ -29472,8 +29472,10 @@
"key": "",
"text": ""
},
- "value": 2,
- "filter": [],
+ "value": 1,
+ "filter": [
+ 20364
+ ],
"filter2": []
},
{
@@ -29573,9 +29575,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_998",
- "text": "主角等级达到2级开启"
+ "text": "主角等级达到1级开启"
},
- "type": 20,
+ "type": 252,
"valid": 0,
"head": {
"a": "attr",
@@ -29588,8 +29590,10 @@
"key": "",
"text": ""
},
- "value": 2,
- "filter": [],
+ "value": 1,
+ "filter": [
+ 20364
+ ],
"filter2": []
},
{
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 2050817f8..4e2b92a5e 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1467,5 +1467,12 @@
"eq",
"lte"
]
+ },
+ {
+ "id": 252,
+ "insert": 1,
+ "filter": [
+ "eq"
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_chatsystem.json b/bin/json/game_chatsystem.json
index 870a71ec8..5fdf91546 100644
--- a/bin/json/game_chatsystem.json
+++ b/bin/json/game_chatsystem.json
@@ -88,7 +88,7 @@
"key": "chat_system_text_5",
"text": "【全服】{0} 经过不懈的努力，将{1}强化至+13！"
},
- "data": 13,
+ "data": 14,
"data2": 0,
"week": [],
"time_h": 0,
@@ -103,7 +103,7 @@
"key": "chat_system_text_6",
"text": "【全服】{0} 经过不懈的努力，将{1}强化至+14！"
},
- "data": 14,
+ "data": 15,
"data2": 0,
"week": [],
"time_h": 0,
@@ -118,7 +118,7 @@
"key": "chat_system_text_7",
"text": "【全服】{0} 经过不懈的努力，将 {1} 强化至+15！"
},
- "data": 15,
+ "data": 16,
"data2": 0,
"week": [],
"time_h": 0,
diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index b63f4b3fa..b61247459 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -467,12 +467,12 @@
"color": 4,
"effects": "",
"access": [
- 158
+ 10073
],
"img": "attr_sxmoney",
"intr": {
"key": "item_coin_intr_18",
- "text": "用于在三消玩法内消耗的货币"
+ "text": "用于在巅峰之王指定商店内消耗的货币"
},
"describe": {
"key": "",
@@ -494,12 +494,12 @@
"color": 5,
"effects": "",
"access": [
- 158
+ 10073
],
"img": "attr_sxintegral",
"intr": {
"key": "item_coin_intr_19",
- "text": "三消的积分道具，增加可以获得进度奖励"
+ "text": "巅峰之王内的积分道具，增加可以获得进度奖励"
},
"describe": {
"key": "",
diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json
index a75f5f75d..420f633aa 100644
--- a/bin/json/game_gm.json
+++ b/bin/json/game_gm.json
@@ -858,5 +858,15 @@
},
"data": "剧情组id",
"prefix": ""
+ },
+ {
+ "id": 87,
+ "type": 1,
+ "text": {
+ "key": "GM_GM_text_133",
+ "text": "获取某种类型所有道具（背包类型,数量）"
+ },
+ "data": "7,1",
+ "prefix": "bingo:bagtype,{0}"
}
]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 7ae6aa31d..3e7b5d32c 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -9633,6 +9633,92 @@
"text": "传说中的守护者“埃雷特”,拥有不俗的战斗能力"
}
},
+ {
+ "hid": "83008",
+ "name": {
+ "key": "hero_main_name_83008",
+ "text": "黑化小猴子"
+ },
+ "star": 3,
+ "color": 2,
+ "race": 4,
+ "job": 3,
+ "type": 2,
+ "ip": 1,
+ "sd": 1,
+ "handbook": false,
+ "prefab": "83008",
+ "rotation": "0|0|0",
+ "revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
+ "icon": "51012",
+ "vocal": "51012",
+ "tujing": [
+ 107
+ ],
+ "detailwindow": "effect_chezhan_daiji",
+ "intr": {
+ "key": "",
+ "text": ""
+ },
+ "events": "hero_51012",
+ "cite": "",
+ "effectstay": [],
+ "hpspace": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "capskillrule": 101,
+ "skill": 0,
+ "skill1": 151012111,
+ "skill2": 151012211,
+ "skill3": 0,
+ "skill4": 0,
+ "skill5": 0,
+ "skill6": 0,
+ "txt": {
+ "key": "atlas_83008",
+ "text": ""
+ },
+ "enteranivalue": 0,
+ "camerainterval": 0,
+ "equiprcom": [
+ 1,
+ 2,
+ 10
+ ],
+ "angle": 0,
+ "deviation": 0,
+ "show": 2,
+ "herofrag": [
+ {
+ "a": "item",
+ "t": "12025001",
+ "n": 1
+ }
+ ],
+ "herofragnum": 6,
+ "heroskillup": [
+ "10000004"
+ ],
+ "expitem": [
+ {
+ "a": "item",
+ "t": "10000011",
+ "n": 1
+ }
+ ],
+ "expitemnum": 7,
+ "herointr": {
+ "key": "hero_main_herointr_83008",
+ "text": "传说中的守护者“黑化小猴子”,拥有不俗的战斗能力"
+ }
+ },
{
"hid": "84002",
"name": {
diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json
index e34421e41..4e075559f 100644
--- a/bin/json/game_itemlink.json
+++ b/bin/json/game_itemlink.json
@@ -559,5 +559,22 @@
"text": "立即前往"
},
"icon": "icon_zm"
+ },
+ {
+ "id": 10073,
+ "title": {
+ "key": "itemlink_itemlink_title_34",
+ "text": "巅峰之王获取"
+ },
+ "desc": {
+ "key": "itemlink_itemlink_desc_34",
+ "text": "赢得巅峰之王对战获取"
+ },
+ "jumpid": 10073,
+ "btnTitle": {
+ "key": "itemlink_itemlink_button_1",
+ "text": "立即前往"
+ },
+ "icon": "icon_zm"
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 1addb0c69..060045fc1 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -19746,7 +19746,9 @@
"player",
"sbkp_js_25002"
],
- "scene_effect": [],
+ "scene_effect": [
+ "shandian"
+ ],
"scene_effectfilter": "",
"is_near": false,
"openlevel": 1,
@@ -19853,7 +19855,7 @@
{
"id": 1103014,
"chapterid": 11003,
- "group_id": 100311,
+ "group_id": 1003101,
"previous_group_id": [
100310
],
@@ -19865,10 +19867,405 @@
"stage_param": 0,
"inherit": false,
"battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [
+ "shandian"
+ ],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 1,
+ "heroimg": "",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": false,
+ "destroy": true,
+ "progress": 1,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 400,
+ "ps_consume": [
+ {
+ "a": "attr",
+ "t": "ps",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "attr",
+ "t": "ps",
+ "n": 1
+ }
+ ],
+ "firstaward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ },
+ {
+ "a": "equi",
+ "t": "11615",
+ "n": 1
+ }
+ ],
+ "lotteryward": 17111610,
+ "commonaward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ },
+ {
+ "a": "equi",
+ "t": "11625",
+ "n": 1
+ }
+ ],
+ "BattleReadyID": 10106002,
+ "FormatList": [
+ 103071
+ ],
+ "helphero": [],
+ "banhero": [],
+ "star": [
+ 1,
+ 1,
+ 1
+ ],
+ "star_type": [
+ 1,
+ 2,
+ 2
+ ],
+ "star_value": [
+ 0,
+ 2,
+ 1
+ ],
+ "challengeward": 0
+ },
+ {
+ "id": 1103015,
+ "chapterid": 11003,
+ "group_id": 1003102,
+ "previous_group_id": [
+ 100310
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 1,
+ "stage_param": 0,
+ "inherit": false,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [
+ "shandian"
+ ],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 1,
+ "heroimg": "",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": false,
+ "destroy": true,
+ "progress": 1,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 400,
+ "ps_consume": [
+ {
+ "a": "attr",
+ "t": "ps",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "attr",
+ "t": "ps",
+ "n": 1
+ }
+ ],
+ "firstaward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ },
+ {
+ "a": "equi",
+ "t": "11615",
+ "n": 1
+ }
+ ],
+ "lotteryward": 17111610,
+ "commonaward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ },
+ {
+ "a": "equi",
+ "t": "11625",
+ "n": 1
+ }
+ ],
+ "BattleReadyID": 10106002,
+ "FormatList": [
+ 103071
+ ],
+ "helphero": [],
+ "banhero": [],
+ "star": [
+ 1,
+ 1,
+ 1
+ ],
+ "star_type": [
+ 1,
+ 2,
+ 2
+ ],
+ "star_value": [
+ 0,
+ 2,
+ 1
+ ],
+ "challengeward": 0
+ },
+ {
+ "id": 1103016,
+ "chapterid": 11003,
+ "group_id": 1003103,
+ "previous_group_id": [
+ 100310
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 1,
+ "stage_param": 0,
+ "inherit": false,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [
+ "shandian"
+ ],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 1,
+ "heroimg": "",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": false,
+ "destroy": true,
+ "progress": 1,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 400,
+ "ps_consume": [
+ {
+ "a": "attr",
+ "t": "ps",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "attr",
+ "t": "ps",
+ "n": 1
+ }
+ ],
+ "firstaward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ },
+ {
+ "a": "equi",
+ "t": "11615",
+ "n": 1
+ }
+ ],
+ "lotteryward": 17111610,
+ "commonaward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ },
+ {
+ "a": "equi",
+ "t": "11625",
+ "n": 1
+ }
+ ],
+ "BattleReadyID": 10106002,
+ "FormatList": [
+ 103071
+ ],
+ "helphero": [],
+ "banhero": [],
+ "star": [
+ 1,
+ 1,
+ 1
+ ],
+ "star_type": [
+ 1,
+ 2,
+ 2
+ ],
+ "star_value": [
+ 0,
+ 2,
+ 1
+ ],
+ "challengeward": 0
+ },
+ {
+ "id": 1103017,
+ "chapterid": 11003,
+ "group_id": 100311,
+ "previous_group_id": [
+ 1003103,
+ 1003102,
+ 1003101
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 1,
+ "stage_param": 0,
+ "inherit": false,
+ "battle_fail": false,
"venturemodelspeed": 12,
"venturemodelscale": 4,
"move_type": 0,
- "venturemodel": "Person/54016/54016_q.prefab",
+ "venturemodel": "",
"bubbletalk": {
"key": "",
"text": ""
@@ -19876,7 +20273,7 @@
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -19980,11 +20377,92 @@
"challengeward": 0
},
{
- "id": 1103015,
+ "id": 1103018,
+ "chapterid": 11003,
+ "group_id": 1003111,
+ "previous_group_id": [
+ 100311
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 3,
+ "stage_param": 0,
+ "inherit": false,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "Person/54016/54016_q.prefab",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "效果8",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 1,
+ "heroimg": "",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": false,
+ "destroy": true,
+ "progress": 1,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1103019,
"chapterid": 11003,
"group_id": 100312,
"previous_group_id": [
- 100311
+ 1003111
],
"previoustage": 0,
"buried_type": 0,
@@ -20061,7 +20539,7 @@
"challengeward": 0
},
{
- "id": 1103016,
+ "id": 1103020,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20190,7 +20668,7 @@
"challengeward": 12003
},
{
- "id": 1103017,
+ "id": 1103021,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20319,7 +20797,7 @@
"challengeward": 12003
},
{
- "id": 1103018,
+ "id": 1103022,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20448,7 +20926,7 @@
"challengeward": 12003
},
{
- "id": 1103019,
+ "id": 1103023,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20577,7 +21055,7 @@
"challengeward": 12003
},
{
- "id": 1103020,
+ "id": 1103024,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20706,7 +21184,7 @@
"challengeward": 12003
},
{
- "id": 1103021,
+ "id": 1103025,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20835,7 +21313,7 @@
"challengeward": 12003
},
{
- "id": 1103022,
+ "id": 1103026,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -20964,7 +21442,7 @@
"challengeward": 12003
},
{
- "id": 1103023,
+ "id": 1103027,
"chapterid": 11003,
"group_id": 100313,
"previous_group_id": [
@@ -21093,7 +21571,7 @@
"challengeward": 12003
},
{
- "id": 1103024,
+ "id": 1103028,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21222,7 +21700,7 @@
"challengeward": 13003
},
{
- "id": 1103025,
+ "id": 1103029,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21351,7 +21829,7 @@
"challengeward": 13003
},
{
- "id": 1103026,
+ "id": 1103030,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21480,7 +21958,7 @@
"challengeward": 13003
},
{
- "id": 1103027,
+ "id": 1103031,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21609,7 +22087,7 @@
"challengeward": 13003
},
{
- "id": 1103028,
+ "id": 1103032,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21738,7 +22216,7 @@
"challengeward": 13003
},
{
- "id": 1103029,
+ "id": 1103033,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21867,7 +22345,7 @@
"challengeward": 13003
},
{
- "id": 1103030,
+ "id": 1103034,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -21996,7 +22474,7 @@
"challengeward": 13003
},
{
- "id": 1103031,
+ "id": 1103035,
"chapterid": 11003,
"group_id": 100314,
"previous_group_id": [
@@ -22125,7 +22603,7 @@
"challengeward": 13003
},
{
- "id": 1103032,
+ "id": 1103036,
"chapterid": 11003,
"group_id": 100316,
"previous_group_id": [
@@ -22206,7 +22684,7 @@
"challengeward": 0
},
{
- "id": 1103033,
+ "id": 1103037,
"chapterid": 11003,
"group_id": 100317,
"previous_group_id": [
@@ -22287,7 +22765,7 @@
"challengeward": 0
},
{
- "id": 1103034,
+ "id": 1103038,
"chapterid": 11003,
"group_id": 100318,
"previous_group_id": [
@@ -22416,7 +22894,7 @@
"challengeward": 0
},
{
- "id": 1103035,
+ "id": 1103039,
"chapterid": 11003,
"group_id": 100319,
"previous_group_id": [
@@ -22545,7 +23023,7 @@
"challengeward": 0
},
{
- "id": 1103036,
+ "id": 1103040,
"chapterid": 11003,
"group_id": 100320,
"previous_group_id": [
@@ -22626,7 +23104,7 @@
"challengeward": 0
},
{
- "id": 1103037,
+ "id": 1103041,
"chapterid": 11003,
"group_id": 100321,
"previous_group_id": [
@@ -22707,7 +23185,7 @@
"challengeward": 0
},
{
- "id": 1103038,
+ "id": 1103042,
"chapterid": 11003,
"group_id": 100322,
"previous_group_id": [
@@ -22788,7 +23266,7 @@
"challengeward": 0
},
{
- "id": 1103039,
+ "id": 1103043,
"chapterid": 11003,
"group_id": 100323,
"previous_group_id": [
@@ -22869,7 +23347,7 @@
"challengeward": 0
},
{
- "id": 1103040,
+ "id": 1103044,
"chapterid": 11003,
"group_id": 100324,
"previous_group_id": [
@@ -22950,7 +23428,7 @@
"challengeward": 0
},
{
- "id": 1103041,
+ "id": 1103045,
"chapterid": 11003,
"group_id": 100325,
"previous_group_id": [
@@ -23031,7 +23509,7 @@
"challengeward": 0
},
{
- "id": 1103042,
+ "id": 1103046,
"chapterid": 11003,
"group_id": 100326,
"previous_group_id": [
@@ -23112,7 +23590,7 @@
"challengeward": 0
},
{
- "id": 1103043,
+ "id": 1103047,
"chapterid": 11003,
"group_id": 100327,
"previous_group_id": [
@@ -23193,7 +23671,7 @@
"challengeward": 0
},
{
- "id": 1103044,
+ "id": 1103048,
"chapterid": 11003,
"group_id": 100328,
"previous_group_id": [
@@ -23274,7 +23752,7 @@
"challengeward": 0
},
{
- "id": 1103045,
+ "id": 1103049,
"chapterid": 11003,
"group_id": 100329,
"previous_group_id": [
@@ -23355,7 +23833,7 @@
"challengeward": 0
},
{
- "id": 1103046,
+ "id": 1103050,
"chapterid": 11003,
"group_id": 100330,
"previous_group_id": [
@@ -23436,7 +23914,7 @@
"challengeward": 0
},
{
- "id": 1103047,
+ "id": 1103051,
"chapterid": 11003,
"group_id": 100331,
"previous_group_id": [
@@ -23517,7 +23995,7 @@
"challengeward": 0
},
{
- "id": 1103048,
+ "id": 1103052,
"chapterid": 11003,
"group_id": 100332,
"previous_group_id": [
@@ -23598,7 +24076,7 @@
"challengeward": 0
},
{
- "id": 1103049,
+ "id": 1103053,
"chapterid": 11003,
"group_id": 100333,
"previous_group_id": [
@@ -23727,7 +24205,7 @@
"challengeward": 0
},
{
- "id": 1103050,
+ "id": 1103054,
"chapterid": 11003,
"group_id": 100334,
"previous_group_id": [
@@ -23808,7 +24286,7 @@
"challengeward": 0
},
{
- "id": 1103051,
+ "id": 1103055,
"chapterid": 11003,
"group_id": 100335,
"previous_group_id": [
@@ -23889,7 +24367,7 @@
"challengeward": 0
},
{
- "id": 1103052,
+ "id": 1103056,
"chapterid": 11003,
"group_id": 100336,
"previous_group_id": [
@@ -24018,7 +24496,7 @@
"challengeward": 0
},
{
- "id": 1103053,
+ "id": 1103057,
"chapterid": 11003,
"group_id": 100337,
"previous_group_id": [
@@ -24099,7 +24577,7 @@
"challengeward": 0
},
{
- "id": 1103054,
+ "id": 1103058,
"chapterid": 11003,
"group_id": 100338,
"previous_group_id": [
@@ -24180,7 +24658,7 @@
"challengeward": 0
},
{
- "id": 1103055,
+ "id": 1103059,
"chapterid": 11003,
"group_id": 100339,
"previous_group_id": [
@@ -24309,7 +24787,7 @@
"challengeward": 0
},
{
- "id": 1103056,
+ "id": 1103060,
"chapterid": 11003,
"group_id": 100340,
"previous_group_id": [
@@ -24390,7 +24868,7 @@
"challengeward": 0
},
{
- "id": 1103057,
+ "id": 1103061,
"chapterid": 11003,
"group_id": 100341,
"previous_group_id": [
@@ -24474,7 +24952,7 @@
"challengeward": 0
},
{
- "id": 1103058,
+ "id": 1103062,
"chapterid": 11003,
"group_id": 100342,
"previous_group_id": [
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index 5f1046d06..888a983b1 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -7524,6 +7524,41 @@
"z": 1
}
},
+ {
+ "id": "83008",
+ "preson": "83008",
+ "presonshow": "83008_exhibition",
+ "presonstory": "83008_story",
+ "presondraw": "",
+ "height": 1,
+ "weight": 1,
+ "ico": "tx_js_83008",
+ "fight": "tx_js_83008",
+ "img": "sbkp_js_83008",
+ "heroimg": "hbkp_js_83008",
+ "portrait": "zm_img_83008",
+ "bust": "bust_83008",
+ "postxyz": [
+ 0,
+ 0,
+ 0
+ ],
+ "rotation": {
+ "x": 0,
+ "y": 180,
+ "z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
+ }
+ },
{
"id": "85001",
"preson": "85001",
diff --git a/bin/json/game_monster.json b/bin/json/game_monster.json
index 8410133c7..70fe66fe9 100644
--- a/bin/json/game_monster.json
+++ b/bin/json/game_monster.json
@@ -7829,11 +7829,101 @@
"skill3": 1,
"speed": 241
},
+ {
+ "monster_id": 510541,
+ "hero_id": "51054",
+ "name": {
+ "key": "monster_monster_name_523",
+ "text": "豚鼠灵"
+ },
+ "star": 1,
+ "equip2": 10,
+ "equip4": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 166
+ },
+ {
+ "monster_id": 510542,
+ "hero_id": "51054",
+ "name": {
+ "key": "monster_monster_name_524",
+ "text": "豚鼠灵"
+ },
+ "star": 2,
+ "equip2": 10,
+ "equip4": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 181
+ },
+ {
+ "monster_id": 510543,
+ "hero_id": "51054",
+ "name": {
+ "key": "monster_monster_name_525",
+ "text": "豚鼠灵"
+ },
+ "star": 3,
+ "equip2": 10,
+ "equip4": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 196
+ },
+ {
+ "monster_id": 510544,
+ "hero_id": "51054",
+ "name": {
+ "key": "monster_monster_name_526",
+ "text": "豚鼠灵"
+ },
+ "star": 4,
+ "equip2": 10,
+ "equip4": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 211
+ },
+ {
+ "monster_id": 510545,
+ "hero_id": "51054",
+ "name": {
+ "key": "monster_monster_name_527",
+ "text": "豚鼠灵"
+ },
+ "star": 5,
+ "equip2": 10,
+ "equip4": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 226
+ },
+ {
+ "monster_id": 510546,
+ "hero_id": "51054",
+ "name": {
+ "key": "monster_monster_name_528",
+ "text": "豚鼠灵"
+ },
+ "star": 6,
+ "equip2": 10,
+ "equip4": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 241
+ },
{
"monster_id": 530011,
"hero_id": "53001",
"name": {
- "key": "monster_monster_name_523",
+ "key": "monster_monster_name_529",
"text": "埃雷特"
},
"star": 1,
@@ -7848,7 +7938,7 @@
"monster_id": 530012,
"hero_id": "53001",
"name": {
- "key": "monster_monster_name_524",
+ "key": "monster_monster_name_530",
"text": "埃雷特"
},
"star": 2,
@@ -7863,7 +7953,7 @@
"monster_id": 530013,
"hero_id": "53001",
"name": {
- "key": "monster_monster_name_525",
+ "key": "monster_monster_name_531",
"text": "埃雷特"
},
"star": 3,
@@ -7878,7 +7968,7 @@
"monster_id": 530014,
"hero_id": "53001",
"name": {
- "key": "monster_monster_name_526",
+ "key": "monster_monster_name_532",
"text": "埃雷特"
},
"star": 4,
@@ -7893,7 +7983,7 @@
"monster_id": 530015,
"hero_id": "53001",
"name": {
- "key": "monster_monster_name_527",
+ "key": "monster_monster_name_533",
"text": "埃雷特"
},
"star": 5,
@@ -7908,7 +7998,7 @@
"monster_id": 530016,
"hero_id": "53001",
"name": {
- "key": "monster_monster_name_528",
+ "key": "monster_monster_name_534",
"text": "埃雷特"
},
"star": 6,
@@ -7923,7 +8013,7 @@
"monster_id": 530021,
"hero_id": "53002",
"name": {
- "key": "monster_monster_name_529",
+ "key": "monster_monster_name_535",
"text": "豺狼头领"
},
"star": 1,
@@ -7938,7 +8028,7 @@
"monster_id": 530022,
"hero_id": "53002",
"name": {
- "key": "monster_monster_name_530",
+ "key": "monster_monster_name_536",
"text": "豺狼头领"
},
"star": 2,
@@ -7953,7 +8043,7 @@
"monster_id": 530023,
"hero_id": "53002",
"name": {
- "key": "monster_monster_name_531",
+ "key": "monster_monster_name_537",
"text": "豺狼头领"
},
"star": 3,
@@ -7968,7 +8058,7 @@
"monster_id": 530024,
"hero_id": "53002",
"name": {
- "key": "monster_monster_name_532",
+ "key": "monster_monster_name_538",
"text": "豺狼头领"
},
"star": 4,
@@ -7983,7 +8073,7 @@
"monster_id": 530025,
"hero_id": "53002",
"name": {
- "key": "monster_monster_name_533",
+ "key": "monster_monster_name_539",
"text": "豺狼头领"
},
"star": 5,
@@ -7998,7 +8088,7 @@
"monster_id": 530026,
"hero_id": "53002",
"name": {
- "key": "monster_monster_name_534",
+ "key": "monster_monster_name_540",
"text": "豺狼头领"
},
"star": 6,
@@ -8013,7 +8103,7 @@
"monster_id": 530031,
"hero_id": "53003",
"name": {
- "key": "monster_monster_name_535",
+ "key": "monster_monster_name_541",
"text": "豪猪大师（翡翠僵尸）"
},
"star": 1,
@@ -8028,7 +8118,7 @@
"monster_id": 530032,
"hero_id": "53003",
"name": {
- "key": "monster_monster_name_536",
+ "key": "monster_monster_name_542",
"text": "豪猪大师（翡翠僵尸）"
},
"star": 2,
@@ -8043,7 +8133,7 @@
"monster_id": 530033,
"hero_id": "53003",
"name": {
- "key": "monster_monster_name_537",
+ "key": "monster_monster_name_543",
"text": "豪猪大师（翡翠僵尸）"
},
"star": 3,
@@ -8058,7 +8148,7 @@
"monster_id": 530034,
"hero_id": "53003",
"name": {
- "key": "monster_monster_name_538",
+ "key": "monster_monster_name_544",
"text": "豪猪大师（翡翠僵尸）"
},
"star": 4,
@@ -8073,7 +8163,7 @@
"monster_id": 530035,
"hero_id": "53003",
"name": {
- "key": "monster_monster_name_539",
+ "key": "monster_monster_name_545",
"text": "豪猪大师（翡翠僵尸）"
},
"star": 5,
@@ -8088,7 +8178,7 @@
"monster_id": 530036,
"hero_id": "53003",
"name": {
- "key": "monster_monster_name_540",
+ "key": "monster_monster_name_546",
"text": "豪猪大师（翡翠僵尸）"
},
"star": 6,
@@ -8103,7 +8193,7 @@
"monster_id": 530041,
"hero_id": "53004",
"name": {
- "key": "monster_monster_name_541",
+ "key": "monster_monster_name_547",
"text": "双獾大师（翡翠僵尸）"
},
"star": 1,
@@ -8118,7 +8208,7 @@
"monster_id": 530042,
"hero_id": "53004",
"name": {
- "key": "monster_monster_name_542",
+ "key": "monster_monster_name_548",
"text": "双獾大师（翡翠僵尸）"
},
"star": 2,
@@ -8133,7 +8223,7 @@
"monster_id": 530043,
"hero_id": "53004",
"name": {
- "key": "monster_monster_name_543",
+ "key": "monster_monster_name_549",
"text": "双獾大师（翡翠僵尸）"
},
"star": 3,
@@ -8148,7 +8238,7 @@
"monster_id": 530044,
"hero_id": "53004",
"name": {
- "key": "monster_monster_name_544",
+ "key": "monster_monster_name_550",
"text": "双獾大师（翡翠僵尸）"
},
"star": 4,
@@ -8163,7 +8253,7 @@
"monster_id": 530045,
"hero_id": "53004",
"name": {
- "key": "monster_monster_name_545",
+ "key": "monster_monster_name_551",
"text": "双獾大师（翡翠僵尸）"
},
"star": 5,
@@ -8178,7 +8268,7 @@
"monster_id": 530046,
"hero_id": "53004",
"name": {
- "key": "monster_monster_name_546",
+ "key": "monster_monster_name_552",
"text": "双獾大师（翡翠僵尸）"
},
"star": 6,
@@ -8193,7 +8283,7 @@
"monster_id": 530051,
"hero_id": "53005",
"name": {
- "key": "monster_monster_name_547",
+ "key": "monster_monster_name_553",
"text": "小猴子首领"
},
"star": 1,
@@ -8208,7 +8298,7 @@
"monster_id": 530052,
"hero_id": "53005",
"name": {
- "key": "monster_monster_name_548",
+ "key": "monster_monster_name_554",
"text": "小猴子首领"
},
"star": 2,
@@ -8223,7 +8313,7 @@
"monster_id": 530053,
"hero_id": "53005",
"name": {
- "key": "monster_monster_name_549",
+ "key": "monster_monster_name_555",
"text": "小猴子首领"
},
"star": 3,
@@ -8238,7 +8328,7 @@
"monster_id": 530054,
"hero_id": "53005",
"name": {
- "key": "monster_monster_name_550",
+ "key": "monster_monster_name_556",
"text": "小猴子首领"
},
"star": 4,
@@ -8253,7 +8343,7 @@
"monster_id": 530055,
"hero_id": "53005",
"name": {
- "key": "monster_monster_name_551",
+ "key": "monster_monster_name_557",
"text": "小猴子首领"
},
"star": 5,
@@ -8268,7 +8358,7 @@
"monster_id": 530056,
"hero_id": "53005",
"name": {
- "key": "monster_monster_name_552",
+ "key": "monster_monster_name_558",
"text": "小猴子首领"
},
"star": 6,
@@ -8283,7 +8373,7 @@
"monster_id": 530061,
"hero_id": "53006",
"name": {
- "key": "monster_monster_name_553",
+ "key": "monster_monster_name_559",
"text": "巨怪首领"
},
"star": 1,
@@ -8298,7 +8388,7 @@
"monster_id": 530062,
"hero_id": "53006",
"name": {
- "key": "monster_monster_name_554",
+ "key": "monster_monster_name_560",
"text": "巨怪首领"
},
"star": 2,
@@ -8313,7 +8403,7 @@
"monster_id": 530063,
"hero_id": "53006",
"name": {
- "key": "monster_monster_name_555",
+ "key": "monster_monster_name_561",
"text": "巨怪首领"
},
"star": 3,
@@ -8328,7 +8418,7 @@
"monster_id": 530064,
"hero_id": "53006",
"name": {
- "key": "monster_monster_name_556",
+ "key": "monster_monster_name_562",
"text": "巨怪首领"
},
"star": 4,
@@ -8343,7 +8433,7 @@
"monster_id": 530065,
"hero_id": "53006",
"name": {
- "key": "monster_monster_name_557",
+ "key": "monster_monster_name_563",
"text": "巨怪首领"
},
"star": 5,
@@ -8358,7 +8448,7 @@
"monster_id": 530066,
"hero_id": "53006",
"name": {
- "key": "monster_monster_name_558",
+ "key": "monster_monster_name_564",
"text": "巨怪首领"
},
"star": 6,
@@ -8373,7 +8463,7 @@
"monster_id": 540011,
"hero_id": "54001",
"name": {
- "key": "monster_monster_name_559",
+ "key": "monster_monster_name_565",
"text": "致命纳得"
},
"star": 1,
@@ -8388,7 +8478,7 @@
"monster_id": 540012,
"hero_id": "54001",
"name": {
- "key": "monster_monster_name_560",
+ "key": "monster_monster_name_566",
"text": "致命纳得"
},
"star": 2,
@@ -8403,7 +8493,7 @@
"monster_id": 540013,
"hero_id": "54001",
"name": {
- "key": "monster_monster_name_561",
+ "key": "monster_monster_name_567",
"text": "致命纳得"
},
"star": 3,
@@ -8418,7 +8508,7 @@
"monster_id": 540014,
"hero_id": "54001",
"name": {
- "key": "monster_monster_name_562",
+ "key": "monster_monster_name_568",
"text": "致命纳得"
},
"star": 4,
@@ -8433,7 +8523,7 @@
"monster_id": 540015,
"hero_id": "54001",
"name": {
- "key": "monster_monster_name_563",
+ "key": "monster_monster_name_569",
"text": "致命纳得"
},
"star": 5,
@@ -8448,7 +8538,7 @@
"monster_id": 540016,
"hero_id": "54001",
"name": {
- "key": "monster_monster_name_564",
+ "key": "monster_monster_name_570",
"text": "致命纳得"
},
"star": 6,
@@ -8463,7 +8553,7 @@
"monster_id": 550011,
"hero_id": "55001",
"name": {
- "key": "monster_monster_name_565",
+ "key": "monster_monster_name_571",
"text": "火龙"
},
"star": 1,
@@ -8478,7 +8568,7 @@
"monster_id": 550012,
"hero_id": "55001",
"name": {
- "key": "monster_monster_name_566",
+ "key": "monster_monster_name_572",
"text": "火龙"
},
"star": 2,
@@ -8493,7 +8583,7 @@
"monster_id": 550013,
"hero_id": "55001",
"name": {
- "key": "monster_monster_name_567",
+ "key": "monster_monster_name_573",
"text": "火龙"
},
"star": 3,
@@ -8508,7 +8598,7 @@
"monster_id": 550014,
"hero_id": "55001",
"name": {
- "key": "monster_monster_name_568",
+ "key": "monster_monster_name_574",
"text": "火龙"
},
"star": 4,
@@ -8523,7 +8613,7 @@
"monster_id": 550015,
"hero_id": "55001",
"name": {
- "key": "monster_monster_name_569",
+ "key": "monster_monster_name_575",
"text": "火龙"
},
"star": 5,
@@ -8538,7 +8628,7 @@
"monster_id": 550016,
"hero_id": "55001",
"name": {
- "key": "monster_monster_name_570",
+ "key": "monster_monster_name_576",
"text": "火龙"
},
"star": 6,
@@ -8553,7 +8643,7 @@
"monster_id": 550021,
"hero_id": "55002",
"name": {
- "key": "monster_monster_name_571",
+ "key": "monster_monster_name_577",
"text": "巨型猩猩怪兽"
},
"star": 1,
@@ -8568,7 +8658,7 @@
"monster_id": 550022,
"hero_id": "55002",
"name": {
- "key": "monster_monster_name_572",
+ "key": "monster_monster_name_578",
"text": "巨型猩猩怪兽"
},
"star": 2,
@@ -8583,7 +8673,7 @@
"monster_id": 550023,
"hero_id": "55002",
"name": {
- "key": "monster_monster_name_573",
+ "key": "monster_monster_name_579",
"text": "巨型猩猩怪兽"
},
"star": 3,
@@ -8598,7 +8688,7 @@
"monster_id": 550024,
"hero_id": "55002",
"name": {
- "key": "monster_monster_name_574",
+ "key": "monster_monster_name_580",
"text": "巨型猩猩怪兽"
},
"star": 4,
@@ -8613,7 +8703,7 @@
"monster_id": 550025,
"hero_id": "55002",
"name": {
- "key": "monster_monster_name_575",
+ "key": "monster_monster_name_581",
"text": "巨型猩猩怪兽"
},
"star": 5,
@@ -8628,7 +8718,7 @@
"monster_id": 550026,
"hero_id": "55002",
"name": {
- "key": "monster_monster_name_576",
+ "key": "monster_monster_name_582",
"text": "巨型猩猩怪兽"
},
"star": 6,
@@ -8643,7 +8733,7 @@
"monster_id": 550031,
"hero_id": "55003",
"name": {
- "key": "monster_monster_name_577",
+ "key": "monster_monster_name_583",
"text": "黑龙王"
},
"star": 1,
@@ -8658,7 +8748,7 @@
"monster_id": 550032,
"hero_id": "55003",
"name": {
- "key": "monster_monster_name_578",
+ "key": "monster_monster_name_584",
"text": "黑龙王"
},
"star": 2,
@@ -8673,7 +8763,7 @@
"monster_id": 550033,
"hero_id": "55003",
"name": {
- "key": "monster_monster_name_579",
+ "key": "monster_monster_name_585",
"text": "黑龙王"
},
"star": 3,
@@ -8688,7 +8778,7 @@
"monster_id": 550034,
"hero_id": "55003",
"name": {
- "key": "monster_monster_name_580",
+ "key": "monster_monster_name_586",
"text": "黑龙王"
},
"star": 4,
@@ -8703,7 +8793,7 @@
"monster_id": 550035,
"hero_id": "55003",
"name": {
- "key": "monster_monster_name_581",
+ "key": "monster_monster_name_587",
"text": "黑龙王"
},
"star": 5,
@@ -8718,7 +8808,7 @@
"monster_id": 550036,
"hero_id": "55003",
"name": {
- "key": "monster_monster_name_582",
+ "key": "monster_monster_name_588",
"text": "黑龙王"
},
"star": 6,
@@ -8733,7 +8823,7 @@
"monster_id": 550041,
"hero_id": "55004",
"name": {
- "key": "monster_monster_name_583",
+ "key": "monster_monster_name_589",
"text": "大厨"
},
"star": 1,
@@ -8748,7 +8838,7 @@
"monster_id": 550042,
"hero_id": "55004",
"name": {
- "key": "monster_monster_name_584",
+ "key": "monster_monster_name_590",
"text": "大厨"
},
"star": 2,
@@ -8763,7 +8853,7 @@
"monster_id": 550043,
"hero_id": "55004",
"name": {
- "key": "monster_monster_name_585",
+ "key": "monster_monster_name_591",
"text": "大厨"
},
"star": 3,
@@ -8778,7 +8868,7 @@
"monster_id": 550044,
"hero_id": "55004",
"name": {
- "key": "monster_monster_name_586",
+ "key": "monster_monster_name_592",
"text": "大厨"
},
"star": 4,
@@ -8793,7 +8883,7 @@
"monster_id": 550045,
"hero_id": "55004",
"name": {
- "key": "monster_monster_name_587",
+ "key": "monster_monster_name_593",
"text": "大厨"
},
"star": 5,
@@ -8808,7 +8898,7 @@
"monster_id": 550046,
"hero_id": "55004",
"name": {
- "key": "monster_monster_name_588",
+ "key": "monster_monster_name_594",
"text": "大厨"
},
"star": 6,
@@ -8823,7 +8913,7 @@
"monster_id": 550051,
"hero_id": "55005",
"name": {
- "key": "monster_monster_name_589",
+ "key": "monster_monster_name_595",
"text": "火焰泰坦"
},
"star": 1,
@@ -8838,7 +8928,7 @@
"monster_id": 550052,
"hero_id": "55005",
"name": {
- "key": "monster_monster_name_590",
+ "key": "monster_monster_name_596",
"text": "火焰泰坦"
},
"star": 2,
@@ -8853,7 +8943,7 @@
"monster_id": 550053,
"hero_id": "55005",
"name": {
- "key": "monster_monster_name_591",
+ "key": "monster_monster_name_597",
"text": "火焰泰坦"
},
"star": 3,
@@ -8868,7 +8958,7 @@
"monster_id": 550054,
"hero_id": "55005",
"name": {
- "key": "monster_monster_name_592",
+ "key": "monster_monster_name_598",
"text": "火焰泰坦"
},
"star": 4,
@@ -8883,7 +8973,7 @@
"monster_id": 550055,
"hero_id": "55005",
"name": {
- "key": "monster_monster_name_593",
+ "key": "monster_monster_name_599",
"text": "火焰泰坦"
},
"star": 5,
@@ -8898,7 +8988,7 @@
"monster_id": 550056,
"hero_id": "55005",
"name": {
- "key": "monster_monster_name_594",
+ "key": "monster_monster_name_600",
"text": "火焰泰坦"
},
"star": 6,
@@ -8913,7 +9003,7 @@
"monster_id": 550061,
"hero_id": "55006",
"name": {
- "key": "monster_monster_name_595",
+ "key": "monster_monster_name_601",
"text": "森林泰坦"
},
"star": 1,
@@ -8928,7 +9018,7 @@
"monster_id": 550062,
"hero_id": "55006",
"name": {
- "key": "monster_monster_name_596",
+ "key": "monster_monster_name_602",
"text": "森林泰坦"
},
"star": 2,
@@ -8943,7 +9033,7 @@
"monster_id": 550063,
"hero_id": "55006",
"name": {
- "key": "monster_monster_name_597",
+ "key": "monster_monster_name_603",
"text": "森林泰坦"
},
"star": 3,
@@ -8958,7 +9048,7 @@
"monster_id": 550064,
"hero_id": "55006",
"name": {
- "key": "monster_monster_name_598",
+ "key": "monster_monster_name_604",
"text": "森林泰坦"
},
"star": 4,
@@ -8973,7 +9063,7 @@
"monster_id": 550065,
"hero_id": "55006",
"name": {
- "key": "monster_monster_name_599",
+ "key": "monster_monster_name_605",
"text": "森林泰坦"
},
"star": 5,
@@ -8988,7 +9078,7 @@
"monster_id": 550066,
"hero_id": "55006",
"name": {
- "key": "monster_monster_name_600",
+ "key": "monster_monster_name_606",
"text": "森林泰坦"
},
"star": 6,
@@ -9003,7 +9093,7 @@
"monster_id": 550071,
"hero_id": "55007",
"name": {
- "key": "monster_monster_name_601",
+ "key": "monster_monster_name_607",
"text": "冰霜泰坦"
},
"star": 1,
@@ -9018,7 +9108,7 @@
"monster_id": 550072,
"hero_id": "55007",
"name": {
- "key": "monster_monster_name_602",
+ "key": "monster_monster_name_608",
"text": "冰霜泰坦"
},
"star": 2,
@@ -9033,7 +9123,7 @@
"monster_id": 550073,
"hero_id": "55007",
"name": {
- "key": "monster_monster_name_603",
+ "key": "monster_monster_name_609",
"text": "冰霜泰坦"
},
"star": 3,
@@ -9048,7 +9138,7 @@
"monster_id": 550074,
"hero_id": "55007",
"name": {
- "key": "monster_monster_name_604",
+ "key": "monster_monster_name_610",
"text": "冰霜泰坦"
},
"star": 4,
@@ -9063,7 +9153,7 @@
"monster_id": 550075,
"hero_id": "55007",
"name": {
- "key": "monster_monster_name_605",
+ "key": "monster_monster_name_611",
"text": "冰霜泰坦"
},
"star": 5,
@@ -9078,7 +9168,7 @@
"monster_id": 550076,
"hero_id": "55007",
"name": {
- "key": "monster_monster_name_606",
+ "key": "monster_monster_name_612",
"text": "冰霜泰坦"
},
"star": 6,
@@ -9093,7 +9183,7 @@
"monster_id": 630021,
"hero_id": "63002",
"name": {
- "key": "monster_monster_name_607",
+ "key": "monster_monster_name_613",
"text": "黑化食人鱼先生"
},
"star": 1,
@@ -9108,7 +9198,7 @@
"monster_id": 630022,
"hero_id": "63002",
"name": {
- "key": "monster_monster_name_608",
+ "key": "monster_monster_name_614",
"text": "黑化食人鱼先生"
},
"star": 2,
@@ -9123,7 +9213,7 @@
"monster_id": 630023,
"hero_id": "63002",
"name": {
- "key": "monster_monster_name_609",
+ "key": "monster_monster_name_615",
"text": "黑化食人鱼先生"
},
"star": 3,
@@ -9138,7 +9228,7 @@
"monster_id": 630024,
"hero_id": "63002",
"name": {
- "key": "monster_monster_name_610",
+ "key": "monster_monster_name_616",
"text": "黑化食人鱼先生"
},
"star": 4,
@@ -9153,7 +9243,7 @@
"monster_id": 630025,
"hero_id": "63002",
"name": {
- "key": "monster_monster_name_611",
+ "key": "monster_monster_name_617",
"text": "黑化食人鱼先生"
},
"star": 5,
@@ -9168,7 +9258,7 @@
"monster_id": 630026,
"hero_id": "63002",
"name": {
- "key": "monster_monster_name_612",
+ "key": "monster_monster_name_618",
"text": "黑化食人鱼先生"
},
"star": 6,
@@ -9183,7 +9273,7 @@
"monster_id": 630031,
"hero_id": "63003",
"name": {
- "key": "monster_monster_name_613",
+ "key": "monster_monster_name_619",
"text": "黑化啊啊"
},
"star": 1,
@@ -9198,7 +9288,7 @@
"monster_id": 630032,
"hero_id": "63003",
"name": {
- "key": "monster_monster_name_614",
+ "key": "monster_monster_name_620",
"text": "黑化啊啊"
},
"star": 2,
@@ -9213,7 +9303,7 @@
"monster_id": 630033,
"hero_id": "63003",
"name": {
- "key": "monster_monster_name_615",
+ "key": "monster_monster_name_621",
"text": "黑化啊啊"
},
"star": 3,
@@ -9228,7 +9318,7 @@
"monster_id": 630034,
"hero_id": "63003",
"name": {
- "key": "monster_monster_name_616",
+ "key": "monster_monster_name_622",
"text": "黑化啊啊"
},
"star": 4,
@@ -9243,7 +9333,7 @@
"monster_id": 630035,
"hero_id": "63003",
"name": {
- "key": "monster_monster_name_617",
+ "key": "monster_monster_name_623",
"text": "黑化啊啊"
},
"star": 5,
@@ -9258,7 +9348,7 @@
"monster_id": 630036,
"hero_id": "63003",
"name": {
- "key": "monster_monster_name_618",
+ "key": "monster_monster_name_624",
"text": "黑化啊啊"
},
"star": 6,
@@ -9273,7 +9363,7 @@
"monster_id": 630041,
"hero_id": "63004",
"name": {
- "key": "monster_monster_name_619",
+ "key": "monster_monster_name_625",
"text": "黑化法夸德勋爵"
},
"star": 1,
@@ -9288,7 +9378,7 @@
"monster_id": 630042,
"hero_id": "63004",
"name": {
- "key": "monster_monster_name_620",
+ "key": "monster_monster_name_626",
"text": "黑化法夸德勋爵"
},
"star": 2,
@@ -9303,7 +9393,7 @@
"monster_id": 630043,
"hero_id": "63004",
"name": {
- "key": "monster_monster_name_621",
+ "key": "monster_monster_name_627",
"text": "黑化法夸德勋爵"
},
"star": 3,
@@ -9318,7 +9408,7 @@
"monster_id": 630044,
"hero_id": "63004",
"name": {
- "key": "monster_monster_name_622",
+ "key": "monster_monster_name_628",
"text": "黑化法夸德勋爵"
},
"star": 4,
@@ -9333,7 +9423,7 @@
"monster_id": 630045,
"hero_id": "63004",
"name": {
- "key": "monster_monster_name_623",
+ "key": "monster_monster_name_629",
"text": "黑化法夸德勋爵"
},
"star": 5,
@@ -9348,7 +9438,7 @@
"monster_id": 630046,
"hero_id": "63004",
"name": {
- "key": "monster_monster_name_624",
+ "key": "monster_monster_name_630",
"text": "黑化法夸德勋爵"
},
"star": 6,
@@ -9363,7 +9453,7 @@
"monster_id": 640031,
"hero_id": "64003",
"name": {
- "key": "monster_monster_name_625",
+ "key": "monster_monster_name_631",
"text": "黑化亚丝翠"
},
"star": 1,
@@ -9378,7 +9468,7 @@
"monster_id": 640032,
"hero_id": "64003",
"name": {
- "key": "monster_monster_name_626",
+ "key": "monster_monster_name_632",
"text": "黑化亚丝翠"
},
"star": 2,
@@ -9393,7 +9483,7 @@
"monster_id": 640033,
"hero_id": "64003",
"name": {
- "key": "monster_monster_name_627",
+ "key": "monster_monster_name_633",
"text": "黑化亚丝翠"
},
"star": 3,
@@ -9408,7 +9498,7 @@
"monster_id": 640034,
"hero_id": "64003",
"name": {
- "key": "monster_monster_name_628",
+ "key": "monster_monster_name_634",
"text": "黑化亚丝翠"
},
"star": 4,
@@ -9423,7 +9513,7 @@
"monster_id": 640035,
"hero_id": "64003",
"name": {
- "key": "monster_monster_name_629",
+ "key": "monster_monster_name_635",
"text": "黑化亚丝翠"
},
"star": 5,
@@ -9438,7 +9528,7 @@
"monster_id": 640036,
"hero_id": "64003",
"name": {
- "key": "monster_monster_name_630",
+ "key": "monster_monster_name_636",
"text": "黑化亚丝翠"
},
"star": 6,
@@ -9453,7 +9543,7 @@
"monster_id": 740021,
"hero_id": "74002",
"name": {
- "key": "monster_monster_name_631",
+ "key": "monster_monster_name_637",
"text": "黑化牙仙"
},
"star": 1,
@@ -9468,7 +9558,7 @@
"monster_id": 740022,
"hero_id": "74002",
"name": {
- "key": "monster_monster_name_632",
+ "key": "monster_monster_name_638",
"text": "黑化牙仙"
},
"star": 2,
@@ -9483,7 +9573,7 @@
"monster_id": 740023,
"hero_id": "74002",
"name": {
- "key": "monster_monster_name_633",
+ "key": "monster_monster_name_639",
"text": "黑化牙仙"
},
"star": 3,
@@ -9498,7 +9588,7 @@
"monster_id": 740024,
"hero_id": "74002",
"name": {
- "key": "monster_monster_name_634",
+ "key": "monster_monster_name_640",
"text": "黑化牙仙"
},
"star": 4,
@@ -9513,7 +9603,7 @@
"monster_id": 740025,
"hero_id": "74002",
"name": {
- "key": "monster_monster_name_635",
+ "key": "monster_monster_name_641",
"text": "黑化牙仙"
},
"star": 5,
@@ -9528,7 +9618,7 @@
"monster_id": 740026,
"hero_id": "74002",
"name": {
- "key": "monster_monster_name_636",
+ "key": "monster_monster_name_642",
"text": "黑化牙仙"
},
"star": 6,
@@ -9543,7 +9633,7 @@
"monster_id": 740031,
"hero_id": "74003",
"name": {
- "key": "monster_monster_name_637",
+ "key": "monster_monster_name_643",
"text": "黑化睡神沙人"
},
"star": 1,
@@ -9558,7 +9648,7 @@
"monster_id": 740032,
"hero_id": "74003",
"name": {
- "key": "monster_monster_name_638",
+ "key": "monster_monster_name_644",
"text": "黑化睡神沙人"
},
"star": 2,
@@ -9573,7 +9663,7 @@
"monster_id": 740033,
"hero_id": "74003",
"name": {
- "key": "monster_monster_name_639",
+ "key": "monster_monster_name_645",
"text": "黑化睡神沙人"
},
"star": 3,
@@ -9588,7 +9678,7 @@
"monster_id": 740034,
"hero_id": "74003",
"name": {
- "key": "monster_monster_name_640",
+ "key": "monster_monster_name_646",
"text": "黑化睡神沙人"
},
"star": 4,
@@ -9603,7 +9693,7 @@
"monster_id": 740035,
"hero_id": "74003",
"name": {
- "key": "monster_monster_name_641",
+ "key": "monster_monster_name_647",
"text": "黑化睡神沙人"
},
"star": 5,
@@ -9618,7 +9708,7 @@
"monster_id": 740036,
"hero_id": "74003",
"name": {
- "key": "monster_monster_name_642",
+ "key": "monster_monster_name_648",
"text": "黑化睡神沙人"
},
"star": 6,
@@ -9633,7 +9723,7 @@
"monster_id": 740041,
"hero_id": "74004",
"name": {
- "key": "monster_monster_name_643",
+ "key": "monster_monster_name_649",
"text": "黑化邦尼兔"
},
"star": 1,
@@ -9648,7 +9738,7 @@
"monster_id": 740042,
"hero_id": "74004",
"name": {
- "key": "monster_monster_name_644",
+ "key": "monster_monster_name_650",
"text": "黑化邦尼兔"
},
"star": 2,
@@ -9663,7 +9753,7 @@
"monster_id": 740043,
"hero_id": "74004",
"name": {
- "key": "monster_monster_name_645",
+ "key": "monster_monster_name_651",
"text": "黑化邦尼兔"
},
"star": 3,
@@ -9678,7 +9768,7 @@
"monster_id": 740044,
"hero_id": "74004",
"name": {
- "key": "monster_monster_name_646",
+ "key": "monster_monster_name_652",
"text": "黑化邦尼兔"
},
"star": 4,
@@ -9693,7 +9783,7 @@
"monster_id": 740045,
"hero_id": "74004",
"name": {
- "key": "monster_monster_name_647",
+ "key": "monster_monster_name_653",
"text": "黑化邦尼兔"
},
"star": 5,
@@ -9708,7 +9798,7 @@
"monster_id": 740046,
"hero_id": "74004",
"name": {
- "key": "monster_monster_name_648",
+ "key": "monster_monster_name_654",
"text": "黑化邦尼兔"
},
"star": 6,
@@ -9723,7 +9813,7 @@
"monster_id": 830021,
"hero_id": "83002",
"name": {
- "key": "monster_monster_name_649",
+ "key": "monster_monster_name_655",
"text": "黑化坦克"
},
"star": 1,
@@ -9738,7 +9828,7 @@
"monster_id": 830022,
"hero_id": "83002",
"name": {
- "key": "monster_monster_name_650",
+ "key": "monster_monster_name_656",
"text": "黑化坦克"
},
"star": 2,
@@ -9753,7 +9843,7 @@
"monster_id": 830023,
"hero_id": "83002",
"name": {
- "key": "monster_monster_name_651",
+ "key": "monster_monster_name_657",
"text": "黑化坦克"
},
"star": 3,
@@ -9768,7 +9858,7 @@
"monster_id": 830024,
"hero_id": "83002",
"name": {
- "key": "monster_monster_name_652",
+ "key": "monster_monster_name_658",
"text": "黑化坦克"
},
"star": 4,
@@ -9783,7 +9873,7 @@
"monster_id": 830025,
"hero_id": "83002",
"name": {
- "key": "monster_monster_name_653",
+ "key": "monster_monster_name_659",
"text": "黑化坦克"
},
"star": 5,
@@ -9798,7 +9888,7 @@
"monster_id": 830026,
"hero_id": "83002",
"name": {
- "key": "monster_monster_name_654",
+ "key": "monster_monster_name_660",
"text": "黑化坦克"
},
"star": 6,
@@ -9813,7 +9903,7 @@
"monster_id": 830061,
"hero_id": "83006",
"name": {
- "key": "monster_monster_name_655",
+ "key": "monster_monster_name_661",
"text": "黑化珍妮丝·邓普顿"
},
"star": 1,
@@ -9828,7 +9918,7 @@
"monster_id": 830062,
"hero_id": "83006",
"name": {
- "key": "monster_monster_name_656",
+ "key": "monster_monster_name_662",
"text": "黑化珍妮丝·邓普顿"
},
"star": 2,
@@ -9843,7 +9933,7 @@
"monster_id": 830063,
"hero_id": "83006",
"name": {
- "key": "monster_monster_name_657",
+ "key": "monster_monster_name_663",
"text": "黑化珍妮丝·邓普顿"
},
"star": 3,
@@ -9858,7 +9948,7 @@
"monster_id": 830064,
"hero_id": "83006",
"name": {
- "key": "monster_monster_name_658",
+ "key": "monster_monster_name_664",
"text": "黑化珍妮丝·邓普顿"
},
"star": 4,
@@ -9873,7 +9963,7 @@
"monster_id": 830065,
"hero_id": "83006",
"name": {
- "key": "monster_monster_name_659",
+ "key": "monster_monster_name_665",
"text": "黑化珍妮丝·邓普顿"
},
"star": 5,
@@ -9888,7 +9978,7 @@
"monster_id": 830066,
"hero_id": "83006",
"name": {
- "key": "monster_monster_name_660",
+ "key": "monster_monster_name_666",
"text": "黑化珍妮丝·邓普顿"
},
"star": 6,
@@ -9903,7 +9993,7 @@
"monster_id": 840021,
"hero_id": "84002",
"name": {
- "key": "monster_monster_name_661",
+ "key": "monster_monster_name_667",
"text": "黑化蒂姆·邓普顿"
},
"star": 1,
@@ -9918,7 +10008,7 @@
"monster_id": 840022,
"hero_id": "84002",
"name": {
- "key": "monster_monster_name_662",
+ "key": "monster_monster_name_668",
"text": "黑化蒂姆·邓普顿"
},
"star": 2,
@@ -9933,7 +10023,7 @@
"monster_id": 840023,
"hero_id": "84002",
"name": {
- "key": "monster_monster_name_663",
+ "key": "monster_monster_name_669",
"text": "黑化蒂姆·邓普顿"
},
"star": 3,
@@ -9948,7 +10038,7 @@
"monster_id": 840024,
"hero_id": "84002",
"name": {
- "key": "monster_monster_name_664",
+ "key": "monster_monster_name_670",
"text": "黑化蒂姆·邓普顿"
},
"star": 4,
@@ -9963,7 +10053,7 @@
"monster_id": 840025,
"hero_id": "84002",
"name": {
- "key": "monster_monster_name_665",
+ "key": "monster_monster_name_671",
"text": "黑化蒂姆·邓普顿"
},
"star": 5,
@@ -9978,7 +10068,7 @@
"monster_id": 840026,
"hero_id": "84002",
"name": {
- "key": "monster_monster_name_666",
+ "key": "monster_monster_name_672",
"text": "黑化蒂姆·邓普顿"
},
"star": 6,
@@ -9993,7 +10083,7 @@
"monster_id": 940021,
"hero_id": "94002",
"name": {
- "key": "monster_monster_name_667",
+ "key": "monster_monster_name_673",
"text": "黑化蛇先生"
},
"star": 1,
@@ -10008,7 +10098,7 @@
"monster_id": 940022,
"hero_id": "94002",
"name": {
- "key": "monster_monster_name_668",
+ "key": "monster_monster_name_674",
"text": "黑化蛇先生"
},
"star": 2,
@@ -10023,7 +10113,7 @@
"monster_id": 940023,
"hero_id": "94002",
"name": {
- "key": "monster_monster_name_669",
+ "key": "monster_monster_name_675",
"text": "黑化蛇先生"
},
"star": 3,
@@ -10038,7 +10128,7 @@
"monster_id": 940024,
"hero_id": "94002",
"name": {
- "key": "monster_monster_name_670",
+ "key": "monster_monster_name_676",
"text": "黑化蛇先生"
},
"star": 4,
@@ -10053,7 +10143,7 @@
"monster_id": 940025,
"hero_id": "94002",
"name": {
- "key": "monster_monster_name_671",
+ "key": "monster_monster_name_677",
"text": "黑化蛇先生"
},
"star": 5,
@@ -10068,7 +10158,7 @@
"monster_id": 940026,
"hero_id": "94002",
"name": {
- "key": "monster_monster_name_672",
+ "key": "monster_monster_name_678",
"text": "黑化蛇先生"
},
"star": 6,
@@ -10083,7 +10173,7 @@
"monster_id": 940051,
"hero_id": "94005",
"name": {
- "key": "monster_monster_name_673",
+ "key": "monster_monster_name_679",
"text": "黑化小伊"
},
"star": 1,
@@ -10098,7 +10188,7 @@
"monster_id": 940052,
"hero_id": "94005",
"name": {
- "key": "monster_monster_name_674",
+ "key": "monster_monster_name_680",
"text": "黑化小伊"
},
"star": 2,
@@ -10113,7 +10203,7 @@
"monster_id": 940053,
"hero_id": "94005",
"name": {
- "key": "monster_monster_name_675",
+ "key": "monster_monster_name_681",
"text": "黑化小伊"
},
"star": 3,
@@ -10128,7 +10218,7 @@
"monster_id": 940054,
"hero_id": "94005",
"name": {
- "key": "monster_monster_name_676",
+ "key": "monster_monster_name_682",
"text": "黑化小伊"
},
"star": 4,
@@ -10143,7 +10233,7 @@
"monster_id": 940055,
"hero_id": "94005",
"name": {
- "key": "monster_monster_name_677",
+ "key": "monster_monster_name_683",
"text": "黑化小伊"
},
"star": 5,
@@ -10158,7 +10248,7 @@
"monster_id": 940056,
"hero_id": "94005",
"name": {
- "key": "monster_monster_name_678",
+ "key": "monster_monster_name_684",
"text": "黑化小伊"
},
"star": 6,
@@ -10173,7 +10263,7 @@
"monster_id": 1000101,
"hero_id": "44005",
"name": {
- "key": "monster_monster_name_679",
+ "key": "monster_monster_name_685",
"text": "小伊"
},
"star": 4,
@@ -10188,7 +10278,7 @@
"monster_id": 1000102,
"hero_id": "25004",
"name": {
- "key": "monster_monster_name_680",
+ "key": "monster_monster_name_686",
"text": "波比"
},
"star": 5,
@@ -10203,7 +10293,7 @@
"monster_id": 1000103,
"hero_id": "45001",
"name": {
- "key": "monster_monster_name_681",
+ "key": "monster_monster_name_687",
"text": "乌龟大师"
},
"star": 5,
@@ -10218,7 +10308,7 @@
"monster_id": 1000104,
"hero_id": "35001",
"name": {
- "key": "monster_monster_name_682",
+ "key": "monster_monster_name_688",
"text": "师父"
},
"star": 5,
@@ -10233,7 +10323,7 @@
"monster_id": 1000201,
"hero_id": "15005",
"name": {
- "key": "monster_monster_name_683",
+ "key": "monster_monster_name_689",
"text": "亚历克斯"
},
"star": 5,
@@ -10248,7 +10338,7 @@
"monster_id": 1000202,
"hero_id": "34006",
"name": {
- "key": "monster_monster_name_684",
+ "key": "monster_monster_name_690",
"text": "冰霜杰克"
},
"star": 4,
@@ -10263,7 +10353,7 @@
"monster_id": 1000203,
"hero_id": "35001",
"name": {
- "key": "monster_monster_name_685",
+ "key": "monster_monster_name_691",
"text": "师父"
},
"star": 5,
@@ -10278,7 +10368,7 @@
"monster_id": 1000204,
"hero_id": "34006",
"name": {
- "key": "monster_monster_name_686",
+ "key": "monster_monster_name_692",
"text": "冰霜杰克"
},
"star": 4,
@@ -10293,7 +10383,7 @@
"monster_id": 7000111,
"hero_id": "51004",
"name": {
- "key": "monster_monster_name_687",
+ "key": "monster_monster_name_693",
"text": "豺狼小怪"
},
"star": 3,
@@ -10308,7 +10398,7 @@
"monster_id": 7000123,
"hero_id": "51005",
"name": {
- "key": "monster_monster_name_688",
+ "key": "monster_monster_name_694",
"text": "犀牛守卫"
},
"star": 3,
@@ -10323,7 +10413,7 @@
"monster_id": 7000124,
"hero_id": "24004",
"name": {
- "key": "monster_monster_name_689",
+ "key": "monster_monster_name_695",
"text": "邦尼兔"
},
"star": 3,
@@ -10338,7 +10428,7 @@
"monster_id": 7000125,
"hero_id": "51005",
"name": {
- "key": "monster_monster_name_690",
+ "key": "monster_monster_name_696",
"text": "犀牛守卫"
},
"star": 3,
@@ -10353,7 +10443,7 @@
"monster_id": 7200012,
"hero_id": "51004",
"name": {
- "key": "monster_monster_name_691",
+ "key": "monster_monster_name_697",
"text": "豺狼小怪"
},
"star": 3,
@@ -10368,7 +10458,7 @@
"monster_id": 7200013,
"hero_id": "51004",
"name": {
- "key": "monster_monster_name_692",
+ "key": "monster_monster_name_698",
"text": "豺狼小怪"
},
"star": 3,
@@ -10383,7 +10473,7 @@
"monster_id": 7200014,
"hero_id": "51002",
"name": {
- "key": "monster_monster_name_693",
+ "key": "monster_monster_name_699",
"text": "埃雷特手下一号"
},
"star": 3,
@@ -10398,7 +10488,7 @@
"monster_id": 7200015,
"hero_id": "51004",
"name": {
- "key": "monster_monster_name_694",
+ "key": "monster_monster_name_700",
"text": "豺狼小怪"
},
"star": 3,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 4e1309648..0f29ed071 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -122576,7 +122576,7 @@
"newskill": [],
"lv": 45,
"hppro": 8.5,
- "atkpro": 1.4,
+ "atkpro": 1.3,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -122876,7 +122876,7 @@
"newskill": [],
"lv": 50,
"hppro": 9.5,
- "atkpro": 1.55,
+ "atkpro": 1.3,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -123175,8 +123175,8 @@
"equip": [],
"newskill": [],
"lv": 55,
- "hppro": 11,
- "atkpro": 1.7,
+ "hppro": 16,
+ "atkpro": 1.4,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -123204,6 +123204,606 @@
"speed": 114,
"modelsize": 1
},
+ {
+ "Id": 301041,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 103,
+ "modelsize": 1
+ },
+ {
+ "Id": 301041,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 101,
+ "modelsize": 1
+ },
+ {
+ "Id": 301041,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 111,
+ "modelsize": 1
+ },
+ {
+ "Id": 301041,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 34006,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 104,
+ "modelsize": 1
+ },
+ {
+ "Id": 301041,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 301042,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 96,
+ "modelsize": 1
+ },
+ {
+ "Id": 301042,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 99,
+ "modelsize": 1
+ },
+ {
+ "Id": 301042,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 97,
+ "modelsize": 1
+ },
+ {
+ "Id": 301042,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 24002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 113,
+ "modelsize": 1
+ },
+ {
+ "Id": 301042,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 301043,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 301043,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 99,
+ "modelsize": 1
+ },
+ {
+ "Id": 301043,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51015,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 16,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 105,
+ "modelsize": 1
+ },
+ {
+ "Id": 301043,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": true,
+ "bossHpCnt": 4,
+ "heroid": 55005,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 20,
+ "atkpro": 1.4,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 104,
+ "modelsize": 1
+ },
+ {
+ "Id": 301043,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51016,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 16,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 301044,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 103,
+ "modelsize": 1
+ },
+ {
+ "Id": 301044,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 101,
+ "modelsize": 1
+ },
+ {
+ "Id": 301044,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 111,
+ "modelsize": 1
+ },
+ {
+ "Id": 301044,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 34006,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 104,
+ "modelsize": 1
+ },
+ {
+ "Id": 301044,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 301045,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 96,
+ "modelsize": 1
+ },
+ {
+ "Id": 301045,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 99,
+ "modelsize": 1
+ },
+ {
+ "Id": 301045,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 97,
+ "modelsize": 1
+ },
+ {
+ "Id": 301045,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 24002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 113,
+ "modelsize": 1
+ },
+ {
+ "Id": 301045,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 301046,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 301046,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 99,
+ "modelsize": 1
+ },
+ {
+ "Id": 301046,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51015,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 20,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 105,
+ "modelsize": 1
+ },
+ {
+ "Id": 301046,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": true,
+ "bossHpCnt": 4,
+ "heroid": 55005,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 22,
+ "atkpro": 1.6,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 104,
+ "modelsize": 1
+ },
+ {
+ "Id": 301046,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51016,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 20,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
{
"Id": 302011,
"pos": 1,
@@ -126204,6 +126804,606 @@
"speed": 124,
"modelsize": 1
},
+ {
+ "Id": 302041,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 113,
+ "modelsize": 1
+ },
+ {
+ "Id": 302041,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 111,
+ "modelsize": 1
+ },
+ {
+ "Id": 302041,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 302041,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 34006,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 302041,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 302042,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 302042,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 109,
+ "modelsize": 1
+ },
+ {
+ "Id": 302042,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 107,
+ "modelsize": 1
+ },
+ {
+ "Id": 302042,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 14003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 123,
+ "modelsize": 1
+ },
+ {
+ "Id": 302042,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 302043,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 302043,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 109,
+ "modelsize": 1
+ },
+ {
+ "Id": 302043,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51019,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 5,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 115,
+ "modelsize": 1
+ },
+ {
+ "Id": 302043,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": true,
+ "bossHpCnt": 4,
+ "heroid": 55007,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 14,
+ "atkpro": 0.8,
+ "defpro": 0.3,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 302043,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51020,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 5,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 124,
+ "modelsize": 1
+ },
+ {
+ "Id": 302044,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 113,
+ "modelsize": 1
+ },
+ {
+ "Id": 302044,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 111,
+ "modelsize": 1
+ },
+ {
+ "Id": 302044,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 302044,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 34006,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 302044,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 302045,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 302045,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 109,
+ "modelsize": 1
+ },
+ {
+ "Id": 302045,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 107,
+ "modelsize": 1
+ },
+ {
+ "Id": 302045,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 14003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 123,
+ "modelsize": 1
+ },
+ {
+ "Id": 302045,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 302046,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 106,
+ "modelsize": 1
+ },
+ {
+ "Id": 302046,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 99,
+ "modelsize": 1
+ },
+ {
+ "Id": 302046,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51019,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 20,
+ "atkpro": 2,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 105,
+ "modelsize": 1
+ },
+ {
+ "Id": 302046,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": true,
+ "bossHpCnt": 4,
+ "heroid": 55007,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 25,
+ "atkpro": 6.5,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 104,
+ "modelsize": 1
+ },
+ {
+ "Id": 302046,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51020,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 20,
+ "atkpro": 2,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
{
"Id": 303011,
"pos": 1,
@@ -129204,6 +130404,606 @@
"speed": 129,
"modelsize": 1
},
+ {
+ "Id": 303041,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 118,
+ "modelsize": 1
+ },
+ {
+ "Id": 303041,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 303041,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 126,
+ "modelsize": 1
+ },
+ {
+ "Id": 303041,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 24004,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 119,
+ "modelsize": 1
+ },
+ {
+ "Id": 303041,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 303042,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 111,
+ "modelsize": 1
+ },
+ {
+ "Id": 303042,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 303042,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 112,
+ "modelsize": 1
+ },
+ {
+ "Id": 303042,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 14003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 128,
+ "modelsize": 1
+ },
+ {
+ "Id": 303042,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 303043,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 303043,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 303043,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51017,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 7,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 120,
+ "modelsize": 1
+ },
+ {
+ "Id": 303043,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": true,
+ "bossHpCnt": 4,
+ "heroid": 55006,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 12,
+ "atkpro": 1.2,
+ "defpro": 0.4,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 119,
+ "modelsize": 1
+ },
+ {
+ "Id": 303043,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51018,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 7,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 129,
+ "modelsize": 1
+ },
+ {
+ "Id": 303044,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 118,
+ "modelsize": 1
+ },
+ {
+ "Id": 303044,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 116,
+ "modelsize": 1
+ },
+ {
+ "Id": 303044,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 126,
+ "modelsize": 1
+ },
+ {
+ "Id": 303044,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 24004,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 119,
+ "modelsize": 1
+ },
+ {
+ "Id": 303044,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 303045,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 111,
+ "modelsize": 1
+ },
+ {
+ "Id": 303045,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 303045,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 112,
+ "modelsize": 1
+ },
+ {
+ "Id": 303045,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 14003,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 128,
+ "modelsize": 1
+ },
+ {
+ "Id": 303045,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51002,
+ "star": 5,
+ "equip": [],
+ "newskill": [],
+ "lv": 55,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 303046,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 121,
+ "modelsize": 1
+ },
+ {
+ "Id": 303046,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 0.6,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 114,
+ "modelsize": 1
+ },
+ {
+ "Id": 303046,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51017,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 7,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 120,
+ "modelsize": 1
+ },
+ {
+ "Id": 303046,
+ "pos": 4,
+ "captainId": 1,
+ "IsBoss": true,
+ "bossHpCnt": 4,
+ "heroid": 55006,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 12,
+ "atkpro": 1.2,
+ "defpro": 0.4,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 119,
+ "modelsize": 1
+ },
+ {
+ "Id": 303046,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51018,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 65,
+ "hppro": 7,
+ "atkpro": 0.5,
+ "defpro": 0.8,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 129,
+ "modelsize": 1
+ },
{
"Id": 306001,
"pos": 1,
diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json
index ba7d9344d..b55a5276a 100644
--- a/bin/json/game_msgdistrib.json
+++ b/bin/json/game_msgdistrib.json
@@ -181,7 +181,7 @@
},
{
"msgid": "plunder",
- "open": false,
+ "open": true,
"routrules": "~/worker",
"describe": "掠夺"
}
diff --git a/bin/json/game_plunder.json b/bin/json/game_plunder.json
index 880f55b8c..851d6ebea 100644
--- a/bin/json/game_plunder.json
+++ b/bin/json/game_plunder.json
@@ -25,25 +25,14 @@
"n": 10
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 10
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 20
},
"hidenum": 20,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -51,7 +40,7 @@
"n": 1
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 102,
@@ -79,25 +68,14 @@
"n": 20
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 20
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 20
},
"hidenum": 20,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -105,7 +83,7 @@
"n": 2
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 103,
@@ -133,25 +111,14 @@
"n": 30
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 30
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 20
},
"hidenum": 20,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -159,7 +126,7 @@
"n": 3
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 104,
@@ -187,25 +154,14 @@
"n": 30
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 30
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 20
},
"hidenum": 20,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -213,7 +169,7 @@
"n": 3
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 105,
@@ -241,25 +197,14 @@
"n": 40
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 30
},
"hidenum": 30,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -267,7 +212,7 @@
"n": 4
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 106,
@@ -295,25 +240,14 @@
"n": 50
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 50
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 30
},
"hidenum": 30,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -321,7 +255,7 @@
"n": 5
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 107,
@@ -349,25 +283,14 @@
"n": 10
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 10
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 30
},
"hidenum": 30,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -375,7 +298,7 @@
"n": 1
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 108,
@@ -403,25 +326,14 @@
"n": 10
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 10
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 30
},
"hidenum": 30,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -429,7 +341,7 @@
"n": 1
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 109,
@@ -457,25 +369,14 @@
"n": 20
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 20
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 40
},
"hidenum": 40,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -483,7 +384,7 @@
"n": 2
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 110,
@@ -511,25 +412,14 @@
"n": 30
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 30
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 40
},
"hidenum": 40,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -537,7 +427,7 @@
"n": 3
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 111,
@@ -565,25 +455,14 @@
"n": 40
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 40
},
"hidenum": 40,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -591,7 +470,7 @@
"n": 4
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 112,
@@ -619,25 +498,14 @@
"n": 40
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 40
},
"hidenum": 40,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -645,7 +513,7 @@
"n": 4
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 113,
@@ -673,25 +541,14 @@
"n": 50
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 50
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 45
},
"hidenum": 45,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -699,7 +556,7 @@
"n": 5
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 114,
@@ -727,25 +584,14 @@
"n": 10
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 10
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 45
},
"hidenum": 45,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -753,7 +599,7 @@
"n": 1
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 115,
@@ -781,25 +627,14 @@
"n": 20
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 20
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 45
},
"hidenum": 45,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -807,7 +642,7 @@
"n": 2
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 116,
@@ -835,25 +670,14 @@
"n": 20
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 20
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 45
},
"hidenum": 45,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -861,7 +685,7 @@
"n": 2
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 117,
@@ -889,25 +713,14 @@
"n": 30
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 30
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 50
},
"hidenum": 50,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -915,7 +728,7 @@
"n": 3
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 118,
@@ -943,25 +756,14 @@
"n": 40
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 50
},
"hidenum": 50,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -969,7 +771,7 @@
"n": 4
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 119,
@@ -997,25 +799,14 @@
"n": 50
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 50
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 50
},
"hidenum": 50,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -1023,7 +814,7 @@
"n": 5
}
],
- "extime": 10
+ "extime": 100
},
{
"id": 120,
@@ -1051,25 +842,14 @@
"n": 50
}
],
- "lostreward": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 50
- }
- ],
"numitem": {
"a": "attr",
"t": "plunderexp",
"n": 50
},
"hidenum": 50,
- "time": 15,
+ "protecttime": 60,
+ "time": 150,
"exreward": [
{
"a": "item",
@@ -1077,6 +857,6 @@
"n": 5
}
],
- "extime": 10
+ "extime": 100
}
]
\ No newline at end of file
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index 5ecf72e17..e8f7eab02 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -9545,7 +9545,7 @@
],
"event": [
1,
- 503
+ 109
],
"goto": 0
},
@@ -9621,7 +9621,7 @@
],
"event": [
1,
- 505
+ 701
],
"goto": 0
},
@@ -10088,7 +10088,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "阿宝",
+ "氛围npc-焊娇虎",
"901"
],
"event": [
@@ -10241,7 +10241,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-烹饪",
+ "氛围npc-警长",
"901"
],
"event": [
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 525aa83d1..0f50e1338 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -5619,7 +5619,7 @@
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 2,
+ "ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
@@ -5647,7 +5647,7 @@
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 2,
+ "ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
@@ -5675,7 +5675,7 @@
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 2,
+ "ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
@@ -7211,7 +7211,7 @@
{
"Id": 215005211,
"EmitPR": 1000,
- "From": 1,
+ "From": 3,
"Where": [],
"Order": "",
"Limit": 10,
@@ -16800,7 +16800,7 @@
{
"Id": 224004211,
"EmitPR": 1000,
- "From": 3,
+ "From": 1,
"Where": [],
"Order": "",
"Limit": 1,
@@ -74173,7 +74173,7 @@
"EmitPR": 1000,
"From": 2,
"Where": [],
- "Order": "Leader",
+ "Order": "CaptainPriority=1",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
@@ -74189,10 +74189,14 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
- "DpsRevisiType": 0,
+ "DpsRevisiType": 110,
"DpsCondition": "",
"RevisiCondition": "",
- "RevisiParams": []
+ "RevisiParams": [
+ 10,
+ 5,
+ 5000
+ ]
},
{
"Id": 285001112,
@@ -74203,11 +74207,9 @@
"Limit": 10,
"ExecuteCnt": 1,
"TriggerAnim": "",
- "Type": 1,
+ "Type": 24,
"Argu": [
- 1,
- 4,
- 4000
+ 1000
],
"FollowSK": [],
"SucFollowSK": [],
@@ -74362,9 +74364,7 @@
4,
6000
],
- "FollowSK": [
- 285001512
- ],
+ "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -74552,7 +74552,7 @@
"EmitPR": 1000,
"From": 2,
"Where": [],
- "Order": "Leader",
+ "Order": "CaptainPriority=1",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
@@ -74568,10 +74568,14 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
- "DpsRevisiType": 0,
+ "DpsRevisiType": 110,
"DpsCondition": "",
"RevisiCondition": "",
- "RevisiParams": []
+ "RevisiParams": [
+ 6,
+ 1,
+ 5000
+ ]
},
{
"Id": 285002112,
@@ -74582,11 +74586,9 @@
"Limit": 10,
"ExecuteCnt": 1,
"TriggerAnim": "",
- "Type": 1,
+ "Type": 24,
"Argu": [
- 1,
- 4,
- 4000
+ 1000
],
"FollowSK": [],
"SucFollowSK": [],
@@ -74741,9 +74743,7 @@
4,
6000
],
- "FollowSK": [
- 285002512
- ],
+ "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -74931,7 +74931,7 @@
"EmitPR": 1000,
"From": 2,
"Where": [],
- "Order": "Leader",
+ "Order": "CaptainPriority=1",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
@@ -74947,10 +74947,13 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
- "DpsRevisiType": 0,
+ "DpsRevisiType": 106,
"DpsCondition": "",
"RevisiCondition": "",
- "RevisiParams": []
+ "RevisiParams": [
+ 10,
+ 10
+ ]
},
{
"Id": 285003112,
@@ -74961,11 +74964,9 @@
"Limit": 10,
"ExecuteCnt": 1,
"TriggerAnim": "",
- "Type": 1,
+ "Type": 24,
"Argu": [
- 1,
- 4,
- 4000
+ 1000
],
"FollowSK": [],
"SucFollowSK": [],
@@ -75120,9 +75121,7 @@
4,
6000
],
- "FollowSK": [
- 285003512
- ],
+ "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@@ -75130,7 +75129,7 @@
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": [
- 391000123,
+ 391000127,
50
]
},
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index a82fe4647..f55f51363 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -12299,7 +12299,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_124004211_1",
- "text": "为自身施加2回合[color=#37d8a9]攻击提升[/color]效果，之后立即获得回合"
+ "text": "为友方施加2回合[color=#37d8a9]攻击提升[/color]效果，之后立即获得回合。"
},
"buffid": [
390001001
@@ -24515,11 +24515,9 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_155002211_1",
- "text": "（被动）当有队友死亡或自身血量首次低于30%时为自身附加2回合[color=#37d8a9]香蕉在哪[/color]。"
+ "text": "（被动）当有队友死亡或自身血量首次低于30%时自身进入狂暴化。"
},
- "buffid": [
- 390001448
- ],
+ "buffid": [],
"map": ""
},
{
@@ -61138,7 +61136,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_185001211_1",
- "text": "场上每死亡1名敌方自身攻击提升增加10%"
+ "text": "场上每死亡1名敌方自身伤害提升10%"
},
"buffid": [],
"map": ""
@@ -61338,7 +61336,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_185002211_1",
- "text": "场上每死亡1名敌方自身攻击提升增加10%"
+ "text": "场上每死亡1名敌方自身伤害提升10%"
},
"buffid": [],
"map": ""
@@ -61538,7 +61536,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_185003211_1",
- "text": "场上每死亡1名敌方自身攻击提升增加10%"
+ "text": "场上每死亡1名敌方自身伤害提升10%"
},
"buffid": [],
"map": ""
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index dae24ab08..5d57b1d18 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -58,6 +58,7 @@
"CoexistCheckArgu": [],
"Effect": [
3,
+ 15,
11
],
"AddEffect": false,
@@ -97,6 +98,7 @@
"CoexistCheckArgu": [],
"Effect": [
3,
+ 17,
11
],
"AddEffect": false,
@@ -1466,6 +1468,7 @@
"CoexistCheckArgu": [],
"Effect": [
3,
+ 18,
11
],
"AddEffect": false,
@@ -1664,7 +1667,8 @@
"CoexistCheckArgu": [],
"Effect": [
0,
- 3
+ 3,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -2341,7 +2345,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -2379,7 +2384,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 17
],
"AddEffect": false,
"RemoveType": false,
@@ -2607,7 +2613,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -2645,7 +2652,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 17
],
"AddEffect": false,
"RemoveType": false,
@@ -2873,7 +2881,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -3063,7 +3072,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -3101,7 +3111,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -3139,7 +3150,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -4668,7 +4680,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -5455,7 +5468,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 17
],
"AddEffect": false,
"RemoveType": false,
@@ -5493,7 +5507,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 17
],
"AddEffect": false,
"RemoveType": false,
@@ -6024,7 +6039,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -6062,7 +6078,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 15
],
"AddEffect": false,
"RemoveType": false,
@@ -6749,7 +6766,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 8
+ 8,
+ 17
],
"AddEffect": false,
"RemoveType": false,
@@ -9845,7 +9863,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 17
],
"AddEffect": false,
"RemoveType": true,
@@ -10114,7 +10133,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 17
],
"AddEffect": false,
"RemoveType": true,
@@ -10303,7 +10323,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 17
],
"AddEffect": false,
"RemoveType": true,
@@ -10992,7 +11013,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": false,
@@ -11030,7 +11052,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 17
],
"AddEffect": false,
"RemoveType": true,
@@ -11106,7 +11129,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": false,
@@ -11184,7 +11208,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 17
],
"AddEffect": false,
"RemoveType": true,
@@ -11222,7 +11247,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": false,
@@ -11562,7 +11588,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": true,
@@ -11602,7 +11629,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": true,
@@ -12057,7 +12085,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": true,
@@ -12091,7 +12120,7 @@
1,
3
],
- "BufParNum": 1,
+ "BufParNum": 3,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
@@ -12167,7 +12196,7 @@
0,
50
],
- "BufParNum": 1,
+ "BufParNum": 3,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
@@ -13485,11 +13514,12 @@
"EffectArgu": [
400
],
- "BufParNum": 1,
+ "BufParNum": 3,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": false,
@@ -13903,7 +13933,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": false,
@@ -14017,7 +14048,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": true,
@@ -14055,7 +14087,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 16
],
"AddEffect": false,
"RemoveType": false,
@@ -14460,16 +14493,15 @@
"Id": 391000115,
"Name": {
"key": "skill_skill_buff_Name_391000115",
- "text": "攻击提升"
+ "text": "伤害提升"
},
"Desc": {
"key": "skill_skill_buff_Desc_391000115",
- "text": "场上每死亡1名敌方自身攻击提升增加10%"
+ "text": "场上每死亡1名敌方自身伤害提升10%"
},
- "BuffType": 0,
+ "BuffType": 147,
"EffectArgu": [
2,
- 22,
100
],
"BufParNum": 1,
@@ -14505,8 +14537,13 @@
"key": "skill_skill_buff_Desc_391000116",
"text": "每回合开始前造成以自身最大生命值为一定比例的伤害，受到净化以及增益效果时,将被消除一层。被【】引爆后，将以当前层数的效果保留，且无法再被消除。"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 151,
+ "EffectArgu": [
+ 1,
+ 2,
+ 500,
+ 285001511
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14514,7 +14551,7 @@
13
],
"AddEffect": false,
- "RemoveType": false,
+ "RemoveType": true,
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 99,
@@ -14540,8 +14577,11 @@
"key": "skill_skill_buff_Desc_391000117",
"text": "受到单段伤害提升，受到多段伤害的后续伤害降低90%。"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 150,
+ "EffectArgu": [
+ 1000,
+ -900
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14610,8 +14650,10 @@
"key": "skill_skill_buff_Desc_391000119",
"text": "破防"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 148,
+ "EffectArgu": [
+ 1000
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14645,8 +14687,10 @@
"key": "skill_skill_buff_Desc_391000120",
"text": "防御提升失效"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 146,
+ "EffectArgu": [
+ 15
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14680,8 +14724,10 @@
"key": "skill_skill_buff_Desc_391000121",
"text": " 减伤效果失效"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 144,
+ "EffectArgu": [
+ 16
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14715,10 +14761,9 @@
"key": "skill_skill_buff_Desc_391000122",
"text": "承受一定伤害获得回合"
},
- "BuffType": 0,
+ "BuffType": 149,
"EffectArgu": [
- 100000,
- 285001614
+ 100000
],
"BufParNum": 1,
"RelyCheckArgu": [],
@@ -14753,8 +14798,12 @@
"key": "skill_skill_buff_Desc_391000123",
"text": "林荫"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 153,
+ "EffectArgu": [
+ 2,
+ 500,
+ 285002511
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14821,10 +14870,12 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_391000125",
- "text": "速度提升 减伤效果失效"
+ "text": "速度提升失效"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 145,
+ "EffectArgu": [
+ 17
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14858,8 +14909,11 @@
"key": "skill_skill_buff_Desc_391000127",
"text": "寒冷"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 152,
+ "EffectArgu": [
+ 500,
+ 285003511
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14928,8 +14982,10 @@
"key": "skill_skill_buff_Desc_391000129",
"text": "治疗效果失效"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 143,
+ "EffectArgu": [
+ 18
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -14963,8 +15019,11 @@
"key": "skill_skill_buff_Desc_391000130",
"text": "受到多段伤害提升，受到的后续伤害增加50%。"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 150,
+ "EffectArgu": [
+ 0,
+ 500
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json
index 40f687d96..8b5f72c22 100644
--- a/bin/json/game_topuiconfig.json
+++ b/bin/json/game_topuiconfig.json
@@ -399,6 +399,17 @@
}
]
},
+ {
+ "id": "store",
+ "subId": "15",
+ "currencyField": [
+ {
+ "a": "attr",
+ "t": "consumemoney",
+ "n": 1
+ }
+ ]
+ },
{
"id": "storebuypopup",
"subId": "",
@@ -2872,12 +2883,12 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 1
+ "n": 0
},
{
"a": "attr",
"t": "consumemoney",
- "n": 1
+ "n": 0
}
]
},
@@ -2888,12 +2899,12 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 1
+ "n": 0
},
{
"a": "attr",
"t": "consumemoney",
- "n": 1
+ "n": 0
}
]
},
@@ -2904,12 +2915,12 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 1
+ "n": 0
},
{
"a": "attr",
"t": "consumemoney",
- "n": 1
+ "n": 0
}
]
},
@@ -2920,12 +2931,12 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 1
+ "n": 0
},
{
"a": "attr",
"t": "consumemoney",
- "n": 1
+ "n": 0
}
]
},
diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json
index 9b6243e23..98c1017f9 100644
--- a/bin/json/game_vikingboss.json
+++ b/bin/json/game_vikingboss.json
@@ -751,7 +751,7 @@
"bossmodel": 0,
"boss_skill": 0,
"boss": [
- 301040
+ 301043
],
"ps_consume": [
{
@@ -820,7 +820,7 @@
"bossmodel": 0,
"boss_skill": 0,
"boss": [
- 301040
+ 301046
],
"ps_consume": [
{
@@ -1589,7 +1589,7 @@
"bossmodel": 0,
"boss_skill": 0,
"boss": [
- 302040
+ 302043
],
"ps_consume": [
{
@@ -1658,7 +1658,7 @@
"bossmodel": 0,
"boss_skill": 0,
"boss": [
- 302040
+ 302046
],
"ps_consume": [
{
@@ -2427,7 +2427,7 @@
"bossmodel": 0,
"boss_skill": 0,
"boss": [
- 303040
+ 303043
],
"ps_consume": [
{
@@ -2496,7 +2496,7 @@
"bossmodel": 0,
"boss_skill": 0,
"boss": [
- 303040
+ 303046
],
"ps_consume": [
{
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index fa44c0b7e..e9de8f3c3 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -552,5 +552,21 @@
"carexe": 500,
"reward": 0,
"exreward": []
+ },
+ {
+ "id": 701,
+ "FormatList": [
+ 101041
+ ],
+ "BattleReadyID": 126,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 5
+ },
+ "carexe": 500,
+ "reward": 0,
+ "exreward": []
}
]
\ No newline at end of file
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index ac3238e7c..96883df78 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -801,12 +801,7 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
if err != nil {
return
}
- if rst.Expitem == nil {
- rst.Expitem = make(map[string]int32)
- }
- if rst.Herofrag == nil {
- rst.Herofrag = make(map[string]int32)
- }
+
bChange := false
// 转碎片处理
for i := 0; int32(i) < count; i++ {
@@ -938,7 +933,8 @@ func (this *ModelHero) CheckDrawCardRes(session comm.IUserSession, drawConf *cfg
// 模拟获得英雄 (bImitate : true 表示模拟获得 并不发英雄)
func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bImitate bool) (addres [][]*cfg.Gameatn, add []*pb.DBHero, err error) {
var (
- szCard map[string]int32
+ szCard map[string]int32
+ bChange bool
)
szCard = make(map[string]int32)
heros := make([]*pb.DBHero, 0)
@@ -951,12 +947,7 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
if err != nil {
return
}
- if rst.Expitem == nil {
- rst.Expitem = make(map[string]int32)
- }
- if rst.Herofrag == nil {
- rst.Herofrag = make(map[string]int32)
- }
+
if err = this.GetList(uid, &heros); err != nil {
this.module.Errorf("err:%v", err)
}
@@ -1012,9 +1003,11 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
if v, ok := rst.Herofrag[hero.HeroID]; !ok {
rst.Herofrag[hero.HeroID] = 1
bAdd = true
+ bChange = true
} else if heroCfg.Herofragnum > v {
rst.Herofrag[hero.HeroID] += 1
bAdd = true
+ bChange = true
}
}
if bAdd {
@@ -1039,10 +1032,12 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
if heroCfg.Expitemnum > v {
rst.Expitem[hero.HeroID] += 1
bAdd = true
+ bChange = true
}
} else {
rst.Expitem[hero.HeroID] = 1
bAdd = true
+ bChange = true
}
}
if bAdd {
@@ -1050,7 +1045,12 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
}
addres = append(addres, res)
}
-
+ if !bImitate && bChange {
+ this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
+ "herofrag": rst.Herofrag,
+ "expitem": rst.Expitem,
+ })
+ }
if !bImitate { // 获得三消卡片资源数据
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
diff --git a/modules/plunder/api_challenge.go b/modules/plunder/api_challenge.go
index a6180be11..a0bb16318 100644
--- a/modules/plunder/api_challenge.go
+++ b/modules/plunder/api_challenge.go
@@ -38,7 +38,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
}
return
}
- if len(list.Source) > int(req.Index) { // 数组长度校验
+ if len(list.Source) < int(req.Index) { // 数组长度校验
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go
index d064bde6d..25bd451d7 100644
--- a/modules/plunder/api_challengeover.go
+++ b/modules/plunder/api_challengeover.go
@@ -49,7 +49,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
}
return
}
- if len(list.Source) > int(req.Index) { // 数组长度校验
+ if len(list.Source) < int(req.Index) { // 数组长度校验
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
@@ -102,7 +102,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
shipData = &pb.ShipData{
Uid: session.GetUserId(),
Line: &pb.PlunderLine{
- Itype: 0,
+ Itype: req.Itype,
Etime: configure.Now().Unix() + int64(conf.Extime),
Cid: conf.Id,
Oid: _id,
diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go
index dc5ec6b64..e1bed57d0 100644
--- a/modules/plunder/api_pvpchallengeover.go
+++ b/modules/plunder/api_pvpchallengeover.go
@@ -3,6 +3,8 @@ package plunder
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
+ cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
@@ -19,9 +21,11 @@ func (this *apiComp) PvpChallengeOverCheck(session comm.IUserSession, req *pb.Pl
// /挑战
func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.PlunderPvpChallengeOverReq) (errdata *pb.ErrorData) {
var (
- err error
- land *pb.DBPlunderLand // 岛屿数据
- list *pb.DBPlunder
+ err error
+ land *pb.DBPlunderLand // 岛屿数据
+ list *pb.DBPlunder
+ iswin bool
+ conf *cfg.GamePlunderData
)
if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil {
return
@@ -51,7 +55,24 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
}
return
}
+ if errdata, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
+ return
+ }
+ // 配置校验
+ if conf, err = this.module.configure.getGamePlunderDataById(land.Ship[req.Oid].Line.Cid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if !iswin {
+ land.Ship[req.Oid].Cd = configure.Now().Unix() + int64(conf.Protecttime)
+ land.Ship[req.Oid].Status = 2
+ return
+ }
session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{
Atno: []*pb.UserAtno{},
})
diff --git a/sys/configure/structs/Game.BuffEffectType.go b/sys/configure/structs/Game.BuffEffectType.go
index 69233fd59..f20af5922 100644
--- a/sys/configure/structs/Game.BuffEffectType.go
+++ b/sys/configure/structs/Game.BuffEffectType.go
@@ -24,4 +24,8 @@ const (
GameBuffEffectType_CanRollDeBuff = 12
GameBuffEffectType_EnchantBossBuff = 13
GameBuffEffectType_Overall = 14
+ GameBuffEffectType_Def = 15
+ GameBuffEffectType_DmgDown = 16
+ GameBuffEffectType_SpdUp = 17
+ GameBuffEffectType_Heal = 18
)
diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go
index 5866e6a28..30924f7c8 100644
--- a/sys/configure/structs/Game.BuffType.go
+++ b/sys/configure/structs/Game.BuffType.go
@@ -137,4 +137,11 @@ const (
GameBuffType_GLOBAL_DISABLE_DAMRE = 144
GameBuffType_GLOBAL_DISABLE_ADD_SPEED = 145
GameBuffType_GLOBAL_DISABLE_ADD_DEF = 146
+ GameBuffType_ADJUST_DMG_BY_DEATH_NUM = 147
+ GameBuffType_DEFENSE_BREAK = 148
+ GameBuffType_BE_DMG_TOTAL_NEW_ROUND = 149
+ GameBuffType_MODIFY_MULTI_DMG = 150
+ GameBuffType_BROIL = 151
+ GameBuffType_FRIGID = 152
+ GameBuffType_SHADE = 153
)
diff --git a/sys/configure/structs/Game.PlunderData.go b/sys/configure/structs/Game.PlunderData.go
index 6b164af20..4270dac40 100644
--- a/sys/configure/structs/Game.PlunderData.go
+++ b/sys/configure/structs/Game.PlunderData.go
@@ -19,9 +19,9 @@ type GamePlunderData struct {
Weight int32
Battleid int32
Keepreward []*Gameatn
- Lostreward []*Gameatn
Numitem *Gameatn
Hidenum int32
+ Protecttime int32
Time int32
Exreward []*Gameatn
Extime int32
@@ -55,22 +55,9 @@ func (_v *GamePlunderData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["lostreward"].([]interface{}); !_ok_ { err = errors.New("lostreward error"); return }
-
- _v.Lostreward = 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.Lostreward = append(_v.Lostreward, _list_v_)
- }
- }
-
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["numitem"].(map[string]interface{}); !_ok_ { err = errors.New("numitem error"); return }; if _v.Numitem, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hidenum"].(float64); !_ok_ { err = errors.New("hidenum error"); return }; _v.Hidenum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["protecttime"].(float64); !_ok_ { err = errors.New("protecttime error"); return }; _v.Protecttime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
{
var _arr_ []interface{}