From 2fa129fceb4f97876cad1e0eb8917ee6f487f9ad Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 27 Mar 2023 16:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_rdtaskcondi.json | 30 +- bin/json/game_skillafteratk.json | 14 +- bin/json/game_skillatk.json | 2 +- bin/json/game_skillpassive.json | 4 +- bin/json/game_worldtask.json | 717 +++----------------- sys/configure/structs/Game.WorldTaskData.go | 4 +- 6 files changed, 118 insertions(+), 653 deletions(-) diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 565b5a78f..7e7b4163d 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -157,15 +157,15 @@ }, { "id": 114, - "type_sp": 0, - "tasktxt": "", + "type_sp": 1, + "tasktxt": "招募一次守护者", "type": 14, "valid": 0, - "data1": 10, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, - "data5": 0 + "data5": 101 }, { "id": 115, @@ -721,7 +721,7 @@ }, { "id": 161, - "type_sp": 0, + "type_sp": 1, "tasktxt": "", "type": 61, "valid": 0, @@ -729,7 +729,7 @@ "data2": 0, "data3": 0, "data4": 0, - "data5": 0 + "data5": 102 }, { "id": 162, @@ -877,15 +877,15 @@ }, { "id": 174, - "type_sp": 0, - "tasktxt": "", + "type_sp": 1, + "tasktxt": "尝试挑战邦尼兔", "type": 70, "valid": 0, "data1": 1, "data2": 101, "data3": 0, "data4": 0, - "data5": 0 + "data5": 10050 }, { "id": 175, @@ -1211,6 +1211,18 @@ "data4": 0, "data5": 0 }, + { + "id": 203, + "type_sp": 1, + "tasktxt": "调查这些木桩", + "type": 149, + "valid": 1, + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, { "id": 301, "type_sp": 1, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index c5edacd69..95599fa38 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -23473,7 +23473,7 @@ { "Id": 224007213, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -23481,7 +23481,7 @@ "Type": 2, "Argu": [ 424007213, - 1, + -1, 1 ], "FollowSK": [], @@ -23496,7 +23496,7 @@ { "Id": 224007214, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -26582,7 +26582,7 @@ { "Id": 224006213, "EmitPR": 1000, - "From": 9, + "From": 1, "Where": [], "Order": "", "Limit": 1, @@ -26608,7 +26608,7 @@ { "Id": 224006214, "EmitPR": 1000, - "From": 9, + "From": 1, "Where": [ "Hpproless=500" ], @@ -26641,9 +26641,9 @@ "ExecuteCnt": 1, "Type": 8, "Argu": [ + 0, 1, -1, - 1000, 1000 ], "FollowSK": [ @@ -26668,7 +26668,7 @@ "Type": 5, "Argu": [ 2, - 1, + 2, 300 ], "FollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 8a409ae46..25270ceac 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -14270,7 +14270,7 @@ "act": "Skill_3", "Type": 1, "CD": 5, - "Target": 1, + "Target": 0, "ChildSkill": { "Id": [ 224006311 diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 9d0159248..dc3129736 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1894,9 +1894,9 @@ }, { "Id": 424007213, - "When": 3, + "When": 16, "FromCheck": "Target=3", - "TargetCheck": "", + "TargetCheck": "Hasbuff=SPDUP", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 8c4c030e3..0c462845c 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -3,121 +3,85 @@ "key": 20010, "lock": 1, "ontxe": 0, - "id_after": 20011, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 1, - "completetask": [ - 20001, - 20002 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [ - "practice" - ] - }, - { - "key": 20011, - "lock": 1, - "ontxe": 20010, - "id_after": 20012, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_02", - "text": "和这个少年谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 2, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 0, - "reword": [], - "module": [ - "practice" - ] - }, - { - "key": 20012, - "lock": 1, - "ontxe": 20011, "id_after": 20020, "group": 2, "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "key": "story_80", + "text": "1" }, "task_name": { - "key": "task_name_03", - "text": "触摸花朵" + "key": "story_80", + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 3, + "npc": "10010", "completetask": [ 0 ], - "deliver_npc": 1, + "deliver_npc": 0, "auto_accept": 1, "reword": [], - "module": [ - "practice" - ] + "module": [] }, { "key": 20020, "lock": 1, - "ontxe": 20012, + "ontxe": 20010, + "id_after": 20030, + "group": 2, + "des": 2, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "story_80", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": "10020", + "completetask": [ + 0 + ], + "deliver_npc": 0, + "auto_accept": 1, + "reword": [], + "module": [] + }, + { + "key": 20030, + "lock": 1, + "ontxe": 20020, "id_after": 20040, "group": 2, "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "key": "story_80", + "text": "1" }, "task_name": { - "key": "task_name_04", - "text": "触摸花朵" + "key": "story_80", + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 4, + "npc": "10030", "completetask": [ 0 ], - "deliver_npc": 1, + "deliver_npc": 0, "auto_accept": 1, "reword": [], "module": [] @@ -125,28 +89,28 @@ { "key": 20040, "lock": 1, - "ontxe": 20020, + "ontxe": 20030, "id_after": 20050, "group": 2, "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "key": "story_80", + "text": "1" }, "task_name": { - "key": "task_name_05", - "text": "和杰克谈谈" + "key": "story_80", + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 5, + "npc": "10040", "completetask": [ - 0 + 174 ], - "deliver_npc": 1, + "deliver_npc": 0, "auto_accept": 1, "reword": [], "module": [] @@ -160,22 +124,22 @@ "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "key": "story_80", + "text": "1" }, "task_name": { - "key": "task_name_06", - "text": "这个小家伙是?" + "key": "story_80", + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 6, + "npc": "10060", "completetask": [ 0 ], - "deliver_npc": 1, + "deliver_npc": 0, "auto_accept": 1, "reword": [], "module": [] @@ -189,23 +153,23 @@ "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "key": "story_80", + "text": "1" }, "task_name": { - "key": "task_name_07", - "text": "和邦尼兔谈谈" + "key": "story_80", + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 7, + "npc": "10070", "completetask": [ - 0 + 203 ], - "deliver_npc": 1, - "auto_accept": 1, + "deliver_npc": 10080, + "auto_accept": 0, "reword": [], "module": [] }, @@ -218,23 +182,23 @@ "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "key": "story_80", + "text": "1" }, "task_name": { - "key": "task_name_08", - "text": "和波比谈谈" + "key": "story_80", + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 8, + "npc": "10090", "completetask": [ - 0 + 114 ], - "deliver_npc": 1, - "auto_accept": 1, + "deliver_npc": 10100, + "auto_accept": 0, "reword": [], "module": [] }, @@ -242,538 +206,27 @@ "key": 20080, "lock": 1, "ontxe": 20070, - "id_after": 20090, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_09", - "text": "和波比谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 9, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20090, - "lock": 1, - "ontxe": 20080, - "id_after": 20100, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_10", - "text": "和豺狼人谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 10, - "completetask": [ - 174 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [ - { - "a": "hero", - "t": "34006", - "n": 1 - } - ], - "module": [] - }, - { - "key": 20100, - "lock": 1, - "ontxe": 20090, - "id_after": 20110, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_11", - "text": "和豺狼人谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 11, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20110, - "lock": 1, - "ontxe": 20100, - "id_after": 20120, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_12", - "text": "走入黑洞" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 12, - "completetask": [ - 198 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [ - { - "a": "item", - "t": "30001", - "n": 30 - } - ], - "module": [] - }, - { - "key": 20120, - "lock": 1, - "ontxe": 20110, - "id_after": 20130, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_13", - "text": "和犀牛守卫谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 13, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20130, - "lock": 1, - "ontxe": 20120, - "id_after": 20140, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_14", - "text": "和波比谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 14, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20140, - "lock": 1, - "ontxe": 20130, - "id_after": 20150, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_15", - "text": "和波比谈谈" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 15, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20150, - "lock": 1, - "ontxe": 20140, "id_after": 0, "group": 2, "des": 2, "icon": "", "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "task_name_16", - "text": "敬请期待后续剧情" - }, - "task_display": { "key": "story_80", - "text": "新手引导" - }, - "npc": 16, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20160, - "lock": 1, - "ontxe": 20151, - "id_after": 20170, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" + "text": "1" }, "task_name": { "key": "story_80", - "text": "初来乍到" + "text": "1" }, "task_display": { "key": "story_80", - "text": "新手引导" + "text": "1" }, - "npc": 17, + "npc": "10110", "completetask": [ - 0 + 161 ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20170, - "lock": 1, - "ontxe": 20160, - "id_after": 20180, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 18, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20180, - "lock": 1, - "ontxe": 20170, - "id_after": 20190, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 19, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [ - { - "a": "item", - "t": "120001", - "n": 3 - } - ], - "module": [] - }, - { - "key": 20190, - "lock": 1, - "ontxe": 20180, - "id_after": 20200, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 20, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20200, - "lock": 1, - "ontxe": 20190, - "id_after": 20210, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 21, - "completetask": [ - 0 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20210, - "lock": 1, - "ontxe": 20200, - "id_after": 20220, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 22, - "completetask": [ - 301 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20220, - "lock": 1, - "ontxe": 20210, - "id_after": 20230, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 23, - "completetask": [ - 302 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20230, - "lock": 1, - "ontxe": 20220, - "id_after": 20240, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 24, - "completetask": [ - 303 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 20240, - "lock": 1, - "ontxe": 20230, - "id_after": 0, - "group": 2, - "des": 2, - "icon": "", - "task_Tname": { - "key": "task_name_01", - "text": "这是哪里" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 25, - "completetask": [ - 114 - ], - "deliver_npc": 1, - "auto_accept": 1, - "reword": [], - "module": [] - }, - { - "key": 30001, - "lock": 1, - "ontxe": 20010, - "id_after": 0, - "group": 3, - "des": 3, - "icon": "", - "task_Tname": { - "key": "story_80", - "text": "初来乍到" - }, - "task_name": { - "key": "story_80", - "text": "初来乍到" - }, - "task_display": { - "key": "story_80", - "text": "新手引导" - }, - "npc": 29, - "completetask": [ - 20003 - ], - "deliver_npc": 1, + "deliver_npc": 0, "auto_accept": 0, "reword": [], "module": [] diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 7c1c9ba28..3942991de 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -21,7 +21,7 @@ type GameWorldTaskData struct { TaskTname string TaskName string TaskDisplay string - Npc int32 + Npc string Completetask []int32 DeliverNpc int32 AutoAccept int32 @@ -46,7 +46,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_Tname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["npc"].(float64); !_ok_ { err = errors.New("npc error"); return }; _v.Npc = int32(_tempNum_) } + { var _ok_ bool; if _v.Npc, _ok_ = _buf["npc"].(string); !_ok_ { err = errors.New("npc error"); return } } { var _arr_ []interface{} var _ok_ bool