liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

同步代码

Browse Source
This commit is contained in:
liwei 2023-03-11 18:12:49 +08:00
parent 1f371a9b44
commit 090dbe1521
3 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_rdtaskcondi.json
View File

@ -911,7 +911,7 @@
{ {
"id": 301, "id": 301,
"type": 61, "type": 61,
"data1": 101, "data1": 1100101,
"data2": 0, "data2": 0,
"data3": 0, "data3": 0,
"data4": 0, "data4": 0,

160
bin/json/game_worldtask.json
View File

@ -448,15 +448,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_01",
"text": "这是哪里" "text": "这是哪里"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "这是哪里" "text": "这是哪里"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -488,15 +488,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_02",
"text": "和这个少年谈谈" "text": "和这个少年谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和这个少年谈谈" "text": "和这个少年谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -528,15 +528,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_03",
"text": "触摸花朵" "text": "触摸花朵"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "触摸花朵" "text": "触摸花朵"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -568,15 +568,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_04",
"text": "触摸花朵" "text": "触摸花朵"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "触摸花朵" "text": "触摸花朵"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -608,15 +608,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_05",
"text": "和杰克谈谈" "text": "和杰克谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和杰克谈谈" "text": "和杰克谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -648,15 +648,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_06",
"text": "这个小家伙是？" "text": "这个小家伙是？"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "这个小家伙是？" "text": "这个小家伙是？"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -688,15 +688,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_07",
"text": "和邦尼兔谈谈" "text": "和邦尼兔谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和邦尼兔谈谈" "text": "和邦尼兔谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -734,15 +734,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_08",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -774,15 +774,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_09",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -814,15 +814,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_10",
"text": "和豺狼人谈谈" "text": "和豺狼人谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和豺狼人谈谈" "text": "和豺狼人谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -860,15 +860,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_11",
"text": "和豺狼人谈谈" "text": "和豺狼人谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和豺狼人谈谈" "text": "和豺狼人谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -900,15 +900,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_12",
"text": "走入黑洞" "text": "走入黑洞"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "走入黑洞" "text": "走入黑洞"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -918,14 +918,14 @@
], ],
"receivenpc": [ "receivenpc": [
"bossfight_pt_02", "bossfight_pt_02",
"新手引导-圣树下的黑洞", "新手引导-波比-犀牛守卫",
"901" "901"
], ],
"getafter_event": [ "getafter_event": [
5, 4,
10008 166
], ],
"completetask": 198, "completetask": 301,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 1,
"reword": [ "reword": [
@ -946,15 +946,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_13",
"text": "和犀牛守卫谈谈" "text": "和犀牛守卫谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和犀牛守卫谈谈" "text": "和犀牛守卫谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -986,15 +986,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_14",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1026,15 +1026,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_15",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和波比谈谈" "text": "和波比谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1066,15 +1066,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "task_name_16",
"text": "敬请期待后续剧情" "text": "敬请期待后续剧情"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "和杰克谈谈" "text": "和杰克谈谈"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1106,15 +1106,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1146,15 +1146,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1186,15 +1186,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1232,15 +1232,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1272,15 +1272,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1312,15 +1312,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1337,7 +1337,7 @@
2, 2,
429 429
], ],
"completetask": 301, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 1,
"reword": [], "reword": [],
@ -1352,15 +1352,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1392,15 +1392,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [
@ -1432,15 +1432,15 @@
"des": 2, "des": 2,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "story_npc_task", "key": "story_80",
"text": "初来乍到" "text": "初来乍到"
}, },
"task_name": { "task_name": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"task_display": { "task_display": {
"key": "story_npc_task", "key": "story_80",
"text": "新手引导" "text": "新手引导"
}, },
"npc": [ "npc": [

10
modules/rtask/module.go
View File

@ -359,11 +359,11 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
return return
} }
// this.Debug("任务事件触发", this.Debug("任务事件触发",
// log.Field{Key: "uid", Value: uid}, log.Field{Key: "uid", Value: uid},
// log.Field{Key: "taskType", Value: rtaskType}, log.Field{Key: "taskType", Value: rtaskType},
// log.Field{Key: "params", Value: params}, log.Field{Key: "params", Value: params},
// ) )
var ( var (
condis []*rtaskCondi condis []*rtaskCondi
) )