diff --git a/bin/json/game_arenachallengenpc.json b/bin/json/game_arenachallengenpc.json index 2f5a975ea..ccf3a5416 100644 --- a/bin/json/game_arenachallengenpc.json +++ b/bin/json/game_arenachallengenpc.json @@ -88,7 +88,7 @@ { "a": "attr", "t": "arenacoin", - "n": 12 + "n": 10 } ], "new_npc_reward": [ @@ -123,7 +123,7 @@ { "a": "attr", "t": "arenacoin", - "n": 12 + "n": 10 } ], "new_npc_reward": [ @@ -158,7 +158,7 @@ { "a": "attr", "t": "arenacoin", - "n": 14 + "n": 10 } ], "new_npc_reward": [ @@ -193,7 +193,7 @@ { "a": "attr", "t": "arenacoin", - "n": 14 + "n": 10 } ], "new_npc_reward": [ @@ -228,7 +228,7 @@ { "a": "attr", "t": "arenacoin", - "n": 16 + "n": 10 } ], "new_npc_reward": [ @@ -263,7 +263,7 @@ { "a": "attr", "t": "arenacoin", - "n": 16 + "n": 10 } ], "new_npc_reward": [ @@ -298,7 +298,7 @@ { "a": "attr", "t": "arenacoin", - "n": 18 + "n": 10 } ], "new_npc_reward": [ @@ -333,7 +333,7 @@ { "a": "attr", "t": "arenacoin", - "n": 18 + "n": 10 } ], "new_npc_reward": [ @@ -368,7 +368,7 @@ { "a": "attr", "t": "arenacoin", - "n": 20 + "n": 10 } ], "new_npc_reward": [ @@ -403,7 +403,7 @@ { "a": "attr", "t": "arenacoin", - "n": 20 + "n": 10 } ], "new_npc_reward": [ diff --git a/bin/json/game_arenarankreward.json b/bin/json/game_arenarankreward.json index 7e6c764b3..6543810aa 100644 --- a/bin/json/game_arenarankreward.json +++ b/bin/json/game_arenarankreward.json @@ -17,6 +17,11 @@ "a": "attr", "t": "diamond", "n": 600 + }, + { + "a": "item", + "t": "13000001", + "n": 3 } ] }, @@ -38,6 +43,11 @@ "a": "attr", "t": "diamond", "n": 550 + }, + { + "a": "item", + "t": "13000001", + "n": 2 } ] }, @@ -59,6 +69,11 @@ "a": "attr", "t": "diamond", "n": 500 + }, + { + "a": "item", + "t": "13000001", + "n": 2 } ] }, @@ -80,6 +95,11 @@ "a": "attr", "t": "diamond", "n": 450 + }, + { + "a": "item", + "t": "13000001", + "n": 1 } ] }, diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 043dcbda1..4b6286aa0 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -7,6 +7,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -40,6 +41,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -73,6 +75,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -106,6 +109,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -139,6 +143,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -172,6 +177,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -205,6 +211,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -238,6 +245,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -271,6 +279,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -304,6 +313,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -337,6 +347,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -370,6 +381,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -403,6 +415,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -436,6 +449,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -469,6 +483,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -502,6 +517,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -535,6 +551,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -570,6 +587,7 @@ "scenesfight_03_02", "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -603,6 +621,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -636,6 +655,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -669,6 +689,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -702,6 +723,7 @@ "battleScenes": [ "bossfight_naturetitan_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -735,6 +757,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -768,6 +791,7 @@ "battleScenes": [ "bossfight_chef_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -801,6 +825,7 @@ "battleScenes": [ "bossfight_spinymandrilla_03" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -834,6 +859,7 @@ "battleScenes": [ "bossfight_translate_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -867,6 +893,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -900,6 +927,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -933,6 +961,7 @@ "battleScenes": [ "bossfight_dragon_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -966,6 +995,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -999,6 +1029,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1034,6 +1065,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1069,6 +1101,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1104,6 +1137,7 @@ "battleScenes": [ "bossfight_naturetitan_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1137,6 +1171,7 @@ "battleScenes": [ "bossfight_naturetitan_03" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1170,6 +1205,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1205,6 +1241,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 1, "RuleTips": { @@ -1238,6 +1275,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 1, "RuleTips": { @@ -1274,6 +1312,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 1, "RuleTips": { @@ -1307,6 +1346,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1342,6 +1382,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1377,6 +1418,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1416,6 +1458,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1451,6 +1494,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1484,6 +1528,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1517,6 +1562,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1550,6 +1596,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1581,10 +1628,11 @@ "id": 10103001, "PlayType": 1, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_07", "battleScenes": [ - "scenesfight_05_01" + "scenesfight_09" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1614,10 +1662,11 @@ "id": 10103002, "PlayType": 1, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_07", "battleScenes": [ - "scenesfight_05_01" + "scenesfight_09" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1647,10 +1696,11 @@ "id": 10103003, "PlayType": 1, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_07", "battleScenes": [ - "scenesfight_05_01" + "scenesfight_09" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1686,6 +1736,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1719,6 +1770,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1753,6 +1805,7 @@ "bossfight_naturetitan_02", "bossfight_naturetitan_04" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1796,6 +1849,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1829,6 +1883,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1864,6 +1919,7 @@ "battleScenes": [ "scenesfight_08" ], + "BGMusic": "", "LoadingId": 1019, "HideAlienSpace": 0, "RuleTips": { @@ -1897,6 +1953,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1930,6 +1987,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -1949,10 +2007,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], - "HeroCheck": [ - "24004", - "24001" - ], + "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": 0, @@ -1966,6 +2021,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2001,6 +2057,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2036,6 +2093,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2071,6 +2129,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2104,6 +2163,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2137,6 +2197,7 @@ "battleScenes": [ "bossfight_dragon_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2170,6 +2231,7 @@ "battleScenes": [ "bossfight_chef_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2203,6 +2265,7 @@ "battleScenes": [ "bossfight_translate_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2236,6 +2299,7 @@ "battleScenes": [ "bossfight_naturetitan_03" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2269,6 +2333,7 @@ "battleScenes": [ "bossfight_naturetitan_01" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2302,6 +2367,7 @@ "battleScenes": [ "bossfight_naturetitan_02" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2335,6 +2401,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2368,6 +2435,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2401,6 +2469,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2434,6 +2503,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2467,6 +2537,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2500,6 +2571,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2533,6 +2605,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2566,6 +2639,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2599,6 +2673,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2632,6 +2707,7 @@ "battleScenes": [ "scenesfight_07" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { @@ -2665,6 +2741,7 @@ "battleScenes": [ "scenesfight_06" ], + "BGMusic": "", "LoadingId": 0, "HideAlienSpace": 0, "RuleTips": { diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index f4a67f193..8a6102113 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -26076,6 +26076,31 @@ ], "filter2": [] }, + { + "id": 14000026, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_894", + "text": "应对师傅的训练" + }, + "type": 227, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 320261, + "value": 1, + "filter": [ + 105 + ], + "filter2": [] + }, { "id": 15000001, "rtype": 2, @@ -26083,7 +26108,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_894", + "key": "buried_buried_condi_tasktxt_895", "text": "前往功夫熊猫城市" }, "type": 212, @@ -26108,7 +26133,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_895", + "key": "buried_buried_condi_tasktxt_896", "text": "购买超级芯片" }, "type": 209, @@ -26133,7 +26158,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_896", + "key": "buried_buried_condi_tasktxt_897", "text": "出售货物给功夫熊猫" }, "type": 210, @@ -26158,7 +26183,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_897", + "key": "buried_buried_condi_tasktxt_898", "text": "特产出售给魔法精灵" }, "type": 211, @@ -26183,7 +26208,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_898", + "key": "buried_buried_condi_tasktxt_899", "text": "火焰泰坦难度2" }, "type": 73, @@ -26211,7 +26236,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_899", + "key": "buried_buried_condi_tasktxt_900", "text": "使用好友助战守护者1次" }, "type": 12, @@ -26236,7 +26261,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_900", + "key": "buried_buried_condi_tasktxt_901", "text": "进行3次普通招募" }, "type": 18, @@ -26261,7 +26286,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_901", + "key": "buried_buried_condi_tasktxt_902", "text": "为任意守护者提升5级" }, "type": 24, @@ -26286,7 +26311,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_902", + "key": "buried_buried_condi_tasktxt_903", "text": "强化任意装备成功6次" }, "type": 47, @@ -26311,7 +26336,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_903", + "key": "buried_buried_condi_tasktxt_904", "text": "消费500000金币" }, "type": 68, @@ -26336,7 +26361,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_904", + "key": "buried_buried_condi_tasktxt_905", "text": "消费300钻石" }, "type": 104, @@ -26361,7 +26386,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_905", + "key": "buried_buried_condi_tasktxt_906", "text": "完成1次功夫陪练任务" }, "type": 186, @@ -26386,7 +26411,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_906", + "key": "buried_buried_condi_tasktxt_907", "text": "挑战3次竞技场" }, "type": 130, @@ -26411,7 +26436,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_907", + "key": "buried_buried_condi_tasktxt_908", "text": "挑战3次“维京远征”副本" }, "type": 172, @@ -26436,7 +26461,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_908", + "key": "buried_buried_condi_tasktxt_909", "text": "挑战3次“猎魂”副本" }, "type": 200, @@ -26459,7 +26484,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_909", + "key": "buried_buried_condi_tasktxt_910", "text": "完成一次考试" }, "type": 204, @@ -26482,7 +26507,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_910", + "key": "buried_buried_condi_tasktxt_911", "text": "完成一次考试" }, "type": 204, @@ -26505,7 +26530,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_911", + "key": "buried_buried_condi_tasktxt_912", "text": "完成一次考试" }, "type": 204, @@ -26528,7 +26553,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_912", + "key": "buried_buried_condi_tasktxt_913", "text": "完成一次考试" }, "type": 204, @@ -26551,7 +26576,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_913", + "key": "buried_buried_condi_tasktxt_914", "text": "完成一次考试" }, "type": 204, @@ -26574,7 +26599,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_914", + "key": "buried_buried_condi_tasktxt_915", "text": "完成一次考试" }, "type": 204, @@ -26597,7 +26622,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_915", + "key": "buried_buried_condi_tasktxt_916", "text": "完成一次考试" }, "type": 204, @@ -26619,31 +26644,6 @@ "ctype": 3, "notify": [], "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_916", - "text": "获取烤乳猪" - }, - "type": 187, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 60081, - "value": 1, - "filter": [ - 14020009 - ], - "filter2": [] - }, - { - "id": 50000019, - "rtype": 2, - "ctype": 3, - "notify": [], - "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_917", "text": "获取烤乳猪" @@ -26664,7 +26664,7 @@ "filter2": [] }, { - "id": 50000020, + "id": 50000019, "rtype": 2, "ctype": 3, "notify": [], @@ -26689,7 +26689,7 @@ "filter2": [] }, { - "id": 50000021, + "id": 50000020, "rtype": 2, "ctype": 3, "notify": [], @@ -26714,7 +26714,7 @@ "filter2": [] }, { - "id": 50000022, + "id": 50000021, "rtype": 2, "ctype": 3, "notify": [], @@ -26739,30 +26739,32 @@ "filter2": [] }, { - "id": 50000023, + "id": 50000022, "rtype": 2, "ctype": 3, "notify": [], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_921", - "text": "寻找所有宝箱" + "text": "获取烤乳猪" }, - "type": 205, + "type": 187, "valid": 0, "head": { "a": "attr", "t": "gold", "n": 1 }, - "Npc_event_type": 3, - "NPC": 0, + "Npc_event_type": 0, + "NPC": 60081, "value": 1, - "filter": [], + "filter": [ + 14020009 + ], "filter2": [] }, { - "id": 50000024, + "id": 50000023, "rtype": 2, "ctype": 3, "notify": [], @@ -26785,7 +26787,7 @@ "filter2": [] }, { - "id": 50000025, + "id": 50000024, "rtype": 2, "ctype": 3, "notify": [], @@ -26808,7 +26810,7 @@ "filter2": [] }, { - "id": 50000026, + "id": 50000025, "rtype": 2, "ctype": 3, "notify": [], @@ -26831,7 +26833,7 @@ "filter2": [] }, { - "id": 50000027, + "id": 50000026, "rtype": 2, "ctype": 3, "notify": [], @@ -26854,13 +26856,36 @@ "filter2": [] }, { - "id": 50000028, + "id": 50000027, "rtype": 2, "ctype": 3, "notify": [], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_926", + "text": "寻找所有宝箱" + }, + "type": 205, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 3, + "NPC": 0, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 50000028, + "rtype": 2, + "ctype": 3, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_927", "text": "清理所有怪物" }, "type": 70, @@ -26885,7 +26910,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_927", + "key": "buried_buried_condi_tasktxt_928", "text": "清理所有怪物" }, "type": 70, @@ -26910,7 +26935,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_928", + "key": "buried_buried_condi_tasktxt_929", "text": "清理所有怪物" }, "type": 70, @@ -26935,7 +26960,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_929", + "key": "buried_buried_condi_tasktxt_930", "text": "清理所有怪物" }, "type": 70, @@ -26960,7 +26985,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_930", + "key": "buried_buried_condi_tasktxt_931", "text": "清理所有怪物" }, "type": 70, @@ -26985,7 +27010,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_931", + "key": "buried_buried_condi_tasktxt_932", "text": "清理所有怪物" }, "type": 70, @@ -27010,7 +27035,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_932", + "key": "buried_buried_condi_tasktxt_933", "text": "检查第一个可疑点" }, "type": 206, @@ -27033,7 +27058,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_933", + "key": "buried_buried_condi_tasktxt_934", "text": "检查第二个可疑点" }, "type": 206, @@ -27056,7 +27081,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_934", + "key": "buried_buried_condi_tasktxt_935", "text": "检查第三个可疑点" }, "type": 206, @@ -27079,7 +27104,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_935", + "key": "buried_buried_condi_tasktxt_936", "text": "检查第一个可疑点" }, "type": 206, @@ -27102,7 +27127,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_936", + "key": "buried_buried_condi_tasktxt_937", "text": "检查第二个可疑点" }, "type": 206, @@ -27125,7 +27150,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_937", + "key": "buried_buried_condi_tasktxt_938", "text": "检查第三个可疑点" }, "type": 206, @@ -27148,7 +27173,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_938", + "key": "buried_buried_condi_tasktxt_939", "text": "检查第一个可疑点" }, "type": 206, @@ -27171,7 +27196,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_939", + "key": "buried_buried_condi_tasktxt_940", "text": "检查第二个可疑点" }, "type": 206, @@ -27194,7 +27219,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_940", + "key": "buried_buried_condi_tasktxt_941", "text": "检查第三个可疑点" }, "type": 206, @@ -27217,7 +27242,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_941", + "key": "buried_buried_condi_tasktxt_942", "text": "检查第一个可疑点" }, "type": 206, @@ -27240,7 +27265,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_942", + "key": "buried_buried_condi_tasktxt_943", "text": "检查第二个可疑点" }, "type": 206, @@ -27263,7 +27288,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_943", + "key": "buried_buried_condi_tasktxt_944", "text": "检查第三个可疑点" }, "type": 206, @@ -27286,7 +27311,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_944", + "key": "buried_buried_condi_tasktxt_945", "text": "检查第一个可疑点" }, "type": 206, @@ -27309,7 +27334,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_945", + "key": "buried_buried_condi_tasktxt_946", "text": "检查第二个可疑点" }, "type": 206, @@ -27332,7 +27357,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_946", + "key": "buried_buried_condi_tasktxt_947", "text": "检查第三个可疑点" }, "type": 206, @@ -27355,7 +27380,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_947", + "key": "buried_buried_condi_tasktxt_948", "text": "找对象聊天1" }, "type": 187, @@ -27380,7 +27405,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_948", + "key": "buried_buried_condi_tasktxt_949", "text": "找对象聊天2" }, "type": 187, @@ -27405,7 +27430,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_949", + "key": "buried_buried_condi_tasktxt_950", "text": "找对象聊天3" }, "type": 187, @@ -27430,7 +27455,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_950", + "key": "buried_buried_condi_tasktxt_951", "text": "找对象聊天4" }, "type": 187, @@ -27455,7 +27480,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_951", + "key": "buried_buried_condi_tasktxt_952", "text": "找对象聊天5" }, "type": 187, @@ -27480,7 +27505,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_952", + "key": "buried_buried_condi_tasktxt_953", "text": "找对象聊天6" }, "type": 20001, @@ -27505,7 +27530,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_953", + "key": "buried_buried_condi_tasktxt_954", "text": "找对象聊天7" }, "type": 20001, @@ -27530,7 +27555,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_954", + "key": "buried_buried_condi_tasktxt_955", "text": "找对象聊天8" }, "type": 20001, @@ -27555,7 +27580,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_955", + "key": "buried_buried_condi_tasktxt_956", "text": "找对象聊天9" }, "type": 20001, @@ -27580,7 +27605,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_956", + "key": "buried_buried_condi_tasktxt_957", "text": "找对象聊天10" }, "type": 20001, @@ -27605,7 +27630,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_957", + "key": "buried_buried_condi_tasktxt_958", "text": "找对象聊天11" }, "type": 20001, @@ -27630,7 +27655,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_958", + "key": "buried_buried_condi_tasktxt_959", "text": "找对象聊天12" }, "type": 20001, @@ -27655,7 +27680,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_959", + "key": "buried_buried_condi_tasktxt_960", "text": "找对象聊天13" }, "type": 20001, @@ -27680,7 +27705,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_960", + "key": "buried_buried_condi_tasktxt_961", "text": "找对象聊天14" }, "type": 20001, @@ -27705,7 +27730,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_961", + "key": "buried_buried_condi_tasktxt_962", "text": "找对象聊天15" }, "type": 20001, @@ -27730,7 +27755,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_962", + "key": "buried_buried_condi_tasktxt_963", "text": "[成长返还任务]将食人鱼提升至20级" }, "type": 4, @@ -27755,7 +27780,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_963", + "key": "buried_buried_condi_tasktxt_964", "text": "[成长返还任务]将食人鱼提升至30级" }, "type": 4, @@ -27780,7 +27805,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_964", + "key": "buried_buried_condi_tasktxt_965", "text": "[成长返还任务]将食人鱼提升至4星" }, "type": 6, @@ -27805,7 +27830,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_965", + "key": "buried_buried_condi_tasktxt_966", "text": "[挑战任务]传承者达到10级" }, "type": 20, @@ -27828,7 +27853,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_966", + "key": "buried_buried_condi_tasktxt_967", "text": "[挑战任务]传承者达到20级" }, "type": 20, @@ -27851,7 +27876,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_967", + "key": "buried_buried_condi_tasktxt_968", "text": "[挑战任务]拥有一个30级守护者" }, "type": 111, @@ -27876,7 +27901,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_968", + "key": "buried_buried_condi_tasktxt_969", "text": "[挑战任务]进行一次十连抽" }, "type": 141, @@ -27899,7 +27924,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_969", + "key": "buried_buried_condi_tasktxt_970", "text": "[挑战任务]消费1000钻石" }, "type": 104, @@ -27922,7 +27947,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_970", + "key": "buried_buried_condi_tasktxt_971", "text": "[挑战任务]猎魂挑战5次" }, "type": 200, @@ -27945,7 +27970,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_971", + "key": "buried_buried_condi_tasktxt_972", "text": "拥有2个60级守护者" }, "type": 111, @@ -27970,7 +27995,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_972", + "key": "buried_buried_condi_tasktxt_973", "text": "将牙仙回响等级提升至满级" }, "type": 125, @@ -27995,7 +28020,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_973", + "key": "buried_buried_condi_tasktxt_974", "text": "将睡神回响等级提升到满级" }, "type": 125, @@ -28020,7 +28045,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_974", + "key": "buried_buried_condi_tasktxt_975", "text": "将圣诞老人回响等级提升到满级" }, "type": 125, @@ -28045,7 +28070,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_975", + "key": "buried_buried_condi_tasktxt_976", "text": "将亚丝翠回响等级提升到满级" }, "type": 125, @@ -28070,7 +28095,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_976", + "key": "buried_buried_condi_tasktxt_977", "text": "将悍娇虎回响等级提升到满级" }, "type": 125, @@ -28095,7 +28120,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_977", + "key": "buried_buried_condi_tasktxt_978", "text": "将鹤大师提回响等级提升到满级" }, "type": 125, @@ -28120,7 +28145,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_978", + "key": "buried_buried_condi_tasktxt_979", "text": "当日消耗100点体力" }, "type": 213, @@ -28145,7 +28170,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_979", + "key": "buried_buried_condi_tasktxt_980", "text": "消费100000金币" }, "type": 68, @@ -28170,7 +28195,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_980", + "key": "buried_buried_condi_tasktxt_981", "text": "消费100钻石" }, "type": 104, @@ -28195,7 +28220,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_981", + "key": "buried_buried_condi_tasktxt_982", "text": "当日消耗30点体力" }, "type": 213, @@ -28220,7 +28245,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_982", + "key": "buried_buried_condi_tasktxt_983", "text": "使用好友助战守护者1次" }, "type": 12, @@ -28245,7 +28270,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_983", + "key": "buried_buried_condi_tasktxt_984", "text": "进行1次普通招募" }, "type": 18, @@ -28270,7 +28295,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_984", + "key": "buried_buried_condi_tasktxt_985", "text": "为任意守护者提升3级" }, "type": 24, @@ -28295,7 +28320,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_985", + "key": "buried_buried_condi_tasktxt_986", "text": "强化任意装备成功3次" }, "type": 47, @@ -28320,7 +28345,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_986", + "key": "buried_buried_condi_tasktxt_987", "text": "消费300000金币" }, "type": 68, @@ -28345,7 +28370,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_987", + "key": "buried_buried_condi_tasktxt_988", "text": "消费300钻石" }, "type": 104, @@ -28370,7 +28395,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_988", + "key": "buried_buried_condi_tasktxt_989", "text": "当日消耗100点体力" }, "type": 213, @@ -28395,7 +28420,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_989", + "key": "buried_buried_condi_tasktxt_990", "text": "使用好友助战守护者3次" }, "type": 12, @@ -28420,7 +28445,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_990", + "key": "buried_buried_condi_tasktxt_991", "text": "进行1次普通招募" }, "type": 18, @@ -28445,7 +28470,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_991", + "key": "buried_buried_condi_tasktxt_992", "text": "为任意守护者提升10级" }, "type": 24, @@ -28470,7 +28495,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_992", + "key": "buried_buried_condi_tasktxt_993", "text": "强化任意装备成功10次" }, "type": 47, @@ -28495,7 +28520,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_993", + "key": "buried_buried_condi_tasktxt_994", "text": "消费2000000金币" }, "type": 68, @@ -28520,7 +28545,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_994", + "key": "buried_buried_condi_tasktxt_995", "text": "消费1000钻石" }, "type": 104, @@ -28545,7 +28570,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_995", + "key": "buried_buried_condi_tasktxt_996", "text": "当日消耗300点体力" }, "type": 213, @@ -28570,7 +28595,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_996", + "key": "buried_buried_condi_tasktxt_997", "text": "使用好友助战守护者10次" }, "type": 12, @@ -28595,7 +28620,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_997", + "key": "buried_buried_condi_tasktxt_998", "text": "进行10次普通招募" }, "type": 18, @@ -28620,7 +28645,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_998", + "key": "buried_buried_condi_tasktxt_999", "text": "为任意守护者提升20级" }, "type": 24, @@ -28645,7 +28670,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_999", + "key": "buried_buried_condi_tasktxt_1000", "text": "强化任意装备成功20次" }, "type": 47, @@ -28668,7 +28693,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1000", + "key": "buried_buried_condi_tasktxt_1001", "text": "12100001首次触发剧情" }, "type": 215, @@ -28693,7 +28718,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1001", + "key": "buried_buried_condi_tasktxt_1002", "text": "12100002首次触发剧情" }, "type": 215, @@ -28718,7 +28743,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1002", + "key": "buried_buried_condi_tasktxt_1003", "text": "12100003首次触发剧情" }, "type": 215, @@ -28743,7 +28768,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1003", + "key": "buried_buried_condi_tasktxt_1004", "text": "12100004首次触发剧情" }, "type": 215, @@ -28768,7 +28793,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1004", + "key": "buried_buried_condi_tasktxt_1005", "text": "12100005首次触发剧情" }, "type": 215, @@ -28793,7 +28818,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1005", + "key": "buried_buried_condi_tasktxt_1006", "text": "12100006首次触发剧情" }, "type": 215, @@ -28818,7 +28843,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1006", + "key": "buried_buried_condi_tasktxt_1007", "text": "全阵容职业1通关石阵5" }, "type": 216, @@ -28844,7 +28869,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1007", + "key": "buried_buried_condi_tasktxt_1008", "text": "全阵容职业1通关石阵6" }, "type": 216, @@ -28870,7 +28895,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1008", + "key": "buried_buried_condi_tasktxt_1009", "text": "全阵容职业1通关石阵7" }, "type": 216, @@ -28896,7 +28921,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1009", + "key": "buried_buried_condi_tasktxt_1010", "text": "全阵容职业1通关石阵8" }, "type": 216, @@ -28922,7 +28947,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1010", + "key": "buried_buried_condi_tasktxt_1011", "text": "全阵容职业2通关石阵5" }, "type": 216, @@ -28948,7 +28973,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1011", + "key": "buried_buried_condi_tasktxt_1012", "text": "全阵容职业2通关石阵6" }, "type": 216, @@ -28974,7 +28999,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1012", + "key": "buried_buried_condi_tasktxt_1013", "text": "全阵容职业2通关石阵7" }, "type": 216, @@ -29000,7 +29025,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1013", + "key": "buried_buried_condi_tasktxt_1014", "text": "全阵容职业2通关石阵8" }, "type": 216, @@ -29026,7 +29051,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1014", + "key": "buried_buried_condi_tasktxt_1015", "text": "全阵容职业3通关石阵5" }, "type": 216, @@ -29052,7 +29077,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1015", + "key": "buried_buried_condi_tasktxt_1016", "text": "全阵容职业3通关石阵6" }, "type": 216, @@ -29078,7 +29103,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1016", + "key": "buried_buried_condi_tasktxt_1017", "text": "全阵容职业3通关石阵7" }, "type": 216, @@ -29104,7 +29129,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1017", + "key": "buried_buried_condi_tasktxt_1018", "text": "全阵容职业3通关石阵8" }, "type": 216, @@ -29130,7 +29155,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1018", + "key": "buried_buried_condi_tasktxt_1019", "text": "全阵容职业4通关石阵5" }, "type": 216, @@ -29156,7 +29181,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1019", + "key": "buried_buried_condi_tasktxt_1020", "text": "全阵容职业4通关石阵6" }, "type": 216, @@ -29182,7 +29207,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1020", + "key": "buried_buried_condi_tasktxt_1021", "text": "全阵容职业4通关石阵7" }, "type": 216, @@ -29208,7 +29233,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1021", + "key": "buried_buried_condi_tasktxt_1022", "text": "全阵容职业4通关石阵8" }, "type": 216, @@ -29236,7 +29261,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1022", + "key": "buried_buried_condi_tasktxt_1023", "text": "第一次获得5星英雄" }, "type": 228, @@ -29263,7 +29288,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1023", + "key": "buried_buried_condi_tasktxt_1024", "text": "当天充值达到1000积分" }, "type": 214, @@ -29288,7 +29313,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1024", + "key": "buried_buried_condi_tasktxt_1025", "text": "购买1级月卡礼包" }, "type": 229, @@ -29315,7 +29340,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1025", + "key": "buried_buried_condi_tasktxt_1026", "text": "累计充值达到2000积分" }, "type": 214, @@ -29340,7 +29365,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1026", + "key": "buried_buried_condi_tasktxt_1027", "text": "在周五登录一次游戏" }, "type": 230, @@ -29367,7 +29392,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1027", + "key": "buried_buried_condi_tasktxt_1028", "text": "每期循环塔到达第2层" }, "type": 231, @@ -29392,7 +29417,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1028", + "key": "buried_buried_condi_tasktxt_1029", "text": "种族塔通关火的热情阵容2层" }, "type": 232, @@ -29417,7 +29442,7 @@ "notify": [], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1029", + "key": "buried_buried_condi_tasktxt_1030", "text": "冒险之旅第一章主线剧情完成" }, "type": 61, diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index ad7f70e38..24d53e0fc 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -220,8 +220,8 @@ }, "tabId": 3, "mapPos": { - "x": 2275, - "y": 616 + "x": 2235, + "y": 626 }, "type": 4, "params": "", @@ -263,8 +263,8 @@ }, "tabId": 3, "mapPos": { - "x": 2412, - "y": 300 + "x": 2582, + "y": 180 }, "type": 4, "params": "", diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index a6aed77e4..6939f19ef 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -166,7 +166,7 @@ "scale": 0.4, "usetext": { "key": "gamesummary_fathernode_usetext_10", - "text": "有人的地方就存在着纷争,·去战胜他人获得[color=#ffcc00]竞技币[/color]，在[color=#ffcc00]竞技商店兑换奖励[/color]吧！" + "text": "有人的地方就存在着纷争,去战胜他人获得[color=#ffcc00]竞技币[/color]，在[color=#ffcc00]竞技商店兑换奖励[/color]吧！" } }, { diff --git a/bin/json/game_global.json b/bin/json/game_global.json index d83f1f9cf..e313fcd02 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -672,7 +672,7 @@ "t": "merchantmoney", "n": 1 }, - "business_rankmoney": 1000, + "business_rankmoney": 220000, "business_moneynum": 10000, "business_minint_reward": { "a": "attr", @@ -853,6 +853,7 @@ "dragon_interaction": 15, "dialogueclickcd": 0.3, "doragon_item": "24012003", - "sign_account": 28 + "sign_account": 28, + "dragon_funtime": 500 } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index ce9395dae..55ca2b88f 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -1478,7 +1478,7 @@ "expitemnum": 7, "herointr": { "key": "hero_main_herointr_19", - "text": "传说中的守护者“黛塔黛恩”,拥有不俗的战斗能力" + "text": " 干草堆随着风吹过街道，生活还是一成不变，只有黛塔黛恩一如既往，在午后弹奏起她的民谣。荒野的西部，精灵一出生就要干活，一切都要靠双手获得。黛塔用她的歌声抚慰着精灵们的心，每一天都如此。
但，某一天，一群宛如被彩虹殴打过的精灵出现在黛塔的面前，将她的生活搅得天翻地覆。" } }, { @@ -1868,7 +1868,7 @@ "expitemnum": 7, "herointr": { "key": "hero_main_herointr_24", - "text": "传说中的守护者“邦尼兔”,拥有不俗的战斗能力" + "text": " 结实的大脚，强健的肌肉，犀利的眼神，很难想象这位猛男兔是如何画出那些精美可爱的复活蛋花纹的。邦尼冷酷的外表下有着一颗火热的心。虽然嘴上很爱挖苦人，但他却时刻关心着每位同伴的安危。
邦尼兔最开心的事是吃胡萝卜，最讨厌的事是与杰克共处一室。杰克漫不经心的个性一度令严苛认真的邦尼很是看不惯。" } }, { @@ -2180,7 +2180,7 @@ "expitemnum": 7, "herointr": { "key": "hero_main_herointr_28", - "text": "传说中的守护者“暴芙那特”,拥有不俗的战斗能力" + "text": " 暴躁二人组中的姐姐，粗鲁，暴躁，追求危险和刺激，无论怎么看，暴芙纳特都和淑女这个词毫不沾边。但是身为维京人，她这种特质反而被视为合格的勇士，也是件奇事。
暴芙纳特非常自恋，一直梦想嫁一个强壮有力的如意郎君。她的弟弟对此十分不屑。" } }, { diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json index 99e5729e6..cd994541e 100644 --- a/bin/json/game_heroawaken.json +++ b/bin/json/game_heroawaken.json @@ -24,7 +24,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_1", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -97,7 +97,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_3", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -170,7 +170,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_5", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -243,7 +243,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_7", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -316,7 +316,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_9", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -389,7 +389,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_11", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -462,7 +462,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_13", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -535,7 +535,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_15", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -608,7 +608,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_17", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -681,7 +681,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_19", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -754,7 +754,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_21", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -827,7 +827,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_23", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -900,7 +900,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_25", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -973,7 +973,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_27", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -1046,7 +1046,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_29", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -1119,7 +1119,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_31", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -1192,7 +1192,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_33", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -1265,7 +1265,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_35", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -1338,7 +1338,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_37", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -1411,7 +1411,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_39", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -1484,7 +1484,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_41", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -1557,7 +1557,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_43", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -1587,7 +1587,7 @@ "skill": 914003431, "describe": { "key": "hero_awaken_describe_44", - "text": "基础攻击、防御、基础生命值8%。" + "text": "0" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -1630,7 +1630,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_45", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -1660,7 +1660,7 @@ "skill": 914003432, "describe": { "key": "hero_awaken_describe_46", - "text": "基础攻击、防御、基础生命值14%。" + "text": "0" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -1703,7 +1703,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_47", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -1733,7 +1733,7 @@ "skill": 914003433, "describe": { "key": "hero_awaken_describe_48", - "text": "基础攻击、防御、基础生命值20%。" + "text": "0" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -1776,7 +1776,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_49", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -1819,7 +1819,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_50", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -1862,7 +1862,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_51", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -1905,7 +1905,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_52", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -1948,7 +1948,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_53", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -1991,7 +1991,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_54", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -2034,7 +2034,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_55", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -2107,7 +2107,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_57", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -2180,7 +2180,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_59", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -2253,7 +2253,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_61", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -2296,7 +2296,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_62", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -2339,7 +2339,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_63", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -2382,7 +2382,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_64", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -2425,7 +2425,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_65", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -2468,7 +2468,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_66", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -2511,7 +2511,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_67", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -2584,7 +2584,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_69", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -2657,7 +2657,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_71", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -2730,7 +2730,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_73", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -2773,7 +2773,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_74", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -2816,7 +2816,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_75", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -2859,7 +2859,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_76", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -2902,7 +2902,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_77", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -2945,7 +2945,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_78", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -2988,7 +2988,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_79", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -3061,7 +3061,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_81", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -3134,7 +3134,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_83", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -3207,7 +3207,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_85", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -3280,7 +3280,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_87", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -3353,7 +3353,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_89", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -3426,7 +3426,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_91", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -3499,7 +3499,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_93", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -3572,7 +3572,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_95", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -3645,7 +3645,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_97", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -3688,7 +3688,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_98", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -3731,7 +3731,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_99", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -3774,7 +3774,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_100", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -3817,7 +3817,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_101", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -3860,7 +3860,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_102", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -3903,7 +3903,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_103", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -3946,7 +3946,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_104", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -3989,7 +3989,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_105", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -4032,7 +4032,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_106", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -4075,7 +4075,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_107", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -4118,7 +4118,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_108", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -4161,7 +4161,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_109", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -4234,7 +4234,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_111", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -4307,7 +4307,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_113", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -4380,7 +4380,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_115", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -4453,7 +4453,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_117", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -4526,7 +4526,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_119", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -4599,7 +4599,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_121", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -4672,7 +4672,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_123", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -4745,7 +4745,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_125", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -4818,7 +4818,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_127", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -4891,7 +4891,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_129", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -4964,7 +4964,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_131", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -5037,7 +5037,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_133", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -5110,7 +5110,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_135", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -5183,7 +5183,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_137", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -5256,7 +5256,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_139", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -5329,7 +5329,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_141", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -5402,7 +5402,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_143", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -5475,7 +5475,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_145", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -5548,7 +5548,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_147", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -5621,7 +5621,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_149", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -5694,7 +5694,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_151", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -5737,7 +5737,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_152", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -5780,7 +5780,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_153", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -5823,7 +5823,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_154", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -5866,7 +5866,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_155", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -5909,7 +5909,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_156", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -5952,7 +5952,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_157", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -5995,7 +5995,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_158", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -6038,7 +6038,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_159", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -6081,7 +6081,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_160", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -6124,7 +6124,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_161", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -6167,7 +6167,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_162", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -6210,7 +6210,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_163", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -6283,7 +6283,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_165", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -6356,7 +6356,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_167", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -6429,7 +6429,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_169", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -6502,7 +6502,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_171", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -6575,7 +6575,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_173", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -6648,7 +6648,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_175", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -6721,7 +6721,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_177", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -6794,7 +6794,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_179", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -6867,7 +6867,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_181", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -6910,7 +6910,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_182", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -6953,7 +6953,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_183", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -6996,7 +6996,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_184", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -7039,7 +7039,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_185", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -7082,7 +7082,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_186", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -7125,7 +7125,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_187", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -7168,7 +7168,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_188", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -7211,7 +7211,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_189", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -7254,7 +7254,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_190", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -7297,7 +7297,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_191", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -7340,7 +7340,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_192", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -7383,7 +7383,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_193", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -7456,7 +7456,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_195", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -7529,7 +7529,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_197", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -7602,7 +7602,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_199", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -7675,7 +7675,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_201", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -7748,7 +7748,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_203", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -7821,7 +7821,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_205", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -7894,7 +7894,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_207", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -7967,7 +7967,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_209", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -8040,7 +8040,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_211", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -8113,7 +8113,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_213", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -8186,7 +8186,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_215", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -8259,7 +8259,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_217", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -8302,7 +8302,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_218", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -8345,7 +8345,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_219", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -8388,7 +8388,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_220", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -8431,7 +8431,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_221", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -8474,7 +8474,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_222", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -8517,7 +8517,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_223", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -8560,7 +8560,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_224", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -8603,7 +8603,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_225", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -8646,7 +8646,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_226", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -8689,7 +8689,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_227", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -8732,7 +8732,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_228", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -8775,7 +8775,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_229", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -8818,7 +8818,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_230", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -8861,7 +8861,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_231", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -8904,7 +8904,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_232", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -8947,7 +8947,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_233", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -8990,7 +8990,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_234", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -9033,7 +9033,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_235", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -9076,7 +9076,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_236", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -9119,7 +9119,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_237", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -9162,7 +9162,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_238", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -9205,7 +9205,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_239", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -9248,7 +9248,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_240", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -9291,7 +9291,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_241", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -9364,7 +9364,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_243", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -9437,7 +9437,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_245", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -9510,7 +9510,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_247", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -9583,7 +9583,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_249", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -9656,7 +9656,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_251", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -9729,7 +9729,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_253", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -9772,7 +9772,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_254", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -9815,7 +9815,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_255", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -9858,7 +9858,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_256", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -9901,7 +9901,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_257", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -9944,7 +9944,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_258", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -9987,7 +9987,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_259", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -10060,7 +10060,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_261", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -10133,7 +10133,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_263", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -10206,7 +10206,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_265", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -10279,7 +10279,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_267", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -10352,7 +10352,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_269", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -10425,7 +10425,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_271", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -10498,7 +10498,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_273", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -10571,7 +10571,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_275", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -10644,7 +10644,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_277", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -10717,7 +10717,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_279", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -10790,7 +10790,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_281", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -10863,7 +10863,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_283", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -10936,7 +10936,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_285", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -11009,7 +11009,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_287", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -11082,7 +11082,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_289", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -11155,7 +11155,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_291", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -11228,7 +11228,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_293", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -11301,7 +11301,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_295", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -11344,7 +11344,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_296", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -11387,7 +11387,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_297", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -11430,7 +11430,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_298", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -11473,7 +11473,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_299", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -11516,7 +11516,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_300", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -11559,7 +11559,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_301", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -11632,7 +11632,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_303", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -11705,7 +11705,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_305", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -11778,7 +11778,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_307", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -11851,7 +11851,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_309", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -11924,7 +11924,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_311", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -11997,7 +11997,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_313", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -12070,7 +12070,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_315", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -12143,7 +12143,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_317", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -12216,7 +12216,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_319", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -12289,7 +12289,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_321", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -12362,7 +12362,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_323", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -12435,7 +12435,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_325", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -12508,7 +12508,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_327", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -12581,7 +12581,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_329", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -12654,7 +12654,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_331", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -12727,7 +12727,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_333", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -12800,7 +12800,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_335", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -12873,7 +12873,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_337", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -12916,7 +12916,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_338", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -12959,7 +12959,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_339", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -13002,7 +13002,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_340", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -13045,7 +13045,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_341", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -13088,7 +13088,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_342", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -13131,7 +13131,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_343", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -13174,7 +13174,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_344", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -13217,7 +13217,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_345", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -13260,7 +13260,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_346", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -13303,7 +13303,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_347", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -13346,7 +13346,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_348", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -13389,7 +13389,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_349", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -13462,7 +13462,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_351", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -13535,7 +13535,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_353", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -13608,7 +13608,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_355", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -13651,7 +13651,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_356", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -13694,7 +13694,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_357", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -13737,7 +13737,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_358", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -13780,7 +13780,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_359", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -13823,7 +13823,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_360", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -13866,7 +13866,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_361", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -13939,7 +13939,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_363", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -14012,7 +14012,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_365", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -14085,7 +14085,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_367", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -14128,7 +14128,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_368", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -14171,7 +14171,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_369", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -14214,7 +14214,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_370", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -14257,7 +14257,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_371", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -14300,7 +14300,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_372", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -14343,7 +14343,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_373", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -14386,7 +14386,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_374", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -14429,7 +14429,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_375", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -14472,7 +14472,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_376", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -14515,7 +14515,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_377", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -14558,7 +14558,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_378", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -14601,7 +14601,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_379", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -14674,7 +14674,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_381", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -14747,7 +14747,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_383", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -14820,7 +14820,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_385", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -14893,7 +14893,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_387", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -14966,7 +14966,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_389", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -15039,7 +15039,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_391", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -15112,7 +15112,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_393", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -15185,7 +15185,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_395", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -15258,7 +15258,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_397", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -15301,7 +15301,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_398", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -15344,7 +15344,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_399", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -15387,7 +15387,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_400", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -15430,7 +15430,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_401", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -15473,7 +15473,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_402", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -15516,7 +15516,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_403", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -15589,7 +15589,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_405", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -15662,7 +15662,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_407", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -15735,7 +15735,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_409", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -15778,7 +15778,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_410", - "text": "基础攻击、防御、基础生命值8%。" + "text": "基础攻击、防御、生命值+8%" }, "icon": "js_jx_img_icon02", "condition": 0, @@ -15821,7 +15821,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_411", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -15864,7 +15864,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_412", - "text": "基础攻击、防御、基础生命值14%。" + "text": "基础攻击、防御、生命值+14%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -15907,7 +15907,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_413", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -15950,7 +15950,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_414", - "text": "基础攻击、防御、基础生命值20%。" + "text": "基础攻击、防御、生命值+20%" }, "icon": "js_jx_img_icon04", "condition": 0, @@ -15993,7 +15993,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_415", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -16066,7 +16066,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_417", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -16139,7 +16139,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_419", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, @@ -16212,7 +16212,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_421", - "text": "基础攻击、防御、基础生命值。" + "text": "基础攻击、防御、生命值+6%" }, "icon": "js_jx_img_icon03", "condition": 0, @@ -16285,7 +16285,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_423", - "text": "基础攻击、防御、基础生命值12%。" + "text": "基础攻击、防御、生命值+12%" }, "icon": "js_jx_img_icon08", "condition": 0, @@ -16358,7 +16358,7 @@ "skill": 0, "describe": { "key": "hero_awaken_describe_425", - "text": "基础攻击、防御、基础生命值18%。" + "text": "基础攻击、防御、生命值+18%" }, "icon": "js_jx_img_icon09", "condition": 0, diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index 35bd2b5c8..a2e1766f6 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -11,7 +11,7 @@ }, "introduce": { "key": "hunting_opentime_introduce_1", - "text": "传说中的巨型猩猩是一个非常恐怖的角色，它暴戾且狡猾，与它为敌一定要非常小心。" + "text": "传说中的巨型猩猩是一个非常恐怖的角色，它暴戾且很容易饥饿，与它为敌一定要非常小心。" }, "opentimetext": { "key": "hunting_opentime_opentimetext_1", @@ -33,7 +33,7 @@ }, "introduce": { "key": "hunting_opentime_introduce_2", - "text": "火龙可以从嘴里喷出猛烈的火焰，对地面造成毁灭性打击。" + "text": "这位娇美刁蛮的母龙会从嘴里喷出猛烈的火焰，对地面和你造成毁灭性打击。" }, "opentimetext": { "key": "hunting_opentime_opentimetext_2", @@ -55,7 +55,7 @@ }, "introduce": { "key": "hunting_opentime_introduce_3", - "text": "大厨曾是御用厨师，但他的料理太过黑暗，如果你不想成为\"料理\"的一员，一定要离他远点。" + "text": "大厨曾是御用厨师，但她的料理太过黑暗，如果你不想成为\"料理\"的一员，一定要离她远点。" }, "opentimetext": { "key": "hunting_opentime_opentimetext_3", @@ -77,7 +77,7 @@ }, "introduce": { "key": "hunting_opentime_introduce_4", - "text": "太空海星会消灭一切威胁它后代的敌人，无论你藏在在银河的哪个角落。" + "text": "格尔族人会消灭一切威胁它后代的敌人，无论你藏在在银河的哪个角落。" }, "opentimetext": { "key": "hunting_opentime_opentimetext_4", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index f6349896b..5eb794689 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -485,7 +485,7 @@ "key": "item_item_name_11", "text": "初级荣耀徽章" }, - "usetype": 3, + "usetype": 2, "color": 2, "bagtype": 3, "index": 100, @@ -515,7 +515,7 @@ "access": [ 107 ], - "use_skip": 155, + "use_skip": 103, "upper_limit": 0, "img": "item_10000011", "intr": { @@ -545,7 +545,7 @@ "key": "item_item_name_12", "text": "中级荣耀徽章" }, - "usetype": 3, + "usetype": 2, "color": 3, "bagtype": 3, "index": 101, @@ -587,7 +587,7 @@ "access": [ 107 ], - "use_skip": 155, + "use_skip": 103, "upper_limit": 0, "img": "item_10000012", "intr": { @@ -617,7 +617,7 @@ "key": "item_item_name_13", "text": "高级荣耀徽章" }, - "usetype": 3, + "usetype": 2, "color": 4, "bagtype": 3, "index": 102, @@ -647,7 +647,7 @@ "access": [ 107 ], - "use_skip": 155, + "use_skip": 103, "upper_limit": 0, "img": "item_10000013", "intr": { @@ -879,9 +879,15 @@ "effects": "", "modelName": "", "box_id": 0, - "synthetize_num": 0, + "synthetize_num": 10, "synthetize_deplete": [], - "synthetize_get": [], + "synthetize_get": [ + { + "a": "item", + "t": "10000021", + "n": 1 + } + ], "decompose_deplete": [], "decompose_get": [], "access": [ @@ -927,9 +933,15 @@ "effects": "", "modelName": "", "box_id": 0, - "synthetize_num": 0, + "synthetize_num": 10, "synthetize_deplete": [], - "synthetize_get": [], + "synthetize_get": [ + { + "a": "item", + "t": "10000022", + "n": 1 + } + ], "decompose_deplete": [], "decompose_get": [], "access": [ @@ -975,9 +987,15 @@ "effects": "", "modelName": "", "box_id": 0, - "synthetize_num": 0, + "synthetize_num": 10, "synthetize_deplete": [], - "synthetize_get": [], + "synthetize_get": [ + { + "a": "item", + "t": "10000023", + "n": 1 + } + ], "decompose_deplete": [], "decompose_get": [], "access": [ @@ -1023,9 +1041,15 @@ "effects": "", "modelName": "", "box_id": 0, - "synthetize_num": 0, + "synthetize_num": 10, "synthetize_deplete": [], - "synthetize_get": [], + "synthetize_get": [ + { + "a": "item", + "t": "10000024", + "n": 1 + } + ], "decompose_deplete": [], "decompose_get": [], "access": [ @@ -12251,7 +12275,7 @@ "key": "item_item_name_250", "text": "热火之灵" }, - "usetype": 3, + "usetype": 2, "color": 1, "bagtype": 3, "index": 1, @@ -12281,7 +12305,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000101", "intr": { @@ -12311,7 +12335,7 @@ "key": "item_item_name_251", "text": "水滴之灵" }, - "usetype": 3, + "usetype": 2, "color": 1, "bagtype": 3, "index": 1, @@ -12341,7 +12365,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000102", "intr": { @@ -12371,7 +12395,7 @@ "key": "item_item_name_252", "text": "古木之灵" }, - "usetype": 3, + "usetype": 2, "color": 1, "bagtype": 3, "index": 1, @@ -12401,7 +12425,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000103", "intr": { @@ -12431,7 +12455,7 @@ "key": "item_item_name_253", "text": "微光之灵" }, - "usetype": 3, + "usetype": 2, "color": 1, "bagtype": 3, "index": 1, @@ -12461,7 +12485,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000104", "intr": { @@ -12491,7 +12515,7 @@ "key": "item_item_name_254", "text": "烈焰之魄" }, - "usetype": 3, + "usetype": 2, "color": 2, "bagtype": 3, "index": 1, @@ -12533,7 +12557,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000201", "intr": { @@ -12563,7 +12587,7 @@ "key": "item_item_name_255", "text": "波浪之魄" }, - "usetype": 3, + "usetype": 2, "color": 2, "bagtype": 3, "index": 1, @@ -12605,7 +12629,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000202", "intr": { @@ -12635,7 +12659,7 @@ "key": "item_item_name_256", "text": "荆棘之魄" }, - "usetype": 3, + "usetype": 2, "color": 2, "bagtype": 3, "index": 1, @@ -12677,7 +12701,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000203", "intr": { @@ -12707,7 +12731,7 @@ "key": "item_item_name_257", "text": "曙光之魄" }, - "usetype": 3, + "usetype": 2, "color": 2, "bagtype": 3, "index": 1, @@ -12749,7 +12773,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000204", "intr": { @@ -12779,7 +12803,7 @@ "key": "item_item_name_258", "text": "燃爆之魂" }, - "usetype": 3, + "usetype": 2, "color": 3, "bagtype": 3, "index": 1, @@ -12809,7 +12833,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000301", "intr": { @@ -12839,7 +12863,7 @@ "key": "item_item_name_259", "text": "浪花之魂" }, - "usetype": 3, + "usetype": 2, "color": 3, "bagtype": 3, "index": 1, @@ -12869,7 +12893,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000302", "intr": { @@ -12899,7 +12923,7 @@ "key": "item_item_name_260", "text": "回春之魂" }, - "usetype": 3, + "usetype": 2, "color": 3, "bagtype": 3, "index": 1, @@ -12929,7 +12953,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000303", "intr": { @@ -12959,7 +12983,7 @@ "key": "item_item_name_261", "text": "耀光之魂" }, - "usetype": 3, + "usetype": 2, "color": 3, "bagtype": 3, "index": 1, @@ -12989,7 +13013,7 @@ "access": [ 168 ], - "use_skip": 902, + "use_skip": 155, "upper_limit": 0, "img": "item_15000304", "intr": { @@ -15771,7 +15795,7 @@ "id": "17060009", "name": { "key": "item_item_name_320", - "text": "5星3系守护者自选箱碎片" + "text": "3系碎片自选箱" }, "usetype": 4, "color": 4, @@ -17271,7 +17295,7 @@ "access": [ 10006 ], - "use_skip": 107, + "use_skip": 10006, "upper_limit": 0, "img": "item_20000001", "intr": { @@ -17319,7 +17343,7 @@ "access": [ 10006 ], - "use_skip": 107, + "use_skip": 10006, "upper_limit": 0, "img": "icon_mcs", "intr": { @@ -17490,7 +17514,7 @@ "text": "角鸟蛋" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -17536,7 +17560,7 @@ "text": "熊猫立牌" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -17628,7 +17652,7 @@ "text": "沼泽牙膏" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -17674,7 +17698,7 @@ "text": "碎骨龙碎片" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -17720,7 +17744,7 @@ "text": "马鞍" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -17766,7 +17790,7 @@ "text": "音乐琴弦" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -17858,7 +17882,7 @@ "text": "马戏团演出服" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -17950,7 +17974,7 @@ "text": "记忆之牙" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -17996,7 +18020,7 @@ "text": "纪念版巨怪徽章" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -18042,7 +18066,7 @@ "text": "远古巨石" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -18088,7 +18112,7 @@ "text": "奶油蛋糕" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -18134,7 +18158,7 @@ "text": "水果篮" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -18180,7 +18204,7 @@ "text": "玻璃杯" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -18226,7 +18250,7 @@ "text": "棒棒糖" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -18318,7 +18342,7 @@ "text": "童话书" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -18364,7 +18388,7 @@ "text": "木桶" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -18456,7 +18480,7 @@ "text": "竹吊床" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -18502,7 +18526,7 @@ "text": "溜冰鞋" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -18548,7 +18572,7 @@ "text": "冰淇淋" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -18594,7 +18618,7 @@ "text": "弓箭" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -18686,7 +18710,7 @@ "text": "捕兽夹" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 6, "index": 1, "special_type": 0, @@ -18732,7 +18756,7 @@ "text": "报纸" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -18870,7 +18894,7 @@ "text": "岩铁矿" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 6, "index": 1, "special_type": 0, @@ -18916,7 +18940,7 @@ "text": "气球" }, "usetype": 2, - "color": 4, + "color": 1, "bagtype": 6, "index": 1, "special_type": 0, @@ -19625,7 +19649,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "", + "img": "item_24011001", "intr": { "key": "item_item_intr_404", "text": "" @@ -19671,7 +19695,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "", + "img": "item_24021001", "intr": { "key": "item_item_intr_405", "text": "" @@ -19717,7 +19741,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "", + "img": "item_24031001", "intr": { "key": "item_item_intr_406", "text": "" @@ -19763,7 +19787,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "", + "img": "item_24041001", "intr": { "key": "item_item_intr_407", "text": "" diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json index 8747055b6..265e9a2d0 100644 --- a/bin/json/game_mainchapter.json +++ b/bin/json/game_mainchapter.json @@ -16,6 +16,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24011001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_1", "text": "预言之声" @@ -61,6 +68,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24021001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_2", "text": "原石危机" @@ -106,6 +120,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24031001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_3", "text": "小偷与大盗" @@ -151,6 +172,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_4", "text": "智取邀请函" @@ -196,6 +224,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_5", "text": "交易所风波（上）" @@ -241,6 +276,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_6", "text": "交易所风波（下）" @@ -286,6 +328,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_7", "text": "大龙复仇记" @@ -331,6 +380,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_8", "text": "布兰奇的逃亡" @@ -376,6 +432,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_9", "text": "配方奶工厂" @@ -421,6 +484,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_10", "text": "预言之声" @@ -466,6 +536,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_11", "text": "大龙复仇记" @@ -511,6 +588,13 @@ "text": "特色商店" }, "shopunlock": 11001001, + "venturecurrency": [ + { + "a": "item", + "t": "24041001", + "n": 1 + } + ], "name": { "key": "mainchapter_main_chapter_name_12", "text": "小偷与大盗" diff --git a/bin/json/game_mainshopitem.json b/bin/json/game_mainshopitem.json index e38ec4781..11e61575c 100644 --- a/bin/json/game_mainshopitem.json +++ b/bin/json/game_mainshopitem.json @@ -12,7 +12,7 @@ "need": [ { "a": "item", - "t": "24010001", + "t": "24011001", "n": 1 } ], @@ -32,8 +32,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 2 } ], "bugtime": 1, @@ -52,8 +52,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 3 } ], "bugtime": 1, @@ -72,8 +72,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 4 } ], "bugtime": 1, @@ -92,8 +92,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 5 } ], "bugtime": 1, @@ -112,8 +112,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 6 } ], "bugtime": 1, @@ -132,8 +132,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 7 } ], "bugtime": 1, @@ -152,8 +152,8 @@ "need": [ { "a": "item", - "t": "24010001", - "n": 1 + "t": "24011001", + "n": 8 } ], "bugtime": 1, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 8c983d8b1..70899bbe6 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -231,8 +231,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_2", + "text": "1-2" }, "title": { "key": "", @@ -306,8 +306,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_3", + "text": "1-3" }, "title": { "key": "", @@ -381,8 +381,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_4", + "text": "1-4" }, "title": { "key": "", @@ -468,8 +468,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_5", + "text": "1-5" }, "title": { "key": "mainchapter_main_stage_title_2", @@ -581,8 +581,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_6", + "text": "1-6" }, "title": { "key": "", @@ -670,8 +670,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_7", + "text": "1-7" }, "title": { "key": "", @@ -757,8 +757,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_8", + "text": "1-8" }, "title": { "key": "mainchapter_main_stage_title_3", @@ -875,8 +875,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_9", + "text": "1-9" }, "title": { "key": "", @@ -950,8 +950,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_10", + "text": "1-10" }, "title": { "key": "", @@ -1037,8 +1037,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_11", + "text": "1-11" }, "title": { "key": "", @@ -1114,8 +1114,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_12", + "text": "1-12" }, "title": { "key": "mainchapter_main_stage_title_4", @@ -1229,8 +1229,8 @@ "text": "打败猎龙团！" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_13", + "text": "1-13" }, "title": { "key": "mainchapter_main_stage_title_5", @@ -1344,8 +1344,8 @@ "text": "打败猎龙团！" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_14", + "text": "1-14" }, "title": { "key": "mainchapter_main_stage_title_6", @@ -1455,8 +1455,8 @@ "text": "与埃雷特交战！" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_15", + "text": "1-15" }, "title": { "key": "mainchapter_main_stage_title_7", @@ -1568,8 +1568,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_16", + "text": "1-16" }, "title": { "key": "", @@ -1641,8 +1641,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_17", + "text": "1-17" }, "title": { "key": "", @@ -1714,8 +1714,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_18", + "text": "1-18" }, "title": { "key": "", @@ -1787,8 +1787,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_19", + "text": "1-19" }, "title": { "key": "", @@ -1864,8 +1864,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_20", + "text": "1-20" }, "title": { "key": "", @@ -1939,8 +1939,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_21", + "text": "1-21" }, "title": { "key": "", @@ -2010,8 +2010,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_22", + "text": "1-22" }, "title": { "key": "", @@ -2081,8 +2081,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_23", + "text": "1-23" }, "title": { "key": "mainchapter_main_stage_title_8", @@ -2194,8 +2194,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_24", + "text": "1-24" }, "title": { "key": "", @@ -2265,8 +2265,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_25", + "text": "1-25" }, "title": { "key": "mainchapter_main_stage_title_9", @@ -2374,8 +2374,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_26", + "text": "1-26" }, "title": { "key": "", @@ -2445,8 +2445,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_27", + "text": "1-27" }, "title": { "key": "", @@ -2516,8 +2516,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_28", + "text": "1-28" }, "title": { "key": "mainchapter_main_stage_title_11", @@ -2631,8 +2631,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_29", + "text": "1-29" }, "title": { "key": "", @@ -2702,8 +2702,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_30", + "text": "1-30" }, "title": { "key": "", @@ -2773,8 +2773,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_31", + "text": "1-31" }, "title": { "key": "", @@ -2844,8 +2844,8 @@ "text": "" }, "mainlineName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_mainlineName_32", + "text": "1-32" }, "title": { "key": "", @@ -2913,8 +2913,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "" + "key": "mainchapter_main_stage_mainlineName_33", + "text": "1-33" }, "title": { "key": "", @@ -3022,8 +3022,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_34", + "text": "2-1" }, "title": { "key": "mainchapter_main_stage_title_12", @@ -3134,8 +3134,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_1", - "text": "1-1" + "key": "mainchapter_main_stage_mainlineName_35", + "text": "2-1" }, "title": { "key": "mainchapter_main_stage_title_13", @@ -3246,8 +3246,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_2", - "text": "1-2" + "key": "mainchapter_main_stage_mainlineName_36", + "text": "2-2" }, "title": { "key": "mainchapter_main_stage_title_14", @@ -3360,8 +3360,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_3", - "text": "1-3" + "key": "mainchapter_main_stage_mainlineName_37", + "text": "2-3" }, "title": { "key": "mainchapter_main_stage_title_15", @@ -3474,8 +3474,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_4", - "text": "1-4" + "key": "mainchapter_main_stage_mainlineName_38", + "text": "2-4" }, "title": { "key": "mainchapter_main_stage_title_16", @@ -3593,8 +3593,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_5", - "text": "1-5" + "key": "mainchapter_main_stage_mainlineName_39", + "text": "2-5" }, "title": { "key": "mainchapter_main_stage_title_17", @@ -3673,8 +3673,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_6", - "text": "1-6" + "key": "mainchapter_main_stage_mainlineName_40", + "text": "2-6" }, "title": { "key": "mainchapter_main_stage_title_18", @@ -3784,8 +3784,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_7", - "text": "1-7" + "key": "mainchapter_main_stage_mainlineName_41", + "text": "2-7" }, "title": { "key": "mainchapter_main_stage_title_19", @@ -3855,8 +3855,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_8", - "text": "1-8" + "key": "mainchapter_main_stage_mainlineName_42", + "text": "2-8" }, "title": { "key": "mainchapter_main_stage_title_20", @@ -3932,8 +3932,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_9", - "text": "1-9" + "key": "mainchapter_main_stage_mainlineName_43", + "text": "2-9" }, "title": { "key": "mainchapter_main_stage_title_21", @@ -4009,8 +4009,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_10", - "text": "1-10" + "key": "mainchapter_main_stage_mainlineName_44", + "text": "2-10" }, "title": { "key": "mainchapter_main_stage_title_22", @@ -4088,8 +4088,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_11", - "text": "1-11" + "key": "mainchapter_main_stage_mainlineName_45", + "text": "2-11" }, "title": { "key": "mainchapter_main_stage_title_23", @@ -4161,8 +4161,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_12", - "text": "1-12" + "key": "mainchapter_main_stage_mainlineName_46", + "text": "2-12" }, "title": { "key": "mainchapter_main_stage_title_24", @@ -4234,8 +4234,8 @@ "text": "月光暴走" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_13", - "text": "1-13" + "key": "mainchapter_main_stage_mainlineName_47", + "text": "2-13" }, "title": { "key": "mainchapter_main_stage_title_25", @@ -4348,8 +4348,8 @@ "text": "月光暴走" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_14", - "text": "1-13" + "key": "mainchapter_main_stage_mainlineName_48", + "text": "2-14" }, "title": { "key": "mainchapter_main_stage_title_26", @@ -4462,8 +4462,8 @@ "text": "月光暴走" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_15", - "text": "1-13" + "key": "mainchapter_main_stage_mainlineName_49", + "text": "2-15" }, "title": { "key": "mainchapter_main_stage_title_27", @@ -4576,8 +4576,8 @@ "text": "月光暴走" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_16", - "text": "1-14" + "key": "mainchapter_main_stage_mainlineName_50", + "text": "2-16" }, "title": { "key": "mainchapter_main_stage_title_28", @@ -4690,8 +4690,8 @@ "text": "月光暴走" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_17", - "text": "1-14" + "key": "mainchapter_main_stage_mainlineName_51", + "text": "2-17" }, "title": { "key": "mainchapter_main_stage_title_29", @@ -4804,8 +4804,8 @@ "text": "月光暴走" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_18", - "text": "1-14" + "key": "mainchapter_main_stage_mainlineName_52", + "text": "2-18" }, "title": { "key": "mainchapter_main_stage_title_30", @@ -4916,8 +4916,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_19", - "text": "1-15" + "key": "mainchapter_main_stage_mainlineName_53", + "text": "2-19" }, "title": { "key": "mainchapter_main_stage_title_31", @@ -4987,8 +4987,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_20", - "text": "1-16" + "key": "mainchapter_main_stage_mainlineName_54", + "text": "2-20" }, "title": { "key": "mainchapter_main_stage_title_32", @@ -5069,8 +5069,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_21", - "text": "1-17" + "key": "mainchapter_main_stage_mainlineName_55", + "text": "2-21" }, "title": { "key": "mainchapter_main_stage_title_33", @@ -5152,8 +5152,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_22", - "text": "1-18" + "key": "mainchapter_main_stage_mainlineName_56", + "text": "2-22" }, "title": { "key": "mainchapter_main_stage_title_34", @@ -5223,8 +5223,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_23", - "text": "1-19" + "key": "mainchapter_main_stage_mainlineName_57", + "text": "2-23" }, "title": { "key": "mainchapter_main_stage_title_35", @@ -5340,8 +5340,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_24", - "text": "1-20" + "key": "mainchapter_main_stage_mainlineName_58", + "text": "2-24" }, "title": { "key": "mainchapter_main_stage_title_36", @@ -5417,8 +5417,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_25", - "text": "1-21" + "key": "mainchapter_main_stage_mainlineName_59", + "text": "2-25" }, "title": { "key": "mainchapter_main_stage_title_37", @@ -5536,8 +5536,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_26", - "text": "1-22" + "key": "mainchapter_main_stage_mainlineName_60", + "text": "2-26" }, "title": { "key": "mainchapter_main_stage_title_38", @@ -5655,8 +5655,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_27", - "text": "1-23" + "key": "mainchapter_main_stage_mainlineName_61", + "text": "2-27" }, "title": { "key": "mainchapter_main_stage_title_39", @@ -5774,8 +5774,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_28", - "text": "1-24" + "key": "mainchapter_main_stage_mainlineName_62", + "text": "2-28" }, "title": { "key": "mainchapter_main_stage_title_40", @@ -5893,8 +5893,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_29", - "text": "1-25" + "key": "mainchapter_main_stage_mainlineName_63", + "text": "2-29" }, "title": { "key": "mainchapter_main_stage_title_41", @@ -6012,8 +6012,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_30", - "text": "1-26" + "key": "mainchapter_main_stage_mainlineName_64", + "text": "2-30" }, "title": { "key": "mainchapter_main_stage_title_42", @@ -6131,8 +6131,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_31", - "text": "1-27" + "key": "mainchapter_main_stage_mainlineName_65", + "text": "2-31" }, "title": { "key": "mainchapter_main_stage_title_43", @@ -6250,8 +6250,8 @@ "text": "精英关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_32", - "text": "1-28" + "key": "mainchapter_main_stage_mainlineName_66", + "text": "2-32" }, "title": { "key": "mainchapter_main_stage_title_44", @@ -6369,8 +6369,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_33", - "text": "1-29" + "key": "mainchapter_main_stage_mainlineName_67", + "text": "2-33" }, "title": { "key": "mainchapter_main_stage_title_45", @@ -6488,8 +6488,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_34", - "text": "1-30" + "key": "mainchapter_main_stage_mainlineName_68", + "text": "2-34" }, "title": { "key": "mainchapter_main_stage_title_46", @@ -6607,8 +6607,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_35", - "text": "1-31" + "key": "mainchapter_main_stage_mainlineName_69", + "text": "2-35" }, "title": { "key": "mainchapter_main_stage_title_47", @@ -6726,8 +6726,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_36", - "text": "1-32" + "key": "mainchapter_main_stage_mainlineName_70", + "text": "2-36" }, "title": { "key": "mainchapter_main_stage_title_48", @@ -6845,8 +6845,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_37", - "text": "1-33" + "key": "mainchapter_main_stage_mainlineName_71", + "text": "2-37" }, "title": { "key": "mainchapter_main_stage_title_49", @@ -6964,8 +6964,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_38", - "text": "1-34" + "key": "mainchapter_main_stage_mainlineName_72", + "text": "2-38" }, "title": { "key": "mainchapter_main_stage_title_50", @@ -7083,8 +7083,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_39", - "text": "1-35" + "key": "mainchapter_main_stage_mainlineName_73", + "text": "2-39" }, "title": { "key": "mainchapter_main_stage_title_51", @@ -7202,8 +7202,8 @@ "text": "困难关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_40", - "text": "1-36" + "key": "mainchapter_main_stage_mainlineName_74", + "text": "2-40" }, "title": { "key": "mainchapter_main_stage_title_52", @@ -7321,8 +7321,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_41", - "text": "1-37" + "key": "mainchapter_main_stage_mainlineName_75", + "text": "2-41" }, "title": { "key": "mainchapter_main_stage_title_53", @@ -7440,8 +7440,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_42", - "text": "1-38" + "key": "mainchapter_main_stage_mainlineName_76", + "text": "2-42" }, "title": { "key": "mainchapter_main_stage_title_54", @@ -7559,8 +7559,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_43", - "text": "1-39" + "key": "mainchapter_main_stage_mainlineName_77", + "text": "2-43" }, "title": { "key": "mainchapter_main_stage_title_55", @@ -7678,8 +7678,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_44", - "text": "1-40" + "key": "mainchapter_main_stage_mainlineName_78", + "text": "2-44" }, "title": { "key": "mainchapter_main_stage_title_56", @@ -7797,8 +7797,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_45", - "text": "1-41" + "key": "mainchapter_main_stage_mainlineName_79", + "text": "2-45" }, "title": { "key": "mainchapter_main_stage_title_57", @@ -7916,8 +7916,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_46", - "text": "1-42" + "key": "mainchapter_main_stage_mainlineName_80", + "text": "2-46" }, "title": { "key": "mainchapter_main_stage_title_58", @@ -8035,8 +8035,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_47", - "text": "1-43" + "key": "mainchapter_main_stage_mainlineName_81", + "text": "2-47" }, "title": { "key": "mainchapter_main_stage_title_59", @@ -8154,8 +8154,8 @@ "text": "地狱关卡" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_48", - "text": "1-44" + "key": "mainchapter_main_stage_mainlineName_82", + "text": "2-48" }, "title": { "key": "mainchapter_main_stage_title_60", @@ -8273,8 +8273,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_49", - "text": "1-45" + "key": "mainchapter_main_stage_mainlineName_83", + "text": "2-49" }, "title": { "key": "mainchapter_main_stage_title_61", @@ -8392,8 +8392,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_50", - "text": "1-46" + "key": "mainchapter_main_stage_mainlineName_84", + "text": "2-50" }, "title": { "key": "mainchapter_main_stage_title_62", @@ -8469,8 +8469,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_51", - "text": "1-47" + "key": "mainchapter_main_stage_mainlineName_85", + "text": "2-51" }, "title": { "key": "mainchapter_main_stage_title_63", @@ -8546,8 +8546,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_52", - "text": "1-48" + "key": "mainchapter_main_stage_mainlineName_86", + "text": "2-52" }, "title": { "key": "mainchapter_main_stage_title_64", @@ -8624,8 +8624,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_53", - "text": "1-49" + "key": "mainchapter_main_stage_mainlineName_87", + "text": "2-53" }, "title": { "key": "mainchapter_main_stage_title_65", @@ -8701,8 +8701,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_54", - "text": "1-50" + "key": "mainchapter_main_stage_mainlineName_88", + "text": "2-54" }, "title": { "key": "mainchapter_main_stage_title_66", @@ -8778,8 +8778,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_55", - "text": "1-51" + "key": "mainchapter_main_stage_mainlineName_89", + "text": "2-55" }, "title": { "key": "mainchapter_main_stage_title_67", @@ -8849,8 +8849,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_56", - "text": "1-52" + "key": "mainchapter_main_stage_mainlineName_90", + "text": "2-56" }, "title": { "key": "mainchapter_main_stage_title_68", @@ -8926,8 +8926,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_57", - "text": "1-53" + "key": "mainchapter_main_stage_mainlineName_91", + "text": "2-57" }, "title": { "key": "mainchapter_main_stage_title_69", @@ -9003,8 +9003,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_58", - "text": "1-54" + "key": "mainchapter_main_stage_mainlineName_92", + "text": "2-58" }, "title": { "key": "mainchapter_main_stage_title_70", @@ -9074,8 +9074,8 @@ "text": "测试战斗组1" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_59", - "text": "1-55" + "key": "mainchapter_main_stage_mainlineName_93", + "text": "2-59" }, "title": { "key": "mainchapter_main_stage_title_71", @@ -9193,8 +9193,8 @@ "text": "测试战斗组2" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_60", - "text": "1-56" + "key": "mainchapter_main_stage_mainlineName_94", + "text": "2-60" }, "title": { "key": "mainchapter_main_stage_title_72", @@ -9312,8 +9312,8 @@ "text": "测试战斗组3" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_61", - "text": "1-57" + "key": "mainchapter_main_stage_mainlineName_95", + "text": "2-61" }, "title": { "key": "mainchapter_main_stage_title_73", @@ -9431,8 +9431,8 @@ "text": "测试战斗组4" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_62", - "text": "1-58" + "key": "mainchapter_main_stage_mainlineName_96", + "text": "2-62" }, "title": { "key": "mainchapter_main_stage_title_74", @@ -9550,8 +9550,8 @@ "text": "测试战斗组5" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_63", - "text": "1-59" + "key": "mainchapter_main_stage_mainlineName_97", + "text": "2-63" }, "title": { "key": "mainchapter_main_stage_title_75", @@ -9669,8 +9669,8 @@ "text": "测试战斗组6" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_64", - "text": "1-60" + "key": "mainchapter_main_stage_mainlineName_98", + "text": "2-64" }, "title": { "key": "mainchapter_main_stage_title_76", @@ -9788,8 +9788,8 @@ "text": "测试战斗组7" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_65", - "text": "1-61" + "key": "mainchapter_main_stage_mainlineName_99", + "text": "2-65" }, "title": { "key": "mainchapter_main_stage_title_77", @@ -9907,8 +9907,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_66", - "text": "1-62" + "key": "mainchapter_main_stage_mainlineName_100", + "text": "2-66" }, "title": { "key": "mainchapter_main_stage_title_78", @@ -9984,8 +9984,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_67", - "text": "1-63" + "key": "mainchapter_main_stage_mainlineName_101", + "text": "2-67" }, "title": { "key": "mainchapter_main_stage_title_79", @@ -10061,8 +10061,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_68", - "text": "1-64" + "key": "mainchapter_main_stage_mainlineName_102", + "text": "2-68" }, "title": { "key": "mainchapter_main_stage_title_80", @@ -10140,8 +10140,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_69", - "text": "1-65" + "key": "mainchapter_main_stage_mainlineName_103", + "text": "2-69" }, "title": { "key": "mainchapter_main_stage_title_81", @@ -10217,8 +10217,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_70", - "text": "1-66" + "key": "mainchapter_main_stage_mainlineName_104", + "text": "2-70" }, "title": { "key": "mainchapter_main_stage_title_82", @@ -10294,8 +10294,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_71", - "text": "1-67" + "key": "mainchapter_main_stage_mainlineName_105", + "text": "2-71" }, "title": { "key": "mainchapter_main_stage_title_83", @@ -10371,8 +10371,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_72", - "text": "1-68" + "key": "mainchapter_main_stage_mainlineName_106", + "text": "2-72" }, "title": { "key": "mainchapter_main_stage_title_84", @@ -10450,8 +10450,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_73", - "text": "1-69" + "key": "mainchapter_main_stage_mainlineName_107", + "text": "2-73" }, "title": { "key": "mainchapter_main_stage_title_85", @@ -10527,8 +10527,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_74", - "text": "1-70" + "key": "mainchapter_main_stage_mainlineName_108", + "text": "2-74" }, "title": { "key": "mainchapter_main_stage_title_86", @@ -10604,8 +10604,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_75", - "text": "1-71" + "key": "mainchapter_main_stage_mainlineName_109", + "text": "2-75" }, "title": { "key": "mainchapter_main_stage_title_87", @@ -10681,8 +10681,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_76", - "text": "1-72" + "key": "mainchapter_main_stage_mainlineName_110", + "text": "2-76" }, "title": { "key": "mainchapter_main_stage_title_88", @@ -10760,8 +10760,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_77", - "text": "1-73" + "key": "mainchapter_main_stage_mainlineName_111", + "text": "2-77" }, "title": { "key": "mainchapter_main_stage_title_89", @@ -10839,8 +10839,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_78", - "text": "1-74" + "key": "mainchapter_main_stage_mainlineName_112", + "text": "2-78" }, "title": { "key": "mainchapter_main_stage_title_90", @@ -10958,8 +10958,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_79", - "text": "1-75" + "key": "mainchapter_main_stage_mainlineName_113", + "text": "2-79" }, "title": { "key": "mainchapter_main_stage_title_91", @@ -11035,8 +11035,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_80", - "text": "1-76" + "key": "mainchapter_main_stage_mainlineName_114", + "text": "2-80" }, "title": { "key": "mainchapter_main_stage_title_92", @@ -11112,8 +11112,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_81", - "text": "1-77" + "key": "mainchapter_main_stage_mainlineName_115", + "text": "2-81" }, "title": { "key": "mainchapter_main_stage_title_93", @@ -11189,8 +11189,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_82", - "text": "1-78" + "key": "mainchapter_main_stage_mainlineName_116", + "text": "2-82" }, "title": { "key": "mainchapter_main_stage_title_94", @@ -11308,8 +11308,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_83", - "text": "1-79" + "key": "mainchapter_main_stage_mainlineName_117", + "text": "2-83" }, "title": { "key": "mainchapter_main_stage_title_95", @@ -11389,8 +11389,8 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_83", - "text": "1-79" + "key": "mainchapter_main_stage_mainlineName_118", + "text": "2-84" }, "title": { "key": "mainchapter_main_stage_title_96", @@ -11472,7 +11472,7 @@ "text": "" }, "mainlineName": { - "key": "", + "key": "mainchapter_main_stage_mainlineName_119", "text": "" }, "title": { @@ -11543,7 +11543,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_96", + "key": "mainchapter_main_stage_mainlineName_120", "text": "3-5" }, "title": { @@ -11662,7 +11662,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_97", + "key": "mainchapter_main_stage_mainlineName_121", "text": "3-6" }, "title": { @@ -11781,7 +11781,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_98", + "key": "mainchapter_main_stage_mainlineName_122", "text": "3-7" }, "title": { @@ -11900,7 +11900,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_99", + "key": "mainchapter_main_stage_mainlineName_123", "text": "3-8" }, "title": { @@ -12019,7 +12019,7 @@ "text": "" }, "mainlineName": { - "key": "", + "key": "mainchapter_main_stage_mainlineName_124", "text": "" }, "title": { @@ -12090,7 +12090,7 @@ "text": "" }, "mainlineName": { - "key": "", + "key": "mainchapter_main_stage_mainlineName_125", "text": "" }, "title": { @@ -12161,7 +12161,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_102", + "key": "mainchapter_main_stage_mainlineName_126", "text": "4-3" }, "title": { @@ -12280,7 +12280,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_103", + "key": "mainchapter_main_stage_mainlineName_127", "text": "4-4" }, "title": { @@ -12399,7 +12399,7 @@ "text": "" }, "mainlineName": { - "key": "", + "key": "mainchapter_main_stage_mainlineName_128", "text": "" }, "title": { @@ -12470,7 +12470,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_105", + "key": "mainchapter_main_stage_mainlineName_129", "text": "4-6" }, "title": { @@ -12589,7 +12589,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_106", + "key": "mainchapter_main_stage_mainlineName_130", "text": "4-7" }, "title": { @@ -12708,7 +12708,7 @@ "text": "" }, "mainlineName": { - "key": "", + "key": "mainchapter_main_stage_mainlineName_131", "text": "" }, "title": { @@ -12779,7 +12779,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_108", + "key": "mainchapter_main_stage_mainlineName_132", "text": "5-1" }, "title": { @@ -12850,7 +12850,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_109", + "key": "mainchapter_main_stage_mainlineName_133", "text": "5-2" }, "title": { @@ -12921,7 +12921,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_110", + "key": "mainchapter_main_stage_mainlineName_134", "text": "5-3" }, "title": { @@ -13040,7 +13040,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_111", + "key": "mainchapter_main_stage_mainlineName_135", "text": "5-4" }, "title": { @@ -13159,7 +13159,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_112", + "key": "mainchapter_main_stage_mainlineName_136", "text": "5-5" }, "title": { @@ -13230,7 +13230,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_113", + "key": "mainchapter_main_stage_mainlineName_137", "text": "5-6" }, "title": { @@ -13349,7 +13349,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_114", + "key": "mainchapter_main_stage_mainlineName_138", "text": "5-7" }, "title": { @@ -13468,7 +13468,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_115", + "key": "mainchapter_main_stage_mainlineName_139", "text": "5-8" }, "title": { @@ -13587,7 +13587,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_116", + "key": "mainchapter_main_stage_mainlineName_140", "text": "6-1" }, "title": { @@ -13658,7 +13658,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_117", + "key": "mainchapter_main_stage_mainlineName_141", "text": "6-2" }, "title": { @@ -13729,7 +13729,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_118", + "key": "mainchapter_main_stage_mainlineName_142", "text": "6-3" }, "title": { @@ -13848,7 +13848,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_119", + "key": "mainchapter_main_stage_mainlineName_143", "text": "6-4" }, "title": { @@ -13919,7 +13919,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_120", + "key": "mainchapter_main_stage_mainlineName_144", "text": "6-5" }, "title": { @@ -14038,7 +14038,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_121", + "key": "mainchapter_main_stage_mainlineName_145", "text": "6-6" }, "title": { @@ -14073,7 +14073,7 @@ 100413 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 0, "stage_param": 0, "battle_fail": 0, "venturemodelspeed": 0, @@ -14109,7 +14109,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_122", + "key": "mainchapter_main_stage_mainlineName_146", "text": "6-7" }, "title": { @@ -14228,7 +14228,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_123", + "key": "mainchapter_main_stage_mainlineName_147", "text": "6-8" }, "title": { @@ -14347,7 +14347,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_124", + "key": "mainchapter_main_stage_mainlineName_148", "text": "7-1" }, "title": { @@ -14466,7 +14466,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_125", + "key": "mainchapter_main_stage_mainlineName_149", "text": "7-2" }, "title": { @@ -14585,7 +14585,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_126", + "key": "mainchapter_main_stage_mainlineName_150", "text": "7-3" }, "title": { @@ -14704,7 +14704,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_127", + "key": "mainchapter_main_stage_mainlineName_151", "text": "7-4" }, "title": { @@ -14823,7 +14823,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_128", + "key": "mainchapter_main_stage_mainlineName_152", "text": "7-5" }, "title": { @@ -14942,7 +14942,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_129", + "key": "mainchapter_main_stage_mainlineName_153", "text": "7-6" }, "title": { @@ -15061,7 +15061,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_130", + "key": "mainchapter_main_stage_mainlineName_154", "text": "7-7" }, "title": { @@ -15180,7 +15180,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_131", + "key": "mainchapter_main_stage_mainlineName_155", "text": "7-8" }, "title": { @@ -15299,7 +15299,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_132", + "key": "mainchapter_main_stage_mainlineName_156", "text": "8-1" }, "title": { @@ -15418,7 +15418,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_133", + "key": "mainchapter_main_stage_mainlineName_157", "text": "8-2" }, "title": { @@ -15537,7 +15537,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_134", + "key": "mainchapter_main_stage_mainlineName_158", "text": "8-3" }, "title": { @@ -15656,7 +15656,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_135", + "key": "mainchapter_main_stage_mainlineName_159", "text": "8-4" }, "title": { @@ -15775,7 +15775,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_136", + "key": "mainchapter_main_stage_mainlineName_160", "text": "8-5" }, "title": { @@ -15894,7 +15894,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_137", + "key": "mainchapter_main_stage_mainlineName_161", "text": "8-6" }, "title": { @@ -16013,7 +16013,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_138", + "key": "mainchapter_main_stage_mainlineName_162", "text": "8-7" }, "title": { @@ -16132,7 +16132,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_139", + "key": "mainchapter_main_stage_mainlineName_163", "text": "8-8" }, "title": { @@ -16251,7 +16251,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_140", + "key": "mainchapter_main_stage_mainlineName_164", "text": "9-1" }, "title": { @@ -16370,7 +16370,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_141", + "key": "mainchapter_main_stage_mainlineName_165", "text": "9-2" }, "title": { @@ -16489,7 +16489,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_142", + "key": "mainchapter_main_stage_mainlineName_166", "text": "9-3" }, "title": { @@ -16608,7 +16608,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_143", + "key": "mainchapter_main_stage_mainlineName_167", "text": "9-4" }, "title": { @@ -16727,7 +16727,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_144", + "key": "mainchapter_main_stage_mainlineName_168", "text": "9-5" }, "title": { @@ -16846,7 +16846,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_145", + "key": "mainchapter_main_stage_mainlineName_169", "text": "9-6" }, "title": { @@ -16965,7 +16965,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_146", + "key": "mainchapter_main_stage_mainlineName_170", "text": "9-7" }, "title": { @@ -17084,7 +17084,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_147", + "key": "mainchapter_main_stage_mainlineName_171", "text": "9-8" }, "title": { @@ -17203,7 +17203,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_148", + "key": "mainchapter_main_stage_mainlineName_172", "text": "10-1" }, "title": { @@ -17322,7 +17322,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_149", + "key": "mainchapter_main_stage_mainlineName_173", "text": "10-2" }, "title": { @@ -17441,7 +17441,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_150", + "key": "mainchapter_main_stage_mainlineName_174", "text": "10-3" }, "title": { @@ -17560,7 +17560,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_151", + "key": "mainchapter_main_stage_mainlineName_175", "text": "10-4" }, "title": { @@ -17679,7 +17679,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_152", + "key": "mainchapter_main_stage_mainlineName_176", "text": "10-5" }, "title": { @@ -17798,7 +17798,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_153", + "key": "mainchapter_main_stage_mainlineName_177", "text": "10-6" }, "title": { @@ -17917,7 +17917,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_154", + "key": "mainchapter_main_stage_mainlineName_178", "text": "10-7" }, "title": { @@ -18036,7 +18036,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_155", + "key": "mainchapter_main_stage_mainlineName_179", "text": "10-8" }, "title": { @@ -18155,7 +18155,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_156", + "key": "mainchapter_main_stage_mainlineName_180", "text": "11-1" }, "title": { @@ -18274,7 +18274,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_157", + "key": "mainchapter_main_stage_mainlineName_181", "text": "11-2" }, "title": { @@ -18393,7 +18393,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_158", + "key": "mainchapter_main_stage_mainlineName_182", "text": "11-3" }, "title": { @@ -18512,7 +18512,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_159", + "key": "mainchapter_main_stage_mainlineName_183", "text": "11-4" }, "title": { @@ -18631,7 +18631,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_160", + "key": "mainchapter_main_stage_mainlineName_184", "text": "11-5" }, "title": { @@ -18750,7 +18750,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_161", + "key": "mainchapter_main_stage_mainlineName_185", "text": "11-6" }, "title": { @@ -18869,7 +18869,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_162", + "key": "mainchapter_main_stage_mainlineName_186", "text": "11-7" }, "title": { @@ -18988,7 +18988,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_163", + "key": "mainchapter_main_stage_mainlineName_187", "text": "11-8" }, "title": { @@ -19107,7 +19107,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_164", + "key": "mainchapter_main_stage_mainlineName_188", "text": "12-1" }, "title": { @@ -19226,7 +19226,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_165", + "key": "mainchapter_main_stage_mainlineName_189", "text": "12-2" }, "title": { @@ -19345,7 +19345,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_166", + "key": "mainchapter_main_stage_mainlineName_190", "text": "12-3" }, "title": { @@ -19464,7 +19464,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_167", + "key": "mainchapter_main_stage_mainlineName_191", "text": "12-4" }, "title": { @@ -19583,7 +19583,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_168", + "key": "mainchapter_main_stage_mainlineName_192", "text": "12-5" }, "title": { @@ -19702,7 +19702,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_169", + "key": "mainchapter_main_stage_mainlineName_193", "text": "12-6" }, "title": { @@ -19821,7 +19821,7 @@ "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_170", + "key": "mainchapter_main_stage_mainlineName_194", "text": "12-7" }, "title": { diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index 42a70f552..92668f3df 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -199,18 +199,18 @@ }, { "Id": 12, - "scene": "WuGuanScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_12", - "text": "熊猫武馆" + "text": "中轴城" }, - "sceneicon": "ty_qp_xmwg", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_Sheet1_functionname_12", "text": "布告栏" }, "npcName": [ - "告示板" + "功能入口_派遣" ], "functionicon": "ty_qp_gsb", "jumpId": 10006 diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index be594f6b0..d5677355a 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -7327,7 +7327,7 @@ 2, 300986 ], - "goto": 1 + "goto": 0 }, { "id": 3202312, @@ -7338,7 +7338,7 @@ "903" ], "event": [], - "goto": 2 + "goto": 0 }, { "id": 3202319, @@ -7349,7 +7349,7 @@ "904" ], "event": [], - "goto": 3 + "goto": 0 }, { "id": 320240, @@ -7364,7 +7364,7 @@ 2, 301010 ], - "goto": 4 + "goto": 0 }, { "id": 320241, @@ -7375,7 +7375,7 @@ "906" ], "event": [], - "goto": 5 + "goto": 0 }, { "id": 320249, @@ -7386,7 +7386,7 @@ "901" ], "event": [], - "goto": 6 + "goto": 0 }, { "id": 320250, @@ -7401,7 +7401,7 @@ 2, 301030 ], - "goto": 7 + "goto": 0 }, { "id": 320251, @@ -7425,6 +7425,51 @@ "event": [], "goto": 0 }, + { + "id": 320260, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "阿宝", + "137" + ], + "event": [ + 2, + 301040 + ], + "goto": 0 + }, + { + "id": 320261, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "总教习", + "137" + ], + "event": [ + 2, + 301042 + ], + "goto": 0 + }, + { + "id": 320269, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "WuGuanScene", + "总教习", + "137" + ], + "event": [ + 2, + 301043 + ], + "goto": 0 + }, { "id": 50010, "heroid": 25001, diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 91926b76f..4ff415129 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -333,22 +333,22 @@ "id": 10031, "title": { "key": "ruledesc_ruledesc_title_31", - "text": "功夫塔挑战说明" + "text": "炼金塔挑战说明" }, "content": { "key": "ruledesc_ruledesc_content_31", - "text": "这里可以挑战功夫塔，每次挑战胜利都可以获得奖励，每挑战胜利10层可以获得相应教习。（功夫塔挑战不需要消耗物品）。" + "text": "这里可以挑战炼金塔，每次挑战胜利都可以获得奖励，每挑战胜利10层可以获得相应教习。（炼金塔挑战不需要消耗物品）。" } }, { "id": 10032, "title": { "key": "ruledesc_ruledesc_title_32", - "text": "功夫塔挑战说明" + "text": "炼金塔挑战说明" }, "content": { "key": "ruledesc_ruledesc_content_32", - "text": "这里可以查看功夫塔每层挑战成功获得的奖励与敌人配置。" + "text": "这里可以查看炼金塔每层挑战成功获得的奖励与敌人配置。" } }, { diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index f4339d9f4..0c6b44ccb 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -33261,9 +33261,7 @@ 2, 400 ], - "FollowSK": [ - 243004312 - ], + "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -33286,9 +33284,7 @@ 4, 5200 ], - "FollowSK": [ - 243004313 - ], + "FollowSK": [], "SucFollowSK": [ 243004314 ], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 480d44432..6fd2b6cf4 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -25169,7 +25169,9 @@ "Target": 2, "ChildSkill": { "Id": [ - 243004311 + 243004311, + 243004312, + 243004313 ] }, "passSkill": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 8f87853cd..39d13cd59 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1253,7 +1253,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fs", "buffeffect": "effect_34002_skill_1_hit_1", @@ -2976,7 +2976,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -3010,7 +3010,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -3076,7 +3076,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -3594,7 +3594,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -3659,7 +3659,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 5, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -3790,7 +3790,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_q", "buffeffect": "", @@ -3821,7 +3821,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_mzmy", "buffeffect": "", @@ -3854,7 +3854,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_dy", "buffeffect": "", @@ -4219,7 +4219,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_zhby", "buffeffect": "", @@ -4768,7 +4768,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjts", "buffeffect": "", @@ -4801,7 +4801,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjts", "buffeffect": "", @@ -4834,7 +4834,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_bjts", "buffeffect": "", @@ -4867,7 +4867,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_bjts", "buffeffect": "", @@ -4900,7 +4900,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -4933,7 +4933,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -4966,7 +4966,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts10", "buffeffect": "", @@ -4999,7 +4999,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts10", "buffeffect": "", @@ -5032,7 +5032,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5097,7 +5097,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts10", "buffeffect": "", @@ -5130,7 +5130,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5163,7 +5163,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5196,7 +5196,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -5229,7 +5229,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -5262,7 +5262,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5295,7 +5295,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5328,7 +5328,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5361,7 +5361,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5394,7 +5394,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5427,7 +5427,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5460,7 +5460,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -5493,7 +5493,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -5528,7 +5528,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_hd", "buffeffect": "", @@ -5563,7 +5563,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_hd", "buffeffect": "", @@ -5596,7 +5596,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5629,7 +5629,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5662,7 +5662,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -5695,7 +5695,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -5760,7 +5760,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_sm", "buffeffect": "effect_debuff_sleep", @@ -5926,7 +5926,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5959,7 +5959,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -5995,7 +5995,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6031,7 +6031,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6064,7 +6064,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6161,7 +6161,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts10", "buffeffect": "", @@ -6194,7 +6194,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts10", "buffeffect": "", @@ -6232,7 +6232,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 10, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6270,7 +6270,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 10, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6304,7 +6304,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_hd", "buffeffect": "", @@ -6341,7 +6341,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_hd", "buffeffect": "", @@ -6504,7 +6504,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6538,7 +6538,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6603,7 +6603,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6636,7 +6636,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjts", "buffeffect": "", @@ -6669,7 +6669,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjts", "buffeffect": "", @@ -6702,7 +6702,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -6735,7 +6735,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -6768,7 +6768,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6801,7 +6801,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6834,7 +6834,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6867,7 +6867,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6932,7 +6932,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6962,7 +6962,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -6995,7 +6995,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7028,7 +7028,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7058,7 +7058,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7091,7 +7091,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7124,7 +7124,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7157,7 +7157,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7187,7 +7187,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7222,7 +7222,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -7257,7 +7257,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyts", "buffeffect": "", @@ -7292,7 +7292,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7327,7 +7327,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7360,7 +7360,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7394,7 +7394,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7428,7 +7428,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7461,7 +7461,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7494,7 +7494,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7528,7 +7528,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjxj", "buffeffect": "", @@ -7562,7 +7562,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjxj", "buffeffect": "", @@ -7596,7 +7596,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyxj", "buffeffect": "", @@ -7630,7 +7630,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_fyxj", "buffeffect": "", @@ -7663,7 +7663,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7696,7 +7696,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7730,7 +7730,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 5, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_sdxj", "buffeffect": "", @@ -7764,7 +7764,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 5, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_sdxj", "buffeffect": "", @@ -7799,7 +7799,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7832,7 +7832,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7862,7 +7862,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7892,7 +7892,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7927,7 +7927,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7960,7 +7960,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -7992,7 +7992,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8025,7 +8025,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8058,7 +8058,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8091,7 +8091,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8154,7 +8154,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8187,7 +8187,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8220,7 +8220,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8253,7 +8253,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8285,7 +8285,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8318,7 +8318,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8351,7 +8351,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8384,7 +8384,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8417,7 +8417,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8450,7 +8450,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -8483,7 +8483,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -9845,7 +9845,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -10570,7 +10570,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -10606,7 +10606,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -10878,7 +10878,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -10912,7 +10912,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -10946,7 +10946,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -10981,7 +10981,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -11015,7 +11015,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -11113,7 +11113,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", @@ -11146,7 +11146,7 @@ "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, - "SameID": true, + "SameID": false, "golbalbufficon": "", "buffIcon": "", "buffeffect": "", diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 47689a226..922651382 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -2282,9 +2282,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 99, "Callback": [ - 1, - 1000, - 214002214 + 255002213 ] }, { @@ -2302,10 +2300,11 @@ "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 99, + "MaxEmitTimesInRound": 1, "Callback": [ 1, - 1000 + 1000, + 214002214 ] }, { @@ -2323,7 +2322,7 @@ "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 99, + "MaxEmitTimesInRound": 1, "Callback": [ 1, 1000 @@ -7556,7 +7555,7 @@ "TargetCheck": "Target=2,HasBuff=1", "MainSkillCheck": "MainSkillID=115002311", "AfterSkillCheck": "", - "BuffCheck": "HasBuff=1,Succ=1", + "BuffCheck": "Effect=1,Succ=1", "DpsCheck": "", "AddCon": [], "PasPr": 1000, @@ -7982,7 +7981,7 @@ "TargetCheck": "Target=2,HasBuff=1", "MainSkillCheck": "", "AfterSkillCheck": "", - "BuffCheck": "HasBuff=1,Succ=1", + "BuffCheck": "Effect=1,Succ=1", "DpsCheck": "", "AddCon": [], "PasPr": 1000, @@ -8017,12 +8016,12 @@ }, { "Id": 494500131, - "When": 28, - "FromCheck": "", - "TargetCheck": "Target=2,HasBuff=3", + "When": 18, + "FromCheck": "Target=3", + "TargetCheck": "Target=2", "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", - "BuffCheck": "HasBuff=3,Succ=1", + "BuffCheck": "Effect=3,Succ=1", "DpsCheck": "", "AddCon": [], "PasPr": 1000, @@ -8037,12 +8036,12 @@ }, { "Id": 494500132, - "When": 28, + "When": 18, "FromCheck": "Target=3", - "TargetCheck": "Target=1,HasBuff=1", + "TargetCheck": "Target=1", "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", - "BuffCheck": "Succ=1", + "BuffCheck": "Effect=1,Succ=1", "DpsCheck": "", "AddCon": [], "PasPr": 1000, @@ -8192,7 +8191,7 @@ "Type": "BeatBack", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 0, + "MaxEmitTimesInRound": 1, "Callback": [ 1, 1000, @@ -8794,7 +8793,7 @@ "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 0, + "MaxEmitTimesInRound": 1, "Callback": [ 944005316 ] diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 683830bc6..158526b2e 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -5511,7 +5511,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 300011, "group": 301, "exgroup": 310, @@ -5642,7 +5642,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20060, + "ontxe": 20270, "id_after": 0, "group": 301, "exgroup": 310, @@ -5683,7 +5683,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 300050, "group": 302, "exgroup": 310, @@ -5935,7 +5935,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 302, "exgroup": 310, @@ -5976,7 +5976,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20240, + "ontxe": 20280, "id_after": 0, "group": 320, "exgroup": 310, @@ -6314,7 +6314,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6355,7 +6355,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6396,7 +6396,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6437,7 +6437,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6478,7 +6478,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6519,7 +6519,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 320231, "group": 320, "exgroup": 310, @@ -6568,15 +6568,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_153", - "text": "商队2" + "text": "商队起航" }, "task_details": { "key": "worldtask_world_task_task_details_153", - "text": "商队2" + "text": "商队起航" }, "npctxt": { "key": "worldtask_world_task_npctxt_153", - "text": "商队2" + "text": "商队起航" }, "get_item": [], "trigger": 0, @@ -6601,7 +6601,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6642,7 +6642,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6678,6 +6678,49 @@ ], "module": [] }, + { + "key": 320260, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 20250, + "id_after": 0, + "group": 320, + "exgroup": 310, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_156", + "text": "师傅的教诲" + }, + "task_details": { + "key": "worldtask_world_task_task_details_156", + "text": "师傅的教诲" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_156", + "text": "师傅的教诲" + }, + "get_item": [], + "trigger": 0, + "npc": 320260, + "completetask": [ + 14000026 + ], + "deliver_npc": 320269, + "taskend_removeitem": [], + "auto_accept": 0, + "tasktips": 0, + "lock_add": 1, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, { "key": 100010, "opencond": "", @@ -6690,15 +6733,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_156", + "key": "worldtask_world_task_task_name_157", "text": "梅林的试炼" }, "task_details": { - "key": "worldtask_world_task_task_details_156", + "key": "worldtask_world_task_task_details_157", "text": "梅林的试炼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_156", + "key": "worldtask_world_task_npctxt_157", "text": "梅林的试炼" }, "get_item": [], @@ -6748,15 +6791,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_157", + "key": "worldtask_world_task_task_name_158", "text": "梅林的试炼" }, "task_details": { - "key": "worldtask_world_task_task_details_157", + "key": "worldtask_world_task_task_details_158", "text": "梅林的试炼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_157", + "key": "worldtask_world_task_npctxt_158", "text": "梅林的试炼" }, "get_item": [], @@ -6806,15 +6849,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_158", + "key": "worldtask_world_task_task_name_159", "text": "梅林的试炼" }, "task_details": { - "key": "worldtask_world_task_task_details_158", + "key": "worldtask_world_task_task_details_159", "text": "梅林的试炼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_158", + "key": "worldtask_world_task_npctxt_159", "text": "梅林的试炼" }, "get_item": [], @@ -6864,15 +6907,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_159", + "key": "worldtask_world_task_task_name_160", "text": "梅林的试炼" }, "task_details": { - "key": "worldtask_world_task_task_details_159", + "key": "worldtask_world_task_task_details_160", "text": "梅林的试炼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_159", + "key": "worldtask_world_task_npctxt_160", "text": "梅林的试炼" }, "get_item": [], @@ -6922,15 +6965,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_160", + "key": "worldtask_world_task_task_name_161", "text": "梅林的试炼" }, "task_details": { - "key": "worldtask_world_task_task_details_160", + "key": "worldtask_world_task_task_details_161", "text": "梅林的试炼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_160", + "key": "worldtask_world_task_npctxt_161", "text": "梅林的试炼" }, "get_item": [], @@ -6980,15 +7023,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_161", + "key": "worldtask_world_task_task_name_162", "text": "梅林的试炼" }, "task_details": { - "key": "worldtask_world_task_task_details_161", + "key": "worldtask_world_task_task_details_162", "text": "梅林的试炼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_161", + "key": "worldtask_world_task_npctxt_162", "text": "梅林的试炼" }, "get_item": [], @@ -7038,15 +7081,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_162", + "key": "worldtask_world_task_task_name_163", "text": "贫嘴驴的烦恼" }, "task_details": { - "key": "worldtask_world_task_task_details_162", + "key": "worldtask_world_task_task_details_163", "text": "贫嘴驴的烦恼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_162", + "key": "worldtask_world_task_npctxt_163", "text": "贫嘴驴的烦恼" }, "get_item": [], @@ -7096,15 +7139,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_163", + "key": "worldtask_world_task_task_name_164", "text": "亚丝翠的烦恼" }, "task_details": { - "key": "worldtask_world_task_task_details_163", + "key": "worldtask_world_task_task_details_164", "text": "亚丝翠的烦恼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_163", + "key": "worldtask_world_task_npctxt_164", "text": "亚丝翠的烦恼" }, "get_item": [], @@ -7154,15 +7197,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_164", + "key": "worldtask_world_task_task_name_165", "text": "姜饼人的烦恼" }, "task_details": { - "key": "worldtask_world_task_task_details_164", + "key": "worldtask_world_task_task_details_165", "text": "姜饼人的烦恼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_164", + "key": "worldtask_world_task_npctxt_165", "text": "姜饼人的烦恼" }, "get_item": [], @@ -7212,15 +7255,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_165", + "key": "worldtask_world_task_task_name_166", "text": "平先生的烦恼" }, "task_details": { - "key": "worldtask_world_task_task_details_165", + "key": "worldtask_world_task_task_details_166", "text": "平先生的烦恼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_165", + "key": "worldtask_world_task_npctxt_166", "text": "平先生的烦恼" }, "get_item": [], @@ -7270,15 +7313,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_166", + "key": "worldtask_world_task_task_name_167", "text": "匹诺曹的烦恼" }, "task_details": { - "key": "worldtask_world_task_task_details_166", + "key": "worldtask_world_task_task_details_167", "text": "匹诺曹的烦恼" }, "npctxt": { - "key": "worldtask_world_task_npctxt_166", + "key": "worldtask_world_task_npctxt_167", "text": "匹诺曹的烦恼" }, "get_item": [], @@ -7328,15 +7371,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_167", + "key": "worldtask_world_task_task_name_168", "text": "波比的失物找回" }, "task_details": { - "key": "worldtask_world_task_task_details_167", + "key": "worldtask_world_task_task_details_168", "text": "波比的失物找回" }, "npctxt": { - "key": "worldtask_world_task_npctxt_167", + "key": "worldtask_world_task_npctxt_168", "text": "波比的失物找回" }, "get_item": [], @@ -7386,15 +7429,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_168", + "key": "worldtask_world_task_task_name_169", "text": "希卡普的失物找回" }, "task_details": { - "key": "worldtask_world_task_task_details_168", + "key": "worldtask_world_task_task_details_169", "text": "希卡普的失物找回" }, "npctxt": { - "key": "worldtask_world_task_npctxt_168", + "key": "worldtask_world_task_npctxt_169", "text": "希卡普的失物找回" }, "get_item": [], @@ -7444,15 +7487,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_169", + "key": "worldtask_world_task_task_name_170", "text": "菲欧娜的失物找回" }, "task_details": { - "key": "worldtask_world_task_task_details_169", + "key": "worldtask_world_task_task_details_170", "text": "菲欧娜的失物找回" }, "npctxt": { - "key": "worldtask_world_task_npctxt_169", + "key": "worldtask_world_task_npctxt_170", "text": "菲欧娜的失物找回" }, "get_item": [], @@ -7502,15 +7545,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_170", + "key": "worldtask_world_task_task_name_171", "text": "戈伯的失物找回" }, "task_details": { - "key": "worldtask_world_task_task_details_170", + "key": "worldtask_world_task_task_details_171", "text": "戈伯的失物找回" }, "npctxt": { - "key": "worldtask_world_task_npctxt_170", + "key": "worldtask_world_task_npctxt_171", "text": "戈伯的失物找回" }, "get_item": [], @@ -7560,15 +7603,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_171", + "key": "worldtask_world_task_task_name_172", "text": "阿比盖尔的失物找回" }, "task_details": { - "key": "worldtask_world_task_task_details_171", + "key": "worldtask_world_task_task_details_172", "text": "阿比盖尔的失物找回" }, "npctxt": { - "key": "worldtask_world_task_npctxt_171", + "key": "worldtask_world_task_npctxt_172", "text": "阿比盖尔的失物找回" }, "get_item": [], @@ -7618,15 +7661,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_172", + "key": "worldtask_world_task_task_name_173", "text": "骇客蛛的紧急委托" }, "task_details": { - "key": "worldtask_world_task_task_details_172", + "key": "worldtask_world_task_task_details_173", "text": "骇客蛛感受到了异样的气息，她需要你的帮助" }, "npctxt": { - "key": "worldtask_world_task_npctxt_172", + "key": "worldtask_world_task_npctxt_173", "text": "骇客蛛的紧急委托" }, "get_item": [], @@ -7676,15 +7719,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_173", + "key": "worldtask_world_task_task_name_174", "text": "希卡普的紧急委托" }, "task_details": { - "key": "worldtask_world_task_task_details_173", + "key": "worldtask_world_task_task_details_174", "text": "不知为何，羊群近日愈发躁动，或许你能帮助希卡普摆平这件事情。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_173", + "key": "worldtask_world_task_npctxt_174", "text": "希卡普的紧急委托" }, "get_item": [], @@ -7734,15 +7777,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_174", + "key": "worldtask_world_task_task_name_175", "text": "邦尼兔的紧急委托" }, "task_details": { - "key": "worldtask_world_task_task_details_174", + "key": "worldtask_world_task_task_details_175", "text": "豺狼们再次聚集了起来，在他们壮大之前必须先行捣毁。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_174", + "key": "worldtask_world_task_npctxt_175", "text": "邦尼兔的紧急委托" }, "get_item": [], @@ -7792,15 +7835,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_175", + "key": "worldtask_world_task_task_name_176", "text": "骇客蛛的委托" }, "task_details": { - "key": "worldtask_world_task_task_details_175", + "key": "worldtask_world_task_task_details_176", "text": "森林传来的低吼，或是豺狼们潜入了进来。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_175", + "key": "worldtask_world_task_npctxt_176", "text": "骇客蛛的委托" }, "get_item": [], @@ -7850,15 +7893,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_176", + "key": "worldtask_world_task_task_name_177", "text": "希卡普的发现" }, "task_details": { - "key": "worldtask_world_task_task_details_176", + "key": "worldtask_world_task_task_details_177", "text": "诶雷特的手下近日行为有些异常，或许是该敲打一番了。" }, "npctxt": { - "key": "worldtask_world_task_npctxt_176", + "key": "worldtask_world_task_npctxt_177", "text": "希卡普的发现" }, "get_item": [], @@ -7908,15 +7951,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_177", + "key": "worldtask_world_task_task_name_178", "text": "清理所有怪物6" }, "task_details": { - "key": "worldtask_world_task_task_details_177", + "key": "worldtask_world_task_task_details_178", "text": "清理所有怪物6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_177", + "key": "worldtask_world_task_npctxt_178", "text": "清理所有怪物6" }, "get_item": [], @@ -7966,15 +8009,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_178", + "key": "worldtask_world_task_task_name_179", "text": "邦尼兔的请求" }, "task_details": { - "key": "worldtask_world_task_task_details_178", + "key": "worldtask_world_task_task_details_179", "text": "邦尼兔的请求" }, "npctxt": { - "key": "worldtask_world_task_npctxt_178", + "key": "worldtask_world_task_npctxt_179", "text": "邦尼兔的请求" }, "get_item": [], @@ -8026,15 +8069,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_179", + "key": "worldtask_world_task_task_name_180", "text": "菲欧娜的请求" }, "task_details": { - "key": "worldtask_world_task_task_details_179", + "key": "worldtask_world_task_task_details_180", "text": "菲欧娜的请求" }, "npctxt": { - "key": "worldtask_world_task_npctxt_179", + "key": "worldtask_world_task_npctxt_180", "text": "菲欧娜的请求" }, "get_item": [], @@ -8086,15 +8129,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_180", + "key": "worldtask_world_task_task_name_181", "text": "戈伯的请求" }, "task_details": { - "key": "worldtask_world_task_task_details_180", + "key": "worldtask_world_task_task_details_181", "text": "戈伯的请求" }, "npctxt": { - "key": "worldtask_world_task_npctxt_180", + "key": "worldtask_world_task_npctxt_181", "text": "戈伯的请求" }, "get_item": [], @@ -8146,15 +8189,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_181", + "key": "worldtask_world_task_task_name_182", "text": "平先生的请求" }, "task_details": { - "key": "worldtask_world_task_task_details_181", + "key": "worldtask_world_task_task_details_182", "text": "平先生的请求" }, "npctxt": { - "key": "worldtask_world_task_npctxt_181", + "key": "worldtask_world_task_npctxt_182", "text": "平先生的请求" }, "get_item": [], @@ -8206,15 +8249,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_182", + "key": "worldtask_world_task_task_name_183", "text": "骇客蛛的请求" }, "task_details": { - "key": "worldtask_world_task_task_details_182", + "key": "worldtask_world_task_task_details_183", "text": "骇客蛛的请求" }, "npctxt": { - "key": "worldtask_world_task_npctxt_182", + "key": "worldtask_world_task_npctxt_183", "text": "骇客蛛的请求" }, "get_item": [], @@ -8266,15 +8309,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_183", + "key": "worldtask_world_task_task_name_184", "text": "阿宝的心事" }, "task_details": { - "key": "worldtask_world_task_task_details_183", + "key": "worldtask_world_task_task_details_184", "text": "阿宝的心事" }, "npctxt": { - "key": "worldtask_world_task_npctxt_183", + "key": "worldtask_world_task_npctxt_184", "text": "阿宝的心事" }, "get_item": [], @@ -8322,15 +8365,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_184", + "key": "worldtask_world_task_task_name_185", "text": "寻找平先生" }, "task_details": { - "key": "worldtask_world_task_task_details_184", + "key": "worldtask_world_task_task_details_185", "text": "寻找平先生" }, "npctxt": { - "key": "worldtask_world_task_npctxt_184", + "key": "worldtask_world_task_npctxt_185", "text": "寻找平先生" }, "get_item": [], @@ -8380,15 +8423,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_185", + "key": "worldtask_world_task_task_name_186", "text": "阿宝的想法" }, "task_details": { - "key": "worldtask_world_task_task_details_185", + "key": "worldtask_world_task_task_details_186", "text": "阿宝的想法" }, "npctxt": { - "key": "worldtask_world_task_npctxt_185", + "key": "worldtask_world_task_npctxt_186", "text": "阿宝的想法" }, "get_item": [], @@ -8436,15 +8479,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_186", + "key": "worldtask_world_task_task_name_187", "text": "寻找金猴" }, "task_details": { - "key": "worldtask_world_task_task_details_186", + "key": "worldtask_world_task_task_details_187", "text": "寻找金猴" }, "npctxt": { - "key": "worldtask_world_task_npctxt_186", + "key": "worldtask_world_task_npctxt_187", "text": "寻找金猴" }, "get_item": [], @@ -8494,15 +8537,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_187", + "key": "worldtask_world_task_task_name_188", "text": "菲欧娜的心事" }, "task_details": { - "key": "worldtask_world_task_task_details_187", + "key": "worldtask_world_task_task_details_188", "text": "菲欧娜的心事" }, "npctxt": { - "key": "worldtask_world_task_npctxt_187", + "key": "worldtask_world_task_npctxt_188", "text": "菲欧娜的心事" }, "get_item": [], @@ -8550,15 +8593,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_188", + "key": "worldtask_world_task_task_name_189", "text": "寻找姜饼人" }, "task_details": { - "key": "worldtask_world_task_task_details_188", + "key": "worldtask_world_task_task_details_189", "text": "寻找姜饼人" }, "npctxt": { - "key": "worldtask_world_task_npctxt_188", + "key": "worldtask_world_task_npctxt_189", "text": "寻找姜饼人" }, "get_item": [], @@ -8608,15 +8651,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_189", + "key": "worldtask_world_task_task_name_190", "text": "黛安狐的心事" }, "task_details": { - "key": "worldtask_world_task_task_details_189", + "key": "worldtask_world_task_task_details_190", "text": "黛安狐的心事" }, "npctxt": { - "key": "worldtask_world_task_npctxt_189", + "key": "worldtask_world_task_npctxt_190", "text": "黛安狐的心事" }, "get_item": [], @@ -8666,15 +8709,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_190", + "key": "worldtask_world_task_task_name_191", "text": "菲欧娜有事相求" }, "task_details": { - "key": "worldtask_world_task_task_details_190", + "key": "worldtask_world_task_task_details_191", "text": "菲欧娜有事相求" }, "npctxt": { - "key": "worldtask_world_task_npctxt_190", + "key": "worldtask_world_task_npctxt_191", "text": "菲欧娜有事相求" }, "get_item": [], @@ -8722,15 +8765,15 @@ "des": 1, "icon": "25001", "task_name": { - "key": "worldtask_world_task_task_name_191", + "key": "worldtask_world_task_task_name_192", "text": "去看看靴子猫" }, "task_details": { - "key": "worldtask_world_task_task_details_191", + "key": "worldtask_world_task_task_details_192", "text": "去看看靴子猫" }, "npctxt": { - "key": "worldtask_world_task_npctxt_191", + "key": "worldtask_world_task_npctxt_192", "text": "去看看靴子猫" }, "get_item": [], diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index b12a43f1a..f637ac7bf 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -293,7 +293,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype95, 1)) + this.module.ModuleBuried.TriggerBuried(session, tasks...) }) } return diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index 08b5c27c1..939db4120 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -323,48 +323,49 @@ type TaskParams struct { } // 任务条件达成通知 +// 废弃 不需要主动推送任务变化 前端主动刷新页面即可 func (this *Sociaty) BuriedsNotify(session comm.IUserSession, conds []*pb.ConIProgress) { - log.Debug("公会任务通知", - log.Field{Key: "uid", Value: session.GetUserId()}, - log.Field{Key: "condIds", Value: conds}) + // log.Debug("公会任务通知", + // log.Field{Key: "uid", Value: session.GetUserId()}, + // log.Field{Key: "condIds", Value: conds}) - sociaty := this.modelSociaty.getUserSociaty(session.GetUserId()) - if sociaty == nil { - return - } + // sociaty := this.modelSociaty.getUserSociaty(session.GetUserId()) + // if sociaty == nil { + // return + // } - sociatyId := sociaty.Id + // sociatyId := sociaty.Id - dt := &pb.DBSociatyTask{} - err := this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(), - comm.Service_Worker, string(comm.Rpc_ModuleSociatyGetTask), - &pb.RPCGeneralReqA2{Param1: sociatyId, Param2: session.GetUserId()}, dt) + // dt := &pb.DBSociatyTask{} + // err := this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(), + // comm.Service_Worker, string(comm.Rpc_ModuleSociatyGetTask), + // &pb.RPCGeneralReqA2{Param1: sociatyId, Param2: session.GetUserId()}, dt) - var flag bool - for _, v := range dt.TaskList { - for _, cond := range conds { - if v.TaskId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish { - v.Status = 1 - flag = true - } - } - } - if !flag { - return - } + // var flag bool + // for _, v := range dt.TaskList { + // for _, cond := range conds { + // if v.TaskId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish { + // v.Status = 1 + // flag = true + // } + // } + // } + // if !flag { + // return + // } - update := map[string]interface{}{ - "taskList": dt.TaskList, - "lastUpdateTime": configure.Now().Unix(), - } + // update := map[string]interface{}{ + // "taskList": dt.TaskList, + // "lastUpdateTime": configure.Now().Unix(), + // } - err = this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(), - comm.Service_Worker, string(comm.Rpc_ModuleSociatyTask), - &TaskParams{SociatyId: sociatyId, Uid: session.GetUserId(), Data: update}, &pb.EmptyResp{}) - if err != nil { - return - } - return + // err = this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(), + // comm.Service_Worker, string(comm.Rpc_ModuleSociatyTask), + // &TaskParams{SociatyId: sociatyId, Uid: session.GetUserId(), Data: update}, &pb.EmptyResp{}) + // if err != nil { + // return + // } + // return } func (this *Sociaty) RpcUpdateUserTask(ctx context.Context, p *TaskParams, reply *pb.EmptyResp) error { diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 36688955e..a2254db48 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -102,12 +102,12 @@ func (this *ModelUser) GetUser(uid string) (user *pb.DBUser, err error) { this.module.Errorln(err) } else { if err = model.Get(uid, user); err != nil { - this.module.Errorf("err:%v", err) + this.module.Errorf("uid:%s err:%v", uid, err) } } } else { if err = this.Get(uid, user); err != nil { - this.module.Errorf("err:%v", err) + this.module.Errorf("uid:%s err:%v", uid, err) } } return