From 07865f3eb950c1327f4137254d7b5bd15f33e1dd Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 3 Nov 2023 21:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_achievetask.json | 6 +- bin/json/game_buriedcondi.json | 24 +-- bin/json/game_mainshopitem.json | 72 ++++---- bin/json/game_navigation.json | 14 +- bin/json/game_rdtasknpc.json | 292 +++++++++++++++---------------- bin/json/game_skillafteratk.json | 22 +-- bin/json/game_skillatk.json | 21 ++- bin/json/game_worldtask.json | 36 ++-- 8 files changed, 245 insertions(+), 242 deletions(-) diff --git a/bin/json/game_achievetask.json b/bin/json/game_achievetask.json index b900a5f8b..33823ade9 100644 --- a/bin/json/game_achievetask.json +++ b/bin/json/game_achievetask.json @@ -142,7 +142,7 @@ "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_25", - "text": "完成1次自动战斗" + "text": "自动战斗火焰泰坦难度1" }, "task_desc": { "key": "", @@ -165,7 +165,7 @@ "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_26", - "text": "完成10次自动战斗" + "text": "自动战斗冰霜泰坦难度1" }, "task_desc": { "key": "", @@ -188,7 +188,7 @@ "task_group_from": 3, "task_name": { "key": "achieve_achieve_task_task_name_27", - "text": "完成20次自动战斗" + "text": "自动战斗森林泰坦难度1" }, "task_desc": { "key": "", diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 3ed3be4a9..15ec216ef 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -26482,7 +26482,7 @@ "key": "buried_buried_condi_tasktxt_899", "text": "应对师傅的训练" }, - "type": 227, + "type": 70, "valid": 0, "head": { "a": "attr", @@ -32140,9 +32140,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1104", - "text": "完成1次自动战斗" + "text": "自动战斗火焰泰坦难度1" }, - "type": 161, + "type": 75, "valid": 0, "head": { "a": "attr", @@ -32150,7 +32150,7 @@ "n": 1 }, "Npc_event_type": 1, - "NPC": 103, + "NPC": 10001001, "value": 1, "filter": [], "filter2": [] @@ -32165,9 +32165,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1105", - "text": "完成10次自动战斗" + "text": "自动战斗冰霜泰坦难度1" }, - "type": 161, + "type": 75, "valid": 0, "head": { "a": "attr", @@ -32175,8 +32175,8 @@ "n": 1 }, "Npc_event_type": 1, - "NPC": 103, - "value": 10, + "NPC": 10002001, + "value": 1, "filter": [], "filter2": [] }, @@ -32190,9 +32190,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1106", - "text": "完成20次自动战斗" + "text": "自动战斗森林泰坦难度1" }, - "type": 161, + "type": 75, "valid": 0, "head": { "a": "attr", @@ -32200,8 +32200,8 @@ "n": 1 }, "Npc_event_type": 1, - "NPC": 103, - "value": 20, + "NPC": 10003001, + "value": 1, "filter": [], "filter2": [] }, diff --git a/bin/json/game_mainshopitem.json b/bin/json/game_mainshopitem.json index 7165021f7..a73fe94e1 100644 --- a/bin/json/game_mainshopitem.json +++ b/bin/json/game_mainshopitem.json @@ -192,7 +192,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 25 } ], @@ -212,7 +212,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 25 } ], @@ -232,7 +232,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 25 } ], @@ -252,7 +252,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 25 } ], @@ -272,7 +272,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 15 } ], @@ -292,7 +292,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 50 } ], @@ -312,7 +312,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 50 } ], @@ -332,7 +332,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 100 } ], @@ -352,7 +352,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 40 } ], @@ -372,7 +372,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 40 } ], @@ -392,7 +392,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 40 } ], @@ -412,7 +412,7 @@ "need": [ { "a": "item", - "t": "24011002", + "t": "24012001", "n": 40 } ], @@ -432,7 +432,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 25 } ], @@ -452,7 +452,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 25 } ], @@ -472,7 +472,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 25 } ], @@ -492,7 +492,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 25 } ], @@ -512,7 +512,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 15 } ], @@ -532,7 +532,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 50 } ], @@ -552,7 +552,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 50 } ], @@ -572,7 +572,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 100 } ], @@ -592,7 +592,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 70 } ], @@ -612,7 +612,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 70 } ], @@ -632,7 +632,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 70 } ], @@ -652,7 +652,7 @@ "need": [ { "a": "item", - "t": "24011003", + "t": "24013001", "n": 70 } ], @@ -672,7 +672,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 25 } ], @@ -692,7 +692,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 25 } ], @@ -712,7 +712,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 25 } ], @@ -732,7 +732,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 25 } ], @@ -752,7 +752,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 15 } ], @@ -772,7 +772,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 50 } ], @@ -792,7 +792,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 50 } ], @@ -812,7 +812,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 100 } ], @@ -832,7 +832,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 90 } ], @@ -852,7 +852,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 90 } ], @@ -872,7 +872,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 90 } ], @@ -892,7 +892,7 @@ "need": [ { "a": "item", - "t": "24011004", + "t": "24014001", "n": 90 } ], diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index 92668f3df..114281d12 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -138,7 +138,7 @@ "text": "冒险之旅" }, "npcName": [ - "20010_骇客蛛_1" + "功能入口_主线" ], "functionicon": "icon_sytj", "jumpId": 166 @@ -163,7 +163,7 @@ }, { "Id": 10, - "scene": "WuGuanScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_10", "text": "熊猫武馆" @@ -181,7 +181,7 @@ }, { "Id": 11, - "scene": "WuGuanScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_11", "text": "熊猫武馆" @@ -217,7 +217,7 @@ }, { "Id": 13, - "scene": "WuGuanScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_13", "text": "熊猫武馆" @@ -235,7 +235,7 @@ }, { "Id": 14, - "scene": "SmithyScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_14", "text": "铁匠铺" @@ -253,7 +253,7 @@ }, { "Id": 15, - "scene": "SmithyScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_15", "text": "铁匠铺" @@ -271,7 +271,7 @@ }, { "Id": 16, - "scene": "SmithyScene", + "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_16", "text": "铁匠铺" diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 44abb2ce4..bb2fbfe68 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -214,9 +214,9 @@ "heroid": 35001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 10, @@ -229,9 +229,9 @@ "heroid": 35001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 10, @@ -244,9 +244,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "阿宝", - "137" + "901" ], "event": [ 10, @@ -259,9 +259,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "阿宝", - "137" + "901" ], "event": [ 10, @@ -274,9 +274,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "阿宝", - "137" + "901" ], "event": [ 10, @@ -289,9 +289,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 10, @@ -1568,9 +1568,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -1611,9 +1611,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -1626,9 +1626,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 10, @@ -1641,9 +1641,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -1656,9 +1656,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -1697,9 +1697,9 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -1725,7 +1725,7 @@ "heroid": 43007, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", "901" ], @@ -1968,9 +1968,9 @@ "heroid": 35001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -1983,9 +1983,9 @@ "heroid": 35001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -1998,9 +1998,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -2041,9 +2041,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -2056,9 +2056,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 10, @@ -2271,9 +2271,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -2505,9 +2505,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -2548,9 +2548,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -2819,9 +2819,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3038,9 +3038,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3079,9 +3079,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3107,9 +3107,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 0 @@ -3297,9 +3297,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -3338,9 +3338,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -3353,7 +3353,7 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", "901" ], @@ -3368,9 +3368,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -3473,9 +3473,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3503,9 +3503,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3604,9 +3604,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3866,9 +3866,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3894,9 +3894,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -3909,9 +3909,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -3952,9 +3952,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -3967,9 +3967,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 10, @@ -3982,9 +3982,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -4132,9 +4132,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -4435,9 +4435,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -4463,9 +4463,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -4654,9 +4654,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -4684,9 +4684,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -4699,9 +4699,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -4714,9 +4714,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 10, @@ -4729,9 +4729,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -4834,9 +4834,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -4862,9 +4862,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -5057,9 +5057,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -5085,9 +5085,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -6775,9 +6775,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -6798,9 +6798,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -6813,9 +6813,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -6828,9 +6828,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 10, @@ -6843,9 +6843,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -6858,9 +6858,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -6881,9 +6881,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [], "goto": 0 @@ -6893,9 +6893,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -6916,9 +6916,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -7103,9 +7103,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -7177,9 +7177,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -7207,9 +7207,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -7222,9 +7222,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -7248,9 +7248,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -7600,9 +7600,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -7637,9 +7637,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "阿宝", - "137" + "901" ], "event": [ 2, @@ -7652,9 +7652,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -7667,9 +7667,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, @@ -8555,9 +8555,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -8578,9 +8578,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -9000,9 +9000,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", + "GameMain", "打造", - "139" + "901" ], "event": [ 2, @@ -9201,9 +9201,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "阿宝", - "137" + "901" ], "event": [ 2, @@ -9270,9 +9270,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "阿宝", - "137" + "901" ], "event": [ 2, @@ -9316,9 +9316,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "WuGuanScene", + "GameMain", "总教习", - "137" + "901" ], "event": [ 2, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 34822c3bf..c96392901 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -29601,7 +29601,7 @@ { "Id": 214002213, "EmitPR": 1000, - "From": 1, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -29651,12 +29651,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 5, + "ExecuteCnt": 4, "Type": 1, "Argu": [ 1, 4, - 800, + 1000, 1, 18, 30 @@ -29705,12 +29705,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 5, + "ExecuteCnt": 4, "Type": 1, "Argu": [ 1, 4, - 900, + 1000, 1, 18, 30 @@ -29735,12 +29735,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 5, + "ExecuteCnt": 4, "Type": 1, "Argu": [ 1, 4, - 1000, + 1100, 1, 18, 30 @@ -29765,12 +29765,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 5, + "ExecuteCnt": 4, "Type": 1, "Argu": [ 1, 4, - 1100, + 1200, 1, 18, 30 @@ -29795,12 +29795,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 5, + "ExecuteCnt": 4, "Type": 1, "Argu": [ 1, 4, - 1200, + 1300, 1, 18, 150 diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 11693a3b0..eb61c82a2 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -19309,11 +19309,12 @@ "Target": 0, "ChildSkill": { "Id": [ - 213005311, - 213005312 + 213005311 ] }, - "passSkill": [], + "passSkill": [ + 213005312 + ], "Desc": { "key": "skill_skill_atk_Desc_113005311_1", "text": "为友方附加2回合[color=#37d8a9]攻击提升[/color];目标已有[color=#37d8a9]攻击提升[/color]时，减少目标所有技能1回合冷却。" @@ -19342,11 +19343,12 @@ "Target": 0, "ChildSkill": { "Id": [ - 213005321, - 213005322 + 213005311 ] }, - "passSkill": [], + "passSkill": [ + 213005312 + ], "Desc": { "key": "skill_skill_atk_Desc_113005311_2", "text": "技能冷却减少1回合。" @@ -19375,11 +19377,12 @@ "Target": 0, "ChildSkill": { "Id": [ - 213005331, - 213005332 + 213005311 ] }, - "passSkill": [], + "passSkill": [ + 213005312 + ], "Desc": { "key": "skill_skill_atk_Desc_113005311_3", "text": "技能冷却减少1回合。" diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 74c95bfd3..657299990 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -7231,15 +7231,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_153", - "text": "梅林的试炼" + "text": "乌龟大师的试炼" }, "task_details": { "key": "worldtask_world_task_task_details_152", - "text": "梅林的试炼" + "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。" }, "npctxt": { "key": "worldtask_world_task_npctxt_152", - "text": "梅林的试炼" + "text": "有人在找你" }, "get_item": [], "trigger": 0, @@ -7289,15 +7289,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_154", - "text": "梅林的试炼" + "text": "乌龟大师的试炼" }, "task_details": { "key": "worldtask_world_task_task_details_153", - "text": "梅林的试炼" + "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。" }, "npctxt": { "key": "worldtask_world_task_npctxt_153", - "text": "梅林的试炼" + "text": "有人在找你" }, "get_item": [], "trigger": 0, @@ -7347,15 +7347,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_155", - "text": "梅林的试炼" + "text": "乌龟大师的试炼" }, "task_details": { "key": "worldtask_world_task_task_details_154", - "text": "梅林的试炼" + "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。" }, "npctxt": { "key": "worldtask_world_task_npctxt_154", - "text": "梅林的试炼" + "text": "有人在找你" }, "get_item": [], "trigger": 0, @@ -7405,15 +7405,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_156", - "text": "梅林的试炼" + "text": "乌龟大师的试炼" }, "task_details": { "key": "worldtask_world_task_task_details_155", - "text": "梅林的试炼" + "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。" }, "npctxt": { "key": "worldtask_world_task_npctxt_155", - "text": "梅林的试炼" + "text": "有人在找你" }, "get_item": [], "trigger": 0, @@ -7463,15 +7463,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_157", - "text": "梅林的试炼" + "text": "乌龟大师的试炼" }, "task_details": { "key": "worldtask_world_task_task_details_156", - "text": "梅林的试炼" + "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。" }, "npctxt": { "key": "worldtask_world_task_npctxt_156", - "text": "梅林的试炼" + "text": "有人在找你" }, "get_item": [], "trigger": 0, @@ -7521,15 +7521,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_158", - "text": "梅林的试炼" + "text": "乌龟大师的试炼" }, "task_details": { "key": "worldtask_world_task_task_details_157", - "text": "梅林的试炼" + "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。" }, "npctxt": { "key": "worldtask_world_task_npctxt_157", - "text": "梅林的试炼" + "text": "有人在找你" }, "get_item": [], "trigger": 0,