diff --git a/bin/json/game_achievetask.json b/bin/json/game_achievetask.json index 738e2fcc7..7e7777f6a 100644 --- a/bin/json/game_achievetask.json +++ b/bin/json/game_achievetask.json @@ -4,7 +4,7 @@ "task_group_from": 1, "task_name": { "key": "achieve_achieve_task_task_name_01", - "text": "首次将2件套全部装备强化15并穿戴" + "text": "将2件套全部装备强化15并穿戴" }, "task_desc": { "key": "", @@ -27,7 +27,7 @@ "task_group_from": 1, "task_name": { "key": "achieve_achieve_task_task_name_02", - "text": "首次将4件套全部装备强化15并穿戴" + "text": "将4件套全部装备强化15并穿戴" }, "task_desc": { "key": "", @@ -6697,7 +6697,7 @@ "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_301", - "text": "通关声之遗迹-火之热情50次" + "text": "通关火焰泰坦50次" }, "task_desc": { "key": "", @@ -6713,14 +6713,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 167 }, { "key": 1302, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_302", - "text": "通关声之遗迹-火之热情100次" + "text": "通关火焰泰坦100次" }, "task_desc": { "key": "", @@ -6736,14 +6736,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 167 }, { "key": 1303, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_303", - "text": "通关声之遗迹-火之热情200次" + "text": "通关火焰泰坦200次" }, "task_desc": { "key": "", @@ -6759,14 +6759,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 167 }, { "key": 1304, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_304", - "text": "通关声之遗迹-火之热情500次" + "text": "通关火焰泰坦500次" }, "task_desc": { "key": "", @@ -6782,14 +6782,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 167 }, { "key": 1305, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_305", - "text": "通关声之遗迹-林的感官50次" + "text": "通关森林泰坦50次" }, "task_desc": { "key": "", @@ -6805,14 +6805,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 167 }, { "key": 1306, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_306", - "text": "通关声之遗迹-林的感官100次" + "text": "通关森林泰坦100次" }, "task_desc": { "key": "", @@ -6828,14 +6828,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 167 }, { "key": 1307, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_307", - "text": "通关声之遗迹-林的感官200次" + "text": "通关森林泰坦200次" }, "task_desc": { "key": "", @@ -6851,14 +6851,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 167 }, { "key": 1308, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_308", - "text": "通关声之遗迹-林的感官500次" + "text": "通关森林泰坦500次" }, "task_desc": { "key": "", @@ -6874,14 +6874,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 167 }, { "key": 1309, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_309", - "text": "通关声之遗迹-水的包容50次" + "text": "通关冰霜泰坦50次" }, "task_desc": { "key": "", @@ -6897,14 +6897,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 167 }, { "key": 1310, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_310", - "text": "通关声之遗迹-水的包容100次" + "text": "通关冰霜泰坦100次" }, "task_desc": { "key": "", @@ -6920,14 +6920,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 167 }, { "key": 1311, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_311", - "text": "通关声之遗迹-水的包容200次" + "text": "通关冰霜泰坦200次" }, "task_desc": { "key": "", @@ -6943,14 +6943,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 167 }, { "key": 1312, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_312", - "text": "通关声之遗迹-水的包容500次" + "text": "通关冰霜泰坦500次" }, "task_desc": { "key": "", @@ -6966,198 +6966,14 @@ "n": 30000 } ], - "jump": 0 - }, - { - "key": 1313, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_313", - "text": "通关声之遗迹-光的荣耀50次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000307, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1314, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_314", - "text": "通关声之遗迹-光的荣耀100次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000308, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1315, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_315", - "text": "通关声之遗迹-光的荣耀200次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000309, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1316, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_316", - "text": "通关声之遗迹-光的荣耀500次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000310, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1317, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_317", - "text": "首次在60秒内通关声之神迹-火的热情难度8" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000311, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1318, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_318", - "text": "首次在60秒内通关声之神迹-林的感官难度8" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000312, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1319, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_319", - "text": "首次在60秒内通关声之神迹-水的包容难度8" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000313, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1320, - "task_group_from": 3, - "task_name": { - "key": "achieve_achieve_task_task_name_320", - "text": "首次在60秒内通关声之神迹-光的荣耀难度8" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000314, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 + "jump": 167 }, { "key": 1321, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_321", - "text": "通关祭祀神殿-阿佩普50次" + "text": "通关巨型猩猩怪兽50次" }, "task_desc": { "key": "", @@ -7173,14 +6989,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1322, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_322", - "text": "通关祭祀神殿-阿佩普100次" + "text": "通关巨型猩猩怪兽100次" }, "task_desc": { "key": "", @@ -7196,14 +7012,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 168 }, { "key": 1323, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_323", - "text": "通关祭祀神殿-阿佩普200次" + "text": "通关巨型猩猩怪兽200次" }, "task_desc": { "key": "", @@ -7219,14 +7035,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 168 }, { "key": 1324, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_324", - "text": "通关祭祀神殿-阿佩普500次" + "text": "通关巨型猩猩怪兽500次" }, "task_desc": { "key": "", @@ -7242,14 +7058,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1325, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_325", - "text": "通关祭祀神殿-克洛诺斯50次" + "text": "通关火龙50次" }, "task_desc": { "key": "", @@ -7265,14 +7081,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 168 }, { "key": 1326, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_326", - "text": "通关祭祀神殿-克洛诺斯100次" + "text": "通关火龙100次" }, "task_desc": { "key": "", @@ -7288,14 +7104,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 168 }, { "key": 1327, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_327", - "text": "通关祭祀神殿-克洛诺斯200次" + "text": "通关火龙200次" }, "task_desc": { "key": "", @@ -7311,14 +7127,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1328, "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_328", - "text": "通关祭祀神殿-克洛诺斯500次" + "text": "通关火龙500次" }, "task_desc": { "key": "", @@ -7334,14 +7150,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 168 }, { "key": 1329, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_329", - "text": "通关祭祀神殿-安德拉斯50次" + "text": "通关大厨50次" }, "task_desc": { "key": "", @@ -7357,14 +7173,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 168 }, { "key": 1330, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_330", - "text": "通关祭祀神殿-安德拉斯100次" + "text": "通关大厨100次" }, "task_desc": { "key": "", @@ -7380,14 +7196,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1331, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_331", - "text": "通关祭祀神殿-安德拉斯200次" + "text": "通关大厨200次" }, "task_desc": { "key": "", @@ -7403,14 +7219,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 168 }, { "key": 1332, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_332", - "text": "通关祭祀神殿-安德拉斯500次" + "text": "通关大厨500次" }, "task_desc": { "key": "", @@ -7426,14 +7242,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 168 }, { "key": 1333, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_333", - "text": "通关祭祀神殿-法芙娜50次" + "text": "通关格尔族50次" }, "task_desc": { "key": "", @@ -7449,14 +7265,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1334, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_334", - "text": "通关祭祀神殿-法芙娜100次" + "text": "通关格尔族100次" }, "task_desc": { "key": "", @@ -7472,14 +7288,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 168 }, { "key": 1335, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_335", - "text": "通关祭祀神殿-法芙娜200次" + "text": "通关格尔族200次" }, "task_desc": { "key": "", @@ -7495,14 +7311,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 168 }, { "key": 1336, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_336", - "text": "通关祭祀神殿-法芙娜500次" + "text": "通关格尔族500次" }, "task_desc": { "key": "", @@ -7518,14 +7334,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1337, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_337", - "text": "首次在60秒内通关祭祀神殿-克洛诺斯难度10" + "text": "首次在60秒内通关火龙难度10" }, "task_desc": { "key": "", @@ -7541,14 +7357,14 @@ "n": 10000 } ], - "jump": 0 + "jump": 168 }, { "key": 1338, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_338", - "text": "首次在60秒内通关祭祀神殿-阿佩普难度10" + "text": "首次在60秒内通关巨型猩猩怪兽难度10" }, "task_desc": { "key": "", @@ -7564,14 +7380,14 @@ "n": 20000 } ], - "jump": 0 + "jump": 168 }, { "key": 1339, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_339", - "text": "首次在60秒内通关祭祀神殿-法芙娜难度10" + "text": "首次在60秒内通关格尔族难度10" }, "task_desc": { "key": "", @@ -7587,14 +7403,14 @@ "n": 30000 } ], - "jump": 0 + "jump": 168 }, { "key": 1340, "task_group_from": 4, "task_name": { "key": "achieve_achieve_task_task_name_340", - "text": "首次在60秒内通关祭祀神殿-安德拉斯难度10" + "text": "首次在60秒内通关大厨难度10" }, "task_desc": { "key": "", @@ -7610,788 +7426,6 @@ "n": 10000 } ], - "jump": 0 - }, - { - "key": 1341, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_341", - "text": "通关空间之塔50层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000335, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1342, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_342", - "text": "通关空间之塔80层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000336, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1343, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_343", - "text": "通关空间之塔100层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000337, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1344, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_344", - "text": "通关时间之塔10层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000338, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1345, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_345", - "text": "通关时间之塔20层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000339, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1346, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_346", - "text": "通关时间之塔30层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000340, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1347, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_347", - "text": "通关时间之塔40层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000341, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1348, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_348", - "text": "通关无限之塔5层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000342, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1349, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_349", - "text": "通关无限之塔7层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000343, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1350, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_350", - "text": "通关无限之塔10层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000344, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1351, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_351", - "text": "无限之塔单周期获得10星" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000345, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1352, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_352", - "text": "无限之塔单周期获得20星" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000346, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1353, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_353", - "text": "无限之塔单周期获得30星" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000347, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1354, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_354", - "text": "无限之塔单周期获得40星" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000348, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1355, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_355", - "text": "无限之塔单周期获得50星" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000349, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1356, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_356", - "text": "无限之塔单周期获得60星" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000350, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1357, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_357", - "text": "6星通关无限之塔10层" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000351, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1358, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_358", - "text": "首次通关完整的时间之塔" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000352, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1359, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_359", - "text": "累计挑战荒芜之境-火之热情50次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000353, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1360, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_360", - "text": "累计挑战荒芜之境-火之热情100次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000354, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1361, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_361", - "text": "累计挑战荒芜之境-火之热情200次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000355, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1362, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_362", - "text": "累计挑战荒芜之境-火之热情500次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000356, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1363, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_363", - "text": "累计挑战荒芜之境-林之感官50次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000357, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1364, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_364", - "text": "累计挑战荒芜之境-林之感官100次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000358, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1365, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_365", - "text": "累计挑战荒芜之境-林之感官200次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000359, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1366, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_366", - "text": "累计挑战荒芜之境-林之感官500次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000360, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1367, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_367", - "text": "累计挑战荒芜之境-水之包容50次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000361, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1368, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_368", - "text": "累计挑战荒芜之境-水之包容100次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000362, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1369, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_369", - "text": "累计挑战荒芜之境-水之包容200次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000363, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1370, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_370", - "text": "累计挑战荒芜之境-水之包容500次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000364, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1371, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_371", - "text": "累计挑战荒芜之境-光之荣耀50次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000365, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 - }, - { - "key": 1372, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_372", - "text": "累计挑战荒芜之境-光之荣耀100次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000366, - "task_icon": "cj_icon_lb_ty01", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], - "jump": 0 - }, - { - "key": 1373, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_373", - "text": "累计挑战荒芜之境-光之荣耀200次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000367, - "task_icon": "cj_icon_lb_ty03", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "jump": 0 - }, - { - "key": 1374, - "task_group_from": 4, - "task_name": { - "key": "achieve_achieve_task_task_name_374", - "text": "累计挑战荒芜之境-光之荣耀500次" - }, - "task_desc": { - "key": "", - "text": "" - }, - "task_buried": 16000368, - "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, - "task_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], - "jump": 0 + "jump": 168 } ] \ No newline at end of file diff --git a/bin/json/game_activetask.json b/bin/json/game_activetask.json index 63be6e754..ca75acaf7 100644 --- a/bin/json/game_activetask.json +++ b/bin/json/game_activetask.json @@ -3,9 +3,134 @@ "id": 1001, "name": { "key": "name_01", - "text": "胜利5次" + "text": "竞技场胜利5次" }, - "buried": 17100212, + "buried": 22000001, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100000 + }, + { + "a": "attr", + "t": "guildactive", + "n": 10 + }, + { + "a": "attr", + "t": "guildexp", + "n": 10 + } + ] + }, + { + "id": 1002, + "name": { + "key": "name_02", + "text": "竞技场胜利10次" + }, + "buried": 22000002, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100000 + }, + { + "a": "attr", + "t": "guildactive", + "n": 10 + }, + { + "a": "attr", + "t": "guildexp", + "n": 10 + } + ] + }, + { + "id": 1003, + "name": { + "key": "name_03", + "text": "竞技场胜利15次" + }, + "buried": 22000003, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100000 + }, + { + "a": "attr", + "t": "guildactive", + "n": 10 + }, + { + "a": "attr", + "t": "guildexp", + "n": 10 + } + ] + }, + { + "id": 1004, + "name": { + "key": "name_04", + "text": "竞技场胜利20次" + }, + "buried": 22000004, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100000 + }, + { + "a": "attr", + "t": "guildactive", + "n": 10 + }, + { + "a": "attr", + "t": "guildexp", + "n": 10 + } + ] + }, + { + "id": 1005, + "name": { + "key": "name_05", + "text": "竞技场胜利25次" + }, + "buried": 22000005, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 100000 + }, + { + "a": "attr", + "t": "guildactive", + "n": 10 + }, + { + "a": "attr", + "t": "guildexp", + "n": 10 + } + ] + }, + { + "id": 1006, + "name": { + "key": "name_06", + "text": "竞技场胜利30次" + }, + "buried": 22000006, "reward": [ { "a": "attr", diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 80be3083b..df5cdb740 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -2969,7 +2969,7 @@ "text": "" }, "battleEvents": [], - "ScoreGroupID": 4101, + "ScoreGroupID": 0, "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], @@ -3706,114 +3706,6 @@ "Numrounds": 60, "BossRounds": 0 }, - { - "id": 301, - "PlayType": 11, - "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", - "battleScenes": [ - "bossfight_naturetitan_03" - ], - "BGMusic": "", - "LoadingId": 0, - "HideAlienSpace": false, - "HideFightUI": false, - "RuleTips": { - "key": "", - "text": "" - }, - "BattleTips": { - "key": "", - "text": "" - }, - "battleEvents": [], - "ScoreGroupID": 0, - "disableAiCamera": false, - "ChoseCamp": [], - "DisableCamp": [], - "DefaultHero": 0, - "ChoseHero": [], - "DisableHero": [], - "LockSlots": [], - "HeroCheck": [], - "RedAssistTeam": 0, - "BlueAssistTeam": 0, - "CanFriendHelp": true, - "Numrounds": 0, - "BossRounds": 0 - }, - { - "id": 302, - "PlayType": 11, - "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", - "battleScenes": [ - "bossfight_naturetitan_02" - ], - "BGMusic": "", - "LoadingId": 0, - "HideAlienSpace": false, - "HideFightUI": false, - "RuleTips": { - "key": "", - "text": "" - }, - "BattleTips": { - "key": "", - "text": "" - }, - "battleEvents": [], - "ScoreGroupID": 0, - "disableAiCamera": false, - "ChoseCamp": [], - "DisableCamp": [], - "DefaultHero": 0, - "ChoseHero": [], - "DisableHero": [], - "LockSlots": [], - "HeroCheck": [], - "RedAssistTeam": 0, - "BlueAssistTeam": 0, - "CanFriendHelp": true, - "Numrounds": 0, - "BossRounds": 0 - }, - { - "id": 303, - "PlayType": 11, - "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", - "battleScenes": [ - "bossfight_naturetitan_01" - ], - "BGMusic": "", - "LoadingId": 0, - "HideAlienSpace": false, - "HideFightUI": false, - "RuleTips": { - "key": "", - "text": "" - }, - "BattleTips": { - "key": "", - "text": "" - }, - "battleEvents": [], - "ScoreGroupID": 0, - "disableAiCamera": false, - "ChoseCamp": [], - "DisableCamp": [], - "DefaultHero": 0, - "ChoseHero": [], - "DisableHero": [], - "LockSlots": [], - "HeroCheck": [], - "RedAssistTeam": 0, - "BlueAssistTeam": 0, - "CanFriendHelp": true, - "Numrounds": 0, - "BossRounds": 0 - }, { "id": 10103101, "PlayType": 1, @@ -4245,5 +4137,113 @@ "CanFriendHelp": false, "Numrounds": 0, "BossRounds": 0 + }, + { + "id": 4101, + "PlayType": 11, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "bossfight_naturetitan_03" + ], + "BGMusic": "", + "LoadingId": 0, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 4101, + "disableAiCamera": true, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 60, + "BossRounds": 0 + }, + { + "id": 4201, + "PlayType": 11, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "bossfight_naturetitan_02" + ], + "BGMusic": "", + "LoadingId": 0, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 4201, + "disableAiCamera": true, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 60, + "BossRounds": 0 + }, + { + "id": 4301, + "PlayType": 11, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "bossfight_naturetitan_01" + ], + "BGMusic": "", + "LoadingId": 0, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 4301, + "disableAiCamera": true, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 60, + "BossRounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 0aaef03ce..cfc617c3d 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -10915,7 +10915,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_329", - "text": "获取烤乳猪" + "text": "获取烟熏三文鱼" }, "type": 187, "valid": 0, @@ -10932,7 +10932,7 @@ }, "value": 1, "filter": [ - 14020009 + 14020022 ], "filter2": [] }, @@ -10945,7 +10945,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_330", - "text": "获取烤乳猪" + "text": "获取蜜汁烤鸡" }, "type": 187, "valid": 0, @@ -10962,7 +10962,7 @@ }, "value": 1, "filter": [ - 14020009 + 14020006 ], "filter2": [] }, @@ -10975,7 +10975,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_331", - "text": "获取烤乳猪" + "text": "获取蜂蜜蛋糕" }, "type": 187, "valid": 0, @@ -10992,7 +10992,7 @@ }, "value": 1, "filter": [ - 14020009 + 14020011 ], "filter2": [] }, @@ -11005,7 +11005,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_332", - "text": "获取烤乳猪" + "text": "获取炸酱面" }, "type": 187, "valid": 0, @@ -11022,7 +11022,7 @@ }, "value": 1, "filter": [ - 14020009 + 14020017 ], "filter2": [] }, @@ -25662,7 +25662,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_831", - "text": "通关声之遗迹-火之热情50次" + "text": "通关火焰泰坦50次" }, "type": 14, "valid": 0, @@ -25690,7 +25690,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_832", - "text": "通关声之遗迹-火之热情100次" + "text": "通关火焰泰坦100次" }, "type": 14, "valid": 0, @@ -25718,7 +25718,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_833", - "text": "通关声之遗迹-火之热情200次" + "text": "通关火焰泰坦200次" }, "type": 14, "valid": 0, @@ -25746,7 +25746,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_834", - "text": "通关声之遗迹-火之热情500次" + "text": "通关火焰泰坦500次" }, "type": 14, "valid": 0, @@ -25774,7 +25774,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_835", - "text": "通关声之遗迹-林的感官50次" + "text": "通关森林泰坦50次" }, "type": 14, "valid": 0, @@ -25802,7 +25802,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_836", - "text": "通关声之遗迹-林的感官100次" + "text": "通关森林泰坦100次" }, "type": 14, "valid": 0, @@ -25830,7 +25830,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_837", - "text": "通关声之遗迹-林的感官200次" + "text": "通关森林泰坦200次" }, "type": 14, "valid": 0, @@ -25858,7 +25858,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_838", - "text": "通关声之遗迹-林的感官500次" + "text": "通关森林泰坦500次" }, "type": 14, "valid": 0, @@ -25886,7 +25886,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_839", - "text": "通关声之遗迹-水的包容50次" + "text": "通关冰霜泰坦50次" }, "type": 14, "valid": 0, @@ -25914,7 +25914,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_840", - "text": "通关声之遗迹-水的包容100次" + "text": "通关冰霜泰坦100次" }, "type": 14, "valid": 0, @@ -25942,7 +25942,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_841", - "text": "通关声之遗迹-水的包容200次" + "text": "通关冰霜泰坦200次" }, "type": 14, "valid": 0, @@ -25970,7 +25970,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_842", - "text": "通关声之遗迹-水的包容500次" + "text": "通关冰霜泰坦500次" }, "type": 14, "valid": 0, @@ -26222,7 +26222,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_851", - "text": "通关祭祀神殿-阿佩普50次" + "text": "通关巨型猩猩怪兽50次" }, "type": 14, "valid": 0, @@ -26250,7 +26250,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_852", - "text": "通关祭祀神殿-阿佩普100次" + "text": "通关巨型猩猩怪兽100次" }, "type": 14, "valid": 0, @@ -26278,7 +26278,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_853", - "text": "通关祭祀神殿-阿佩普200次" + "text": "通关巨型猩猩怪兽200次" }, "type": 14, "valid": 0, @@ -26306,7 +26306,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_854", - "text": "通关祭祀神殿-阿佩普500次" + "text": "通关巨型猩猩怪兽500次" }, "type": 14, "valid": 0, @@ -26334,7 +26334,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_855", - "text": "通关祭祀神殿-克洛诺斯50次" + "text": "通关火龙50次" }, "type": 14, "valid": 0, @@ -26362,7 +26362,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_856", - "text": "通关祭祀神殿-克洛诺斯100次" + "text": "通关火龙100次" }, "type": 14, "valid": 0, @@ -26390,7 +26390,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_857", - "text": "通关祭祀神殿-克洛诺斯200次" + "text": "通关火龙200次" }, "type": 14, "valid": 0, @@ -26418,7 +26418,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_858", - "text": "通关祭祀神殿-克洛诺斯500次" + "text": "通关火龙500次" }, "type": 14, "valid": 0, @@ -26446,7 +26446,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_859", - "text": "通关祭祀神殿-安德拉斯50次" + "text": "通关大厨50次" }, "type": 14, "valid": 0, @@ -26474,7 +26474,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_860", - "text": "通关祭祀神殿-安德拉斯100次" + "text": "通关大厨100次" }, "type": 14, "valid": 0, @@ -26502,7 +26502,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_861", - "text": "通关祭祀神殿-安德拉斯200次" + "text": "通关大厨200次" }, "type": 14, "valid": 0, @@ -26530,7 +26530,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_862", - "text": "通关祭祀神殿-安德拉斯500次" + "text": "通关大厨500次" }, "type": 14, "valid": 0, @@ -26558,7 +26558,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_863", - "text": "通关祭祀神殿-法芙娜50次" + "text": "通关格尔族50次" }, "type": 14, "valid": 0, @@ -26586,7 +26586,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_864", - "text": "通关祭祀神殿-法芙娜100次" + "text": "通关格尔族100次" }, "type": 14, "valid": 0, @@ -26614,7 +26614,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_865", - "text": "通关祭祀神殿-法芙娜200次" + "text": "通关格尔族200次" }, "type": 14, "valid": 0, @@ -26642,7 +26642,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_866", - "text": "通关祭祀神殿-法芙娜500次" + "text": "通关格尔族500次" }, "type": 14, "valid": 0, @@ -26670,7 +26670,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_867", - "text": "首次在60秒内通关祭祀神殿-克洛诺斯难度10" + "text": "首次在60秒内通关火龙难度10" }, "type": 14, "valid": 0, @@ -26698,7 +26698,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_868", - "text": "首次在60秒内通关祭祀神殿-阿佩普难度10" + "text": "首次在60秒内通关巨型猩猩怪兽难度10" }, "type": 14, "valid": 0, @@ -26726,7 +26726,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_869", - "text": "首次在60秒内通关祭祀神殿-法芙娜难度10" + "text": "首次在60秒内通关格尔族难度10" }, "type": 14, "valid": 0, @@ -26754,7 +26754,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_870", - "text": "首次在60秒内通关祭祀神殿-安德拉斯难度10" + "text": "首次在60秒内通关大厨难度10" }, "type": 14, "valid": 0, @@ -32968,6 +32968,156 @@ ], "filter2": [] }, + { + "id": 18000120, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1076", + "text": "辉月等级达到2级" + }, + "type": 242, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 2, + "filter": [], + "filter2": [] + }, + { + "id": 18000121, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1077", + "text": "辉月等级达到3级" + }, + "type": 242, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 3, + "filter": [], + "filter2": [] + }, + { + "id": 18000122, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1078", + "text": "辉月等级达到4级" + }, + "type": 242, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 4, + "filter": [], + "filter2": [] + }, + { + "id": 18000123, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1079", + "text": "辉月等级达到5级" + }, + "type": 242, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 5, + "filter": [], + "filter2": [] + }, + { + "id": 18000124, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1080", + "text": "辉月等级达到6级" + }, + "type": 242, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [], + "filter2": [] + }, { "id": 19000001, "refresh": 0, @@ -37135,5 +37285,173 @@ 90 ], "filter2": [] + }, + { + "id": 22000001, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1212", + "text": "竞技场胜利5次" + }, + "type": 131, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 5, + "filter": [], + "filter2": [] + }, + { + "id": 22000002, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1213", + "text": "竞技场胜利10次" + }, + "type": 131, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 10, + "filter": [], + "filter2": [] + }, + { + "id": 22000003, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1214", + "text": "竞技场胜利15次" + }, + "type": 131, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 15, + "filter": [], + "filter2": [] + }, + { + "id": 22000004, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1215", + "text": "竞技场胜利20次" + }, + "type": 131, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 20, + "filter": [], + "filter2": [] + }, + { + "id": 22000005, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1216", + "text": "竞技场胜利25次" + }, + "type": 131, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 25, + "filter": [], + "filter2": [] + }, + { + "id": 22000006, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1217", + "text": "竞技场胜利30次" + }, + "type": 131, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 30, + "filter": [], + "filter2": [] } ] \ No newline at end of file diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 36f45be0b..cbd3839ff 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1479,5 +1479,50 @@ "id": 253, "insert": 1, "filter": [] + }, + { + "id": 254, + "insert": 1, + "filter": [ + "eq" + ] + }, + { + "id": 255, + "insert": 2, + "filter": [ + "eq" + ] + }, + { + "id": 256, + "insert": 1, + "filter": [ + "eq", + "gte" + ] + }, + { + "id": 257, + "insert": 2, + "filter": [ + "gte" + ] + }, + { + "id": 258, + "insert": 2, + "filter": [ + "eq", + "gte" + ] + }, + { + "id": 259, + "insert": 3, + "filter": [ + "eq", + "eq" + ] } ] \ No newline at end of file diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 85e8c0c03..944652880 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -539,7 +539,7 @@ }, { "key": "plundercollege", - "keyint": 20, + "keyint": 21, "name": { "key": "item_coin_name_21", "text": "旗帜" @@ -563,5 +563,32 @@ "key": "item_coin_intr2_21", "text": "这是繁荣的象征" } + }, + { + "key": "pvpintegral", + "keyint": 22, + "name": { + "key": "item_coin_name_22", + "text": "竞技场积分" + }, + "hold": 1, + "color": 4, + "effects": "", + "access": [ + 10015 + ], + "img": "attr_sxintegral", + "intr": { + "key": "item_coin_intr_22", + "text": "竞技场的荣誉象征,不断的累计该积分会获得更多奖励" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "item_coin_intr2_22", + "text": "\"我将脱颖而出。\"" + } } ] \ No newline at end of file diff --git a/bin/json/game_enchantboss.json b/bin/json/game_enchantboss.json index 9792e79c7..052a13638 100644 --- a/bin/json/game_enchantboss.json +++ b/bin/json/game_enchantboss.json @@ -17,7 +17,7 @@ "n": 1 } ], - "bossmodel": 55005, + "heroId": "55005", "main_text": { "key": "enchantboss_boss_main_text_01", "text": "BOSS主界面描述" @@ -27,9 +27,7 @@ "text": "BOSS攻略描述" }, "boss": [ - 301011, - 301012, - 301013 + 1430001 ], "ps_consume": [ { @@ -45,8 +43,10 @@ "n": 1 } ], - "BattleReadyID": 301, - "heroexp": 50, + "BattleReadyID": 4101, + "heroexp": 0, + "spine": "bossShow_huolong", + "icon": "hkz_wftj_wjyz03", "back_png": "wjyz_img003", "bossIcon": "gl_img_55005" }, @@ -68,7 +68,7 @@ "n": 1 } ], - "bossmodel": 55006, + "heroId": "55007", "main_text": { "key": "enchantboss_boss_main_text_02", "text": "BOSS主界面描述" @@ -78,9 +78,7 @@ "text": "BOSS攻略描述" }, "boss": [ - 301011, - 301012, - 301013 + 1430002 ], "ps_consume": [ { @@ -96,8 +94,10 @@ "n": 1 } ], - "BattleReadyID": 302, - "heroexp": 50, + "BattleReadyID": 4201, + "heroexp": 0, + "spine": "bossShow_huolong", + "icon": "hkz_wftj_wjyz02", "back_png": "wjyz_img001", "bossIcon": "gl_img_55007" }, @@ -129,7 +129,7 @@ "n": 1 } ], - "bossmodel": 55007, + "heroId": "55006", "main_text": { "key": "enchantboss_boss_main_text_03", "text": "BOSS主界面描述" @@ -139,9 +139,7 @@ "text": "BOSS攻略描述" }, "boss": [ - 301011, - 301012, - 301013 + 1430003 ], "ps_consume": [ { @@ -157,8 +155,10 @@ "n": 1 } ], - "BattleReadyID": 303, - "heroexp": 50, + "BattleReadyID": 4301, + "heroexp": 0, + "spine": "bossShow_huolong", + "icon": "hkz_wftj_wjyz01", "back_png": "wjyz_img002", "bossIcon": "gl_img_55006" } diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index e608d0877..abdf81b8b 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -178,7 +178,7 @@ "id": 6, "name": { "key": "gamesummary_node_name_6", - "text": "与驴同行" + "text": "猫鼠游戏" }, "tabId": 11003, "type": 5, @@ -216,12 +216,12 @@ "id": 7, "name": { "key": "gamesummary_node_name_7", - "text": "打豚鼠" + "text": "扑克对决" }, "tabId": 11003, "type": 6, "jumpId": 10071, - "icon": "ty_icon_dfzw", + "icon": "ty_icon_zh", "mapPos": { "x": 5071, "y": 1270 @@ -238,12 +238,12 @@ "id": 8, "name": { "key": "gamesummary_node_name_8", - "text": "巅峰之王" + "text": "与驴同行" }, "tabId": 11004, "type": 0, "jumpId": 10073, - "icon": "ty_icon_dfzw", + "icon": "ty_icon_ft", "mapPos": { "x": 5071, "y": 1270 @@ -260,7 +260,7 @@ "id": 9, "name": { "key": "gamesummary_node_name_9", - "text": "巅峰之王" + "text": "胜者为王" }, "tabId": 11004, "type": 0, @@ -277,49 +277,5 @@ }, "bg": "", "dropshow": [] - }, - { - "id": 10, - "name": { - "key": "gamesummary_node_name_2", - "text": "驯龙养成" - }, - "tabId": 12001, - "type": 1, - "jumpId": 10045, - "icon": "ty_icon_xlyc", - "mapPos": { - "x": 4195, - "y": 2042 - }, - "params": "", - "introduce": { - "key": "gamesummary_node_introdunce_1", - "text": "起初,没有人在意这次冒险,对于反派来说,这不过是又一次嘲讽失败者的机会。" - }, - "bg": "", - "dropshow": [] - }, - { - "id": 11, - "name": { - "key": "gamesummary_node_name_1", - "text": "捕羊大赛" - }, - "tabId": 12001, - "type": 0, - "jumpId": 10042, - "icon": "ty_qp_by", - "mapPos": { - "x": 5173, - "y": 1748 - }, - "params": "", - "introduce": { - "key": "gamesummary_node_introdunce_2", - "text": "靴猫继续把玩着手中的剑,他等候那些跃跃欲试站在台上的人,等着那个最强者出现。" - }, - "bg": "", - "dropshow": [] } ] \ No newline at end of file diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index 6ded0622a..f64591c9f 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -70,23 +70,5 @@ "key": "gamesummary_fathernode_usetext_4", "text": "很久很久以前,在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…" } - }, - { - "tabId": 12001, - "layer": 0, - "name": { - "key": "gamesummary_fathernode_name_5", - "text": "成长之路" - }, - "icon": "hkz_wftj_mj", - "mapPos": { - "x": 0, - "y": 557 - }, - "scale": 1.3, - "usetext": { - "key": "gamesummary_fathernode_usetext_1", - "text": "起初,没有人在意这次冒险,对于反派来说,这不过是又一次嘲讽失败者的机会。" - } } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index cec4fae93..12fc7d199 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -790,12 +790,13 @@ "enhanceboss_ps": 10, "plunder_pvp_battlereadyid": 105, "plunder_pvp_college_num": { - "a": "attr", - "t": "plundercollege", + "a": "item", + "t": "30000001", "n": 400 }, "plunder_pvp_college_time": 7, "pvp_endtime": 3, - "pvp_maintenancetime": 2 + "pvp_maintenancetime": 2, + "pvp_integraltool": "pvpintegral" } ] \ No newline at end of file diff --git a/bin/json/game_guildlv.json b/bin/json/game_guildlv.json index 58470e922..3808bd12c 100644 --- a/bin/json/game_guildlv.json +++ b/bin/json/game_guildlv.json @@ -2,51 +2,61 @@ { "lv": 1, "exp": 1800, - "member_max": 30 + "member_max": 30, + "guild_expedition": 5 }, { "lv": 2, "exp": 3600, - "member_max": 30 + "member_max": 30, + "guild_expedition": 5 }, { "lv": 3, "exp": 5400, - "member_max": 30 + "member_max": 30, + "guild_expedition": 7 }, { "lv": 4, "exp": 7200, - "member_max": 30 + "member_max": 30, + "guild_expedition": 7 }, { "lv": 5, "exp": 9000, - "member_max": 30 + "member_max": 30, + "guild_expedition": 8 }, { "lv": 6, "exp": 10800, - "member_max": 30 + "member_max": 30, + "guild_expedition": 8 }, { "lv": 7, "exp": 12600, - "member_max": 30 + "member_max": 30, + "guild_expedition": 10 }, { "lv": 8, "exp": 14400, - "member_max": 30 + "member_max": 30, + "guild_expedition": 10 }, { "lv": 9, "exp": 16200, - "member_max": 30 + "member_max": 30, + "guild_expedition": 10 }, { "lv": 10, "exp": 0, - "member_max": 30 + "member_max": 30, + "guild_expedition": 10 } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index c64410ff6..1ee6dd6f0 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -18353,7 +18353,7 @@ }, "describe": { "key": "item_item_describe_10000036", - "text": "原始社会最常见的货币,在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带,又受人们喜爱。" + "text": "原始社会最常见的货币,在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带,广受人们喜爱。" }, "dialogue": { "key": "item_item_dialogue_10000036", diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index f5dd6c20f..85bfa2730 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -3612,8 +3612,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.5, - "atkpro": 3, + "hppro": 0.8, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3632,8 +3632,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.5, - "atkpro": 3, + "hppro": 0.8, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3652,8 +3652,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.5, - "atkpro": 3, + "hppro": 0.8, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3672,8 +3672,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.5, - "atkpro": 3, + "hppro": 0.8, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3692,8 +3692,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.5, - "atkpro": 3, + "hppro": 0.8, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3812,7 +3812,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.65, + "hppro": 1.2, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -3832,8 +3832,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.65, - "atkpro": 3, + "hppro": 0.88, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3852,8 +3852,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.65, - "atkpro": 3, + "hppro": 0.88, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3872,8 +3872,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.65, - "atkpro": 3, + "hppro": 0.88, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3892,8 +3892,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.65, - "atkpro": 3, + "hppro": 0.88, + "atkpro": 2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4012,8 +4012,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.4, - "atkpro": 3, + "hppro": 1.2, + "atkpro": 2.5, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4032,8 +4032,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.4, - "atkpro": 3, + "hppro": 1.2, + "atkpro": 2.5, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4052,8 +4052,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.4, - "atkpro": 3, + "hppro": 1.2, + "atkpro": 2.5, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4072,8 +4072,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.4, - "atkpro": 3, + "hppro": 1.2, + "atkpro": 2.5, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4092,8 +4092,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.4, - "atkpro": 3, + "hppro": 1.2, + "atkpro": 2.5, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4212,7 +4212,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.6, + "hppro": 1.3, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4232,7 +4232,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.6, + "hppro": 1.3, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4252,7 +4252,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.6, + "hppro": 1.3, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4272,7 +4272,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.6, + "hppro": 1.3, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4292,7 +4292,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.6, + "hppro": 1.3, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4412,7 +4412,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.9, + "hppro": 1.4, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4432,7 +4432,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.9, + "hppro": 1.4, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4452,7 +4452,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.9, + "hppro": 1.4, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4472,7 +4472,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.9, + "hppro": 1.4, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4492,7 +4492,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.9, + "hppro": 1.4, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4618,7 +4618,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 130, + "speed": 150, "modelsize": 1 }, { @@ -4713,7 +4713,7 @@ "newskill": [], "lv": 60, "hppro": 2, - "atkpro": 4, + "atkpro": 3, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4812,7 +4812,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 3.2, + "hppro": 1.6, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4832,7 +4832,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 3.2, + "hppro": 1.6, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4852,7 +4852,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 3.2, + "hppro": 1.6, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4872,7 +4872,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 3.2, + "hppro": 1.6, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -4892,7 +4892,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 3.2, + "hppro": 1.6, "atkpro": 3, "defpro": 0.5, "skill1": 1, @@ -373431,5 +373431,305 @@ "skill3": 1, "speed": 140, "modelsize": 1 + }, + { + "Id": 1430001, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 72, + "modelsize": 1 + }, + { + "Id": 1430001, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 72, + "modelsize": 1 + }, + { + "Id": 1430001, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 3, + "atkpro": 0.4, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 77, + "modelsize": 1 + }, + { + "Id": 1430001, + "pos": 4, + "captainId": 1, + "IsBoss": true, + "bossHpCnt": 4, + "heroid": 85001, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.75, + "atkpro": 0.35, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 73, + "modelsize": 1 + }, + { + "Id": 1430001, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 3, + "atkpro": 0.4, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 74, + "modelsize": 1 + }, + { + "Id": 1430002, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 72, + "modelsize": 1 + }, + { + "Id": 1430002, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 72, + "modelsize": 1 + }, + { + "Id": 1430002, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 3, + "atkpro": 0.4, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 77, + "modelsize": 1 + }, + { + "Id": 1430002, + "pos": 4, + "captainId": 1, + "IsBoss": true, + "bossHpCnt": 4, + "heroid": 85003, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.75, + "atkpro": 0.35, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 73, + "modelsize": 1 + }, + { + "Id": 1430002, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 3, + "atkpro": 0.4, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 74, + "modelsize": 1 + }, + { + "Id": 1430003, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 72, + "modelsize": 1 + }, + { + "Id": 1430003, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 72, + "modelsize": 1 + }, + { + "Id": 1430003, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 3, + "atkpro": 0.4, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 77, + "modelsize": 1 + }, + { + "Id": 1430003, + "pos": 4, + "captainId": 1, + "IsBoss": true, + "bossHpCnt": 4, + "heroid": 85002, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 0.75, + "atkpro": 0.35, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 73, + "modelsize": 1 + }, + { + "Id": 1430003, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 100, + "hppro": 3, + "atkpro": 0.4, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 74, + "modelsize": 1 } ] \ No newline at end of file diff --git a/bin/json/game_plunderdevelop.json b/bin/json/game_plunderdevelop.json index 53903f5ec..7af50cb3f 100644 --- a/bin/json/game_plunderdevelop.json +++ b/bin/json/game_plunderdevelop.json @@ -6,6 +6,10 @@ "key": "plunder_plunder_develop_name_01", "text": "初级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_01", + "text": "初级航海术" + }, "open": [], "last": [], "icon": "jn_24004_1", @@ -14,7 +18,7 @@ "buffID": 1, "txt": { "key": "plunder_plunder_develop_txt_01", - "text": "货船免费刷新次数+1" + "text": "货船免费刷新次数+{0}" } }, { @@ -24,17 +28,21 @@ "key": "plunder_plunder_develop_name_02", "text": "初级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_02", + "text": "初级航海术" + }, "open": [], "last": [ 1001 ], "icon": "jn_24004_1", - "place": 0, + "place": 1, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_02", - "text": "全队攻击增加3%" + "text": "全队攻击增加{0}%" } }, { @@ -44,17 +52,21 @@ "key": "plunder_plunder_develop_name_03", "text": "初级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_03", + "text": "初级航海术" + }, "open": [], "last": [ 1001 ], "icon": "jn_24004_1", - "place": 0, + "place": 3, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_03", - "text": "全队防御增加3%" + "text": "全队防御增加{0}%" } }, { @@ -64,17 +76,21 @@ "key": "plunder_plunder_develop_name_04", "text": "初级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_04", + "text": "初级航海术" + }, "open": [], "last": [ 1002 ], "icon": "jn_24004_1", - "place": 0, + "place": 2, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_04", - "text": "全队生命增加3%" + "text": "全队生命增加{0}%" } }, { @@ -84,17 +100,21 @@ "key": "plunder_plunder_develop_name_05", "text": "初级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_05", + "text": "初级航海术" + }, "open": [], "last": [ 1003 ], "icon": "jn_24004_1", - "place": 0, + "place": 4, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_05", - "text": "全队速度增加3%" + "text": "全队速度增加{0}%" } }, { @@ -104,18 +124,22 @@ "key": "plunder_plunder_develop_name_06", "text": "初级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_06", + "text": "初级航海术" + }, "open": [], "last": [ 1004, 1005 ], "icon": "jn_24004_1", - "place": 0, + "place": 5, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_06", - "text": "全队暴击率增加3%" + "text": "全队暴击率增加{0}%" } }, { @@ -125,6 +149,10 @@ "key": "plunder_plunder_develop_name_07", "text": "中级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_07", + "text": "中级航海术" + }, "open": [], "last": [ 1006 @@ -135,7 +163,7 @@ "buffID": 1, "txt": { "key": "plunder_plunder_develop_txt_07", - "text": "货船免费刷新次数+1" + "text": "货船免费刷新次数+{0}" } }, { @@ -145,17 +173,21 @@ "key": "plunder_plunder_develop_name_08", "text": "中级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_08", + "text": "中级航海术" + }, "open": [], "last": [ 1007 ], "icon": "jn_43003_1", - "place": 0, + "place": 1, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_08", - "text": "全队攻击增加6%" + "text": "全队攻击增加{0}%" } }, { @@ -165,17 +197,21 @@ "key": "plunder_plunder_develop_name_09", "text": "中级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_09", + "text": "中级航海术" + }, "open": [], "last": [ 1007 ], "icon": "jn_43003_1", - "place": 0, + "place": 2, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_09", - "text": "全队防御增加6%" + "text": "全队防御增加{0}%" } }, { @@ -185,17 +221,21 @@ "key": "plunder_plunder_develop_name_10", "text": "中级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_10", + "text": "中级航海术" + }, "open": [], "last": [ 1008 ], "icon": "jn_43003_1", - "place": 0, + "place": 3, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_10", - "text": "全队生命增加6%" + "text": "全队生命增加{0}%" } }, { @@ -205,17 +245,21 @@ "key": "plunder_plunder_develop_name_11", "text": "中级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_11", + "text": "中级航海术" + }, "open": [], "last": [ 1009 ], "icon": "jn_43003_1", - "place": 0, + "place": 4, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_11", - "text": "全队速度增加6%" + "text": "全队速度增加{0}%" } }, { @@ -225,18 +269,22 @@ "key": "plunder_plunder_develop_name_12", "text": "中级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_12", + "text": "中级航海术" + }, "open": [], "last": [ 1010, 1011 ], "icon": "jn_43003_1", - "place": 0, + "place": 5, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_12", - "text": "全队暴击率增加6%" + "text": "全队暴击率增加{0}%" } }, { @@ -246,6 +294,10 @@ "key": "plunder_plunder_develop_name_13", "text": "高级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_13", + "text": "高级航海术" + }, "open": [], "last": [ 1012 @@ -256,7 +308,7 @@ "buffID": 1, "txt": { "key": "plunder_plunder_develop_txt_13", - "text": "货船免费刷新次数+1" + "text": "货船免费刷新次数+{0}" } }, { @@ -266,17 +318,21 @@ "key": "plunder_plunder_develop_name_14", "text": "高级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_14", + "text": "高级航海术" + }, "open": [], "last": [ 1013 ], "icon": "jn_35005_2", - "place": 0, + "place": 1, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_14", - "text": "全队攻击增加9%" + "text": "全队攻击增加{0}%" } }, { @@ -286,17 +342,21 @@ "key": "plunder_plunder_develop_name_15", "text": "高级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_15", + "text": "高级航海术" + }, "open": [], "last": [ 1013 ], "icon": "jn_35005_2", - "place": 0, + "place": 2, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_15", - "text": "全队防御增加9%" + "text": "全队防御增加{0}%" } }, { @@ -306,17 +366,21 @@ "key": "plunder_plunder_develop_name_16", "text": "高级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_16", + "text": "高级航海术" + }, "open": [], "last": [ 1014 ], "icon": "jn_35005_2", - "place": 0, + "place": 3, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_16", - "text": "全队生命增加3%" + "text": "全队生命增加{0}%" } }, { @@ -326,17 +390,21 @@ "key": "plunder_plunder_develop_name_17", "text": "高级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_17", + "text": "高级航海术" + }, "open": [], "last": [ 1015 ], "icon": "jn_35005_2", - "place": 0, + "place": 4, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_17", - "text": "全队速度增加9%" + "text": "全队速度增加{0}%" } }, { @@ -346,18 +414,22 @@ "key": "plunder_plunder_develop_name_18", "text": "高级航海术" }, + "skillname": { + "key": "plunder_plunder_develop_skillname_18", + "text": "高级航海术" + }, "open": [], "last": [ 1016, 1018 ], "icon": "jn_35005_2", - "place": 0, + "place": 5, "type": 1, "buffID": 300, "txt": { "key": "plunder_plunder_develop_txt_18", - "text": "全队暴击伤害增加10%" + "text": "全队暴击伤害增加{0}%" } } ] \ No newline at end of file diff --git a/bin/json/game_plunderlog.json b/bin/json/game_plunderlog.json index cc4e21794..262c1b1e8 100644 --- a/bin/json/game_plunderlog.json +++ b/bin/json/game_plunderlog.json @@ -12,7 +12,7 @@ "type": 2, "txt": { "key": "plunder_plunder_log_txt_02", - "text": "{0}成功将{1},运输到目的地,获得了{1}" + "text": "{0}掠夺了{1},成功获得了{2},以及大量其他物资。" } }, { @@ -20,7 +20,7 @@ "type": 3, "txt": { "key": "plunder_plunder_log_txt_03", - "text": "{0}掠夺了{2},成功获得了{1},以及大量其他物资。" + "text": "{0}成功将{1},运输到目的地,获得了{2}" } }, { @@ -28,7 +28,7 @@ "type": 4, "txt": { "key": "plunder_plunder_log_txt_04", - "text": "{0}掠夺了{2},但是失败了,对方成功摆脱了{0}。" + "text": "{0}掠夺了{1},但是失败了,对方成功摆脱了{2}。" } } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index b4e988dd9..cf12d93a9 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -3495,7 +3495,7 @@ 390001210, 1000, 1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 044026ea0..c57b891e4 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -382,7 +382,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_125004311_1", - "text": "进入2回合[color=#37d8a9]爱的抱抱[/color]状态。" + "text": "进入2回合[color=#37d8a9]爱的抱抱[/color]状态,且在每个队友行动前,为其驱散1个减益状态并回复其最大血量20%的血量,效果持续期间自身无法行动。" }, "buffid": [ 390001452 @@ -1723,7 +1723,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 5, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -1756,7 +1756,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 5, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -1789,7 +1789,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 5, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -1822,7 +1822,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 5, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -1855,7 +1855,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -2282,7 +2282,8 @@ "ChildSkill": { "Id": [ 225001211, - 225001215 + 225001215, + 225001213 ] }, "passSkill": [], @@ -2319,7 +2320,8 @@ "ChildSkill": { "Id": [ 225001221, - 225001225 + 225001225, + 225001213 ] }, "passSkill": [], @@ -2356,7 +2358,8 @@ "ChildSkill": { "Id": [ 225001231, - 225001235 + 225001235, + 225001213 ] }, "passSkill": [], @@ -2393,7 +2396,8 @@ "ChildSkill": { "Id": [ 225001241, - 225001245 + 225001245, + 225001213 ] }, "passSkill": [], @@ -2430,7 +2434,8 @@ "ChildSkill": { "Id": [ 225001251, - 225001255 + 225001255, + 225001213 ] }, "passSkill": [], @@ -2472,7 +2477,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_125001212_1", - "text": "回合结束时获得1回合[color=#37d8a9]神龙摆尾[/color],效果期间回合开始时攻击敌方,伤害为自身防御力200%。" + "text": "回合结束时获得1回合[color=#37d8a9]神龙摆尾[/color],受到攻击时获得1层[color=#37d8a9]玄御[/color]效果期间回合开始时攻击敌方,伤害为自身防御力200%。" }, "buffid": [ 390001209, @@ -10287,25 +10292,20 @@ "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", - "Type": 2, - "CD": 0, + "Type": 1, + "CD": 4, "Where": [], "Target": 2, "ChildSkill": { "Id": [ - 245001215, - 245001216, - 245001219 + 245001211, + 245001212 ] }, - "passSkill": [ - 245001215, - 245001216, - 245001219 - ], + "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_145001211_1", - "text": "无法受到任何控制效果,每回合行动前为己方全体清除任意一个非无法行动状态的减益状态并回复其5%最大生命值;且在任意队友获得减益状态时,自身获得20%行动值提升,每回合仅触发1次。" + "text": "对敌方所有敌人造成攻击力400%的伤害,附加2回合【无法获得增益】,并造成与伤害量等值的生命最大值下降。" }, "buffid": [], "map": "" @@ -11070,7 +11070,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11107,7 +11107,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11144,7 +11144,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11181,7 +11181,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11218,7 +11218,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11255,7 +11255,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11714,7 +11714,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11751,7 +11751,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11788,7 +11788,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11825,7 +11825,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11862,7 +11862,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -11899,7 +11899,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Where": [], "Target": 2, "ChildSkill": { @@ -22592,7 +22592,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Where": [], "Target": 2, "ChildSkill": { @@ -22625,7 +22625,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Where": [], "Target": 2, "ChildSkill": { @@ -22658,7 +22658,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Where": [], "Target": 2, "ChildSkill": { @@ -22691,7 +22691,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Where": [], "Target": 2, "ChildSkill": { @@ -22724,7 +22724,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Where": [], "Target": 2, "ChildSkill": { @@ -25543,7 +25543,7 @@ "IsMelee": 1, "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 0, "Where": [], "Target": 1, "ChildSkill": { @@ -30050,124 +30050,7 @@ { "id": 123003311, "level": 1, - "MaxLV": 5, - "UnavailablePlayTypes": [], - "SkillFlag": 4, - "EffectFlag": 10, - "Priority": 3, - "Name": { - "key": "skill_skill_atk_Name_123003311", - "text": "向死而生" - }, - "ico": "jn_23003_3", - "CorrectPos": 0, - "IsMelee": 0, - "act": "Skill_3", - "Type": 1, - "CD": 8, - "Where": [], - "Target": 1, - "ChildSkill": { - "Id": [ - 223003315, - 223003316 - ] - }, - "passSkill": [ - 223003316 - ], - "Desc": { - "key": "skill_skill_atk_Desc_123003311_1", - "text": "黛塔黛恩为己方1个目标附加2回合[color=#37d8a9]攻击提升[/color],若目标身上已有攻击提升则附加1回合[color=#37d8a9]暴击伤害提升[/color]。" - }, - "buffid": [ - 390001457, - 390001001 - ], - "map": "" - }, - { - "id": 123003311, - "level": 2, - "MaxLV": 5, - "UnavailablePlayTypes": [], - "SkillFlag": 4, - "EffectFlag": 10, - "Priority": 3, - "Name": { - "key": "skill_skill_atk_Name_123003311", - "text": "向死而生" - }, - "ico": "jn_23003_3", - "CorrectPos": 0, - "IsMelee": 0, - "act": "Skill_3", - "Type": 1, - "CD": 7, - "Where": [], - "Target": 1, - "ChildSkill": { - "Id": [ - 223003315, - 223003316 - ] - }, - "passSkill": [ - 223003316 - ], - "Desc": { - "key": "skill_skill_atk_Desc_123003311_2", - "text": "冷却时间减少1回合。" - }, - "buffid": [ - 390001457, - 390001001 - ], - "map": "" - }, - { - "id": 123003311, - "level": 3, - "MaxLV": 5, - "UnavailablePlayTypes": [], - "SkillFlag": 4, - "EffectFlag": 10, - "Priority": 3, - "Name": { - "key": "skill_skill_atk_Name_123003311", - "text": "向死而生" - }, - "ico": "jn_23003_3", - "CorrectPos": 0, - "IsMelee": 0, - "act": "Skill_3", - "Type": 1, - "CD": 6, - "Where": [], - "Target": 1, - "ChildSkill": { - "Id": [ - 223003315, - 223003316 - ] - }, - "passSkill": [ - 223003316 - ], - "Desc": { - "key": "skill_skill_atk_Desc_123003311_3", - "text": "冷却时间减少1回合。" - }, - "buffid": [ - 390001457, - 390001001 - ], - "map": "" - }, - { - "id": 123003311, - "level": 4, - "MaxLV": 5, + "MaxLV": 3, "UnavailablePlayTypes": [], "SkillFlag": 4, "EffectFlag": 10, @@ -30194,8 +30077,8 @@ 223003316 ], "Desc": { - "key": "skill_skill_atk_Desc_123003311_4", - "text": "冷却时间减少1回合。" + "key": "skill_skill_atk_Desc_123003311_1", + "text": "黛塔黛恩为己方1个目标附加2回合[color=#37d8a9]攻击提升[/color],若目标身上已有攻击提升则附加1回合[color=#37d8a9]暴击伤害提升[/color]。" }, "buffid": [ 390001457, @@ -30205,8 +30088,8 @@ }, { "id": 123003311, - "level": 5, - "MaxLV": 5, + "level": 2, + "MaxLV": 3, "UnavailablePlayTypes": [], "SkillFlag": 4, "EffectFlag": 10, @@ -30233,7 +30116,46 @@ 223003316 ], "Desc": { - "key": "skill_skill_atk_Desc_123003311_5", + "key": "skill_skill_atk_Desc_123003311_2", + "text": "冷却时间减少1回合。" + }, + "buffid": [ + 390001457, + 390001001 + ], + "map": "" + }, + { + "id": 123003311, + "level": 3, + "MaxLV": 3, + "UnavailablePlayTypes": [], + "SkillFlag": 4, + "EffectFlag": 10, + "Priority": 3, + "Name": { + "key": "skill_skill_atk_Name_123003311", + "text": "向死而生" + }, + "ico": "jn_23003_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 223003315, + 223003316 + ] + }, + "passSkill": [ + 223003316 + ], + "Desc": { + "key": "skill_skill_atk_Desc_123003311_3", "text": "冷却时间减少1回合。" }, "buffid": [ diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 816114164..f5f78f6d7 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1913,7 +1913,7 @@ "Id": 390001210, "Name": { "key": "skill_skill_buff_Name_390001210", - "text": "[color=#37d8a9]神龙摆尾之佑[/color]" + "text": "[color=#37d8a9]玄御[/color]" }, "Desc": { "key": "skill_skill_buff_Desc_390001210", diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 6ea20ee96..bf26e09bf 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -273,8 +273,8 @@ }, "icon": "jn_25001_2", "When": 16, - "FromCheck": "Target=3", - "TargetCheck": "", + "FromCheck": "", + "TargetCheck": "Target=3", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_worlddeal.json b/bin/json/game_worlddeal.json index 983878995..9fc3f7b5e 100644 --- a/bin/json/game_worlddeal.json +++ b/bin/json/game_worlddeal.json @@ -4,7 +4,7 @@ "item": [ { "a": "item", - "t": "14020009", + "t": "14020022", "n": 1 } ], @@ -22,7 +22,7 @@ "item": [ { "a": "item", - "t": "14020009", + "t": "14020006", "n": 1 } ], @@ -40,7 +40,7 @@ "item": [ { "a": "item", - "t": "14020009", + "t": "14020011", "n": 1 } ], @@ -58,7 +58,7 @@ "item": [ { "a": "item", - "t": "14020009", + "t": "14020017", "n": 1 } ], diff --git a/sys/configure/structs/Game.EnchantBossData.go b/sys/configure/structs/Game.EnchantBossData.go index cedd47086..2dc704369 100644 --- a/sys/configure/structs/Game.EnchantBossData.go +++ b/sys/configure/structs/Game.EnchantBossData.go @@ -14,7 +14,7 @@ type GameEnchantBossData struct { Bossid int32 Name string Dropshow []*Gameatn - Bossmodel int32 + HeroId string MainText string StrategyText string Boss []int32 @@ -22,6 +22,8 @@ type GameEnchantBossData struct { PsMg []*Gameatn BattleReadyID int32 Heroexp int32 + Spine string + Icon string BackPng string BossIcon string } @@ -49,7 +51,7 @@ func (_v *GameEnchantBossData)Deserialize(_buf map[string]interface{}) (err erro } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) } + { var _ok_ bool; if _v.HeroId, _ok_ = _buf["heroId"].(string); !_ok_ { err = errors.New("heroId error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["main_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MainText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MainText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["strategy_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StrategyText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StrategyText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { @@ -96,6 +98,8 @@ func (_v *GameEnchantBossData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } + { var _ok_ bool; if _v.Spine, _ok_ = _buf["spine"].(string); !_ok_ { err = errors.New("spine error"); return } } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; if _v.BackPng, _ok_ = _buf["back_png"].(string); !_ok_ { err = errors.New("back_png error"); return } } { var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } } return diff --git a/sys/configure/structs/Game.GuildLvData.go b/sys/configure/structs/Game.GuildLvData.go index a9119b9e2..e7af68858 100644 --- a/sys/configure/structs/Game.GuildLvData.go +++ b/sys/configure/structs/Game.GuildLvData.go @@ -14,6 +14,7 @@ type GameGuildLvData struct { Lv int32 Exp int32 MemberMax int32 + GuildExpedition int32 } const TypeId_GameGuildLvData = 150033963 @@ -26,6 +27,7 @@ func (_v *GameGuildLvData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["member_max"].(float64); !_ok_ { err = errors.New("member_max error"); return }; _v.MemberMax = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_expedition"].(float64); !_ok_ { err = errors.New("guild_expedition error"); return }; _v.GuildExpedition = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.PlunderDevelopData.go b/sys/configure/structs/Game.PlunderDevelopData.go index ae5364013..e444b9e2e 100644 --- a/sys/configure/structs/Game.PlunderDevelopData.go +++ b/sys/configure/structs/Game.PlunderDevelopData.go @@ -14,6 +14,7 @@ type GamePlunderDevelopData struct { Id int32 Itype int32 Name string + Skillname string Open []int32 Last []int32 Icon string @@ -33,6 +34,7 @@ func (_v *GamePlunderDevelopData)Deserialize(_buf map[string]interface{}) (err e { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/TEnum.EPlunderDevelopType.go b/sys/configure/structs/TEnum.EPlunderDevelopType.go new file mode 100644 index 000000000..08129dae7 --- /dev/null +++ b/sys/configure/structs/TEnum.EPlunderDevelopType.go @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEPlunderDevelopType_RefreshTimes = 101 + TEnumEPlunderDevelopType_Num = 102 + TEnumEPlunderDevelopType_Buff = 1 +) diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 62259e64e..1836cc387 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -329,6 +329,7 @@ type Tables struct { MonkeyReward *GameMonkeyReward MonkeyStage *GameMonkeyStage IntegralBoss *GameIntegralBoss + IntegralAchieve *GameIntegralAchieve IntegralReward *GameIntegralReward IntegralCondition *GameIntegralCondition IntegralBuff *GameIntegralBuff @@ -353,7 +354,6 @@ type Tables struct { SystemStroyTalk *GameSystemStroyTalk ActiveKing *GameActiveKing ActiveTask *GameActiveTask - EnchantbossReward *GameEnchantbossReward } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2269,6 +2269,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.IntegralBoss, err = NewGameIntegralBoss(buf) ; err != nil { return nil, err } + if buf, err = loader("game_integralachieve") ; err != nil { + return nil, err + } + if tables.IntegralAchieve, err = NewGameIntegralAchieve(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_integralreward") ; err != nil { return nil, err } @@ -2413,11 +2419,5 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.ActiveTask, err = NewGameActiveTask(buf) ; err != nil { return nil, err } - if buf, err = loader("game_enchantbossreward") ; err != nil { - return nil, err - } - if tables.EnchantbossReward, err = NewGameEnchantbossReward(buf) ; err != nil { - return nil, err - } return tables, nil } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 38774d387..0bee0608b 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -286,6 +286,7 @@ type GameGlobalData struct { PlunderPvpCollegeTime int32 PvpEndtime int32 PvpMaintenancetime int32 + PvpIntegraltool string } const TypeId_GameGlobalData = 477542761 @@ -1103,6 +1104,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) } + { var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } } return }