diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index b9c6f0e69..77e539471 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -911,7 +911,7 @@ { "id": 301, "type": 61, - "data1": 101, + "data1": 1100101, "data2": 0, "data3": 0, "data4": 0, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 98ec30167..74ee41ea6 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -448,15 +448,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_01", "text": "这是哪里" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "这是哪里" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -488,15 +488,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_02", "text": "和这个少年谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和这个少年谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -528,15 +528,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_03", "text": "触摸花朵" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "触摸花朵" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -568,15 +568,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_04", "text": "触摸花朵" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "触摸花朵" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -608,15 +608,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_05", "text": "和杰克谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和杰克谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -648,15 +648,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_06", "text": "这个小家伙是?" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "这个小家伙是?" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -688,15 +688,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_07", "text": "和邦尼兔谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和邦尼兔谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -734,15 +734,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_08", "text": "和波比谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和波比谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -774,15 +774,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_09", "text": "和波比谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和波比谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -814,15 +814,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_10", "text": "和豺狼人谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和豺狼人谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -860,15 +860,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_11", "text": "和豺狼人谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和豺狼人谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -900,15 +900,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_12", "text": "走入黑洞" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "走入黑洞" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -918,14 +918,14 @@ ], "receivenpc": [ "bossfight_pt_02", - "新手引导-圣树下的黑洞", + "新手引导-波比-犀牛守卫", "901" ], "getafter_event": [ - 5, - 10008 + 4, + 166 ], - "completetask": 198, + "completetask": 301, "auto_accept": 0, "overtips": 1, "reword": [ @@ -946,15 +946,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_13", "text": "和犀牛守卫谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和犀牛守卫谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -986,15 +986,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_14", "text": "和波比谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和波比谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1026,15 +1026,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_15", "text": "和波比谈谈" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和波比谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1066,15 +1066,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "task_name_16", "text": "敬请期待后续剧情" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "和杰克谈谈" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1106,15 +1106,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1146,15 +1146,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1186,15 +1186,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1232,15 +1232,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1272,15 +1272,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1312,15 +1312,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1337,7 +1337,7 @@ 2, 429 ], - "completetask": 301, + "completetask": 0, "auto_accept": 0, "overtips": 1, "reword": [], @@ -1352,15 +1352,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1392,15 +1392,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ @@ -1432,15 +1432,15 @@ "des": 2, "icon": "", "task_Tname": { - "key": "story_npc_task", + "key": "story_80", "text": "初来乍到" }, "task_name": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "task_display": { - "key": "story_npc_task", + "key": "story_80", "text": "新手引导" }, "npc": [ diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 65a14c63e..e25aec7da 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -359,11 +359,11 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T return } - // this.Debug("任务事件触发", - // log.Field{Key: "uid", Value: uid}, - // log.Field{Key: "taskType", Value: rtaskType}, - // log.Field{Key: "params", Value: params}, - // ) + this.Debug("任务事件触发", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "taskType", Value: rtaskType}, + log.Field{Key: "params", Value: params}, + ) var ( condis []*rtaskCondi )