diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 96b79ac8a..45d93c522 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -177,8 +177,7 @@ "levelname": "Save the holy tree", "passformatList": [], "passdroplist": [ - 10301, - 10302 + 10301 ], "award": [ { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 15afe4784..c78b560dd 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -24,6 +24,11 @@ "旧时光1-指挥部杰克", "150" ], + "receivenpc": [ + "scenes_boundary_01", + "旧时光1-指挥部杰克", + "150" + ], "getafter_event": [ 2, 300001 @@ -58,6 +63,11 @@ "旧时光1-住所主角", "715" ], + "receivenpc": [ + "display_platform_04_02", + "旧时光1-住所主角", + "715" + ], "getafter_event": [ 2, 300003 @@ -92,6 +102,11 @@ "旧时光1-住所平先生", "715" ], + "receivenpc": [ + "display_platform_04_02", + "旧时光1-住所平先生", + "715" + ], "getafter_event": [ 2, 300004 @@ -126,6 +141,11 @@ "旧时光1-住所平先生", "715" ], + "receivenpc": [ + "display_platform_04_02", + "旧时光1-住所平先生", + "715" + ], "getafter_event": [ 2, 300005 @@ -160,6 +180,11 @@ "旧时光1-指挥部阿宝", "150" ], + "receivenpc": [ + "scenes_boundary_01_recordtask", + "旧时光1-指挥部阿宝", + "150" + ], "getafter_event": [ 2, 300008 @@ -194,6 +219,11 @@ "旧时光1-指挥部杰克", "150" ], + "receivenpc": [ + "scenes_boundary_01_recordtask", + "旧时光1-指挥部杰克", + "150" + ], "getafter_event": [ 2, 300011 @@ -228,6 +258,11 @@ "旧时光1-森林小道阿宝", "717" ], + "receivenpc": [ + "dreamwork_jungle_playershow_01", + "旧时光1-森林小道阿宝", + "717" + ], "getafter_event": [ 2, 300012 @@ -262,6 +297,11 @@ "旧时光1-森林小道 阿宝", "717" ], + "receivenpc": [ + "dreamwork_jungle_playershow_01", + "旧时光1-森林小道 阿宝", + "717" + ], "getafter_event": [ 2, 300013 @@ -296,6 +336,11 @@ "旧时光1-竹林豺狼小怪", "716" ], + "receivenpc": [ + "scenesfight_03_02", + "旧时光1-竹林豺狼小怪", + "716" + ], "getafter_event": [ 2, 300014 @@ -330,6 +375,11 @@ "旧时光1-竹林阿宝", "716" ], + "receivenpc": [ + "scenesfight_03_02", + "旧时光1-竹林阿宝", + "716" + ], "getafter_event": [ 2, 300015 @@ -364,6 +414,11 @@ "旧时光1-指挥部杰克", "150" ], + "receivenpc": [ + "scenes_boundary_01_recordtask", + "旧时光1-指挥部杰克", + "150" + ], "getafter_event": [ 2, 300019 @@ -398,6 +453,11 @@ "0新手引导-杰克-中轴城常驻待机", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], "getafter_event": [ 2, 401 @@ -432,12 +492,17 @@ "0新手引导-杰克-中轴城常驻待机", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], "getafter_event": [ 2, 402 ], "completetask": 0, - "auto_accept": 1, + "auto_accept": 0, "overtips": 1, "reword": [] }, @@ -466,6 +531,11 @@ "1.新手引导-花朵-中轴城", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "1.新手引导-花朵-中轴城", + "901" + ], "getafter_event": [ 2, 403 @@ -500,6 +570,11 @@ "1.新手引导-花朵-中轴城", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "1.新手引导-花朵-中轴城", + "901" + ], "getafter_event": [ 2, 404 @@ -534,6 +609,11 @@ "0新手引导-杰克-中轴城常驻待机", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], "getafter_event": [ 2, 406 @@ -568,6 +648,11 @@ "3新手引导-波比-正常待机-中轴城", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "3新手引导-波比-正常待机-中轴城", + "901" + ], "getafter_event": [ 2, 407 @@ -602,6 +687,11 @@ "2新手引导-邦尼兔-正常待机-中轴城", "901" ], + "receivenpc": [ + "bossfight_pt_02", + "2新手引导-邦尼兔-正常待机-中轴城", + "901" + ], "getafter_event": [ 2, 408 @@ -640,7 +730,12 @@ "npc": [ "bossfight_pt_02", "新手引导-波比-右屏圣树1", - "153" + "901" + ], + "receivenpc": [ + "bossfight_pt_02", + "新手引导-波比-右屏圣树1", + "901" ], "getafter_event": [ 2, @@ -676,6 +771,11 @@ "新手引导-波比-右屏圣树2", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-波比-右屏圣树2", + "718" + ], "getafter_event": [ 2, 411 @@ -710,6 +810,11 @@ "新手引导-豺狼人-右屏圣树", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-豺狼人-右屏圣树", + "718" + ], "getafter_event": [ 2, 412 @@ -750,6 +855,11 @@ "新手引导-豺狼人-右屏圣树", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-豺狼人-右屏圣树", + "718" + ], "getafter_event": [ 2, 413 @@ -784,6 +894,11 @@ "新手引导-圣树下的黑洞", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-圣树下的黑洞", + "718" + ], "getafter_event": [ 5, 10008 @@ -818,6 +933,11 @@ "新手引导-波比-犀牛守卫", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-波比-犀牛守卫", + "718" + ], "getafter_event": [ 2, 416 @@ -852,6 +972,11 @@ "新手引导-波比-右屏圣树3", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-波比-右屏圣树3", + "718" + ], "getafter_event": [ 9, 0 @@ -886,6 +1011,11 @@ "新手引导-波比-右屏圣树3", "718" ], + "receivenpc": [ + "scenes_kongfupanda_01", + "新手引导-波比-右屏圣树3", + "718" + ], "getafter_event": [ 2, 420 @@ -899,7 +1029,7 @@ "key": 20150, "lock": 1, "ontxe": 20140, - "id_after": 20160, + "id_after": 0, "group": 2, "des": 2, "icon": "", @@ -916,6 +1046,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -932,7 +1067,7 @@ { "key": 20160, "lock": 1, - "ontxe": 20150, + "ontxe": 20151, "id_after": 20170, "group": 2, "des": 2, @@ -950,6 +1085,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -984,6 +1124,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -1018,6 +1163,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -1062,6 +1212,11 @@ "暴夫纳特铁匠铺", "139" ], + "receivenpc": [ + "scenes_smithy_01", + "暴夫纳特铁匠铺", + "139" + ], "getafter_event": [ 2, 427 @@ -1096,6 +1251,11 @@ "暴夫纳特铁匠铺", "139" ], + "receivenpc": [ + "scenes_smithy_01", + "暴夫纳特铁匠铺", + "139" + ], "getafter_event": [ 2, 428 @@ -1126,6 +1286,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -1160,6 +1325,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -1194,6 +1364,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" @@ -1228,6 +1403,11 @@ "text": "新手引导" }, "npc": [ + "scenes_boundary_01_recordtask", + "0新手引导-杰克-中轴城常驻待机", + "901" + ], + "receivenpc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", "150" diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 82ee4ef1a..f03174de3 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -22,6 +22,7 @@ type GameWorldTaskData struct { TaskName string TaskDisplay string Npc []string + Receivenpc []string GetafterEvent []int32 Completetask int32 AutoAccept int32 @@ -60,6 +61,20 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["receivenpc"].([]interface{}); !_ok_ { err = errors.New("receivenpc error"); return } + + _v.Receivenpc = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Receivenpc = append(_v.Receivenpc, _list_v_) + } + } + { var _arr_ []interface{} var _ok_ bool