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

上传任务推送修复

Browse Source
This commit is contained in:
liwei 2023-08-11 18:49:01 +08:00
parent ec846fa3e4
commit 21a1d815d3
7 changed files with 112 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bin/json/game_activityshow.json Normal file
View File

@ -0,0 +1,34 @@
[
{
"key": 1001,
"show": {
"a": "item",
"t": "23000001",
"n": 0
}
},
{
"key": 1003,
"show": {
"a": "item",
"t": "23000002",
"n": 0
}
},
{
"key": 1004,
"show": {
"a": "item",
"t": "23000003",
"n": 0
}
},
{
"key": 1005,
"show": {
"a": "item",
"t": "23000004",
"n": 0
}
}
]

38
bin/json/game_buriedcondi.json
View File

@ -177,7 +177,9 @@
"id": 107, "id": 107,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_7", "key": "buried_buried_condi_tasktxt_7",
@ -204,7 +206,9 @@
"id": 108, "id": 108,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_8", "key": "buried_buried_condi_tasktxt_8",
@ -231,7 +235,9 @@
"id": 109, "id": 109,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_9", "key": "buried_buried_condi_tasktxt_9",
@ -258,7 +264,9 @@
"id": 110, "id": 110,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_10", "key": "buried_buried_condi_tasktxt_10",
@ -285,7 +293,9 @@
"id": 111, "id": 111,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_11", "key": "buried_buried_condi_tasktxt_11",
@ -312,7 +322,9 @@
"id": 112, "id": 112,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_12", "key": "buried_buried_condi_tasktxt_12",
@ -339,7 +351,9 @@
"id": 113, "id": 113,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_13", "key": "buried_buried_condi_tasktxt_13",
@ -366,7 +380,9 @@
"id": 114, "id": 114,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_14", "key": "buried_buried_condi_tasktxt_14",
@ -393,7 +409,9 @@
"id": 115, "id": 115,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"smithy"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_15", "key": "buried_buried_condi_tasktxt_15",
@ -20837,7 +20855,7 @@
"NPC": -102, "NPC": -102,
"value": 5, "value": 5,
"filter": [ "filter": [
44004 24004
], ],
"filter2": [ "filter2": [
"守护者ID", "守护者ID",

56
bin/json/game_hero.json
View File

@ -5331,7 +5331,7 @@
"hid": "51002", "hid": "51002",
"name": { "name": {
"key": "hero_main_name_51002", "key": "hero_main_name_51002",
"text": "埃雷特手下1号" "text": "大胡子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -5405,7 +5405,7 @@
"hid": "51003", "hid": "51003",
"name": { "name": {
"key": "hero_main_name_51003", "key": "hero_main_name_51003",
"text": "埃雷特手下2号" "text": "蓝帽子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -5627,7 +5627,7 @@
"hid": "51006", "hid": "51006",
"name": { "name": {
"key": "hero_main_name_51006", "key": "hero_main_name_51006",
"text": "羊群" "text": "羊"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -5849,7 +5849,7 @@
"hid": "51010", "hid": "51010",
"name": { "name": {
"key": "hero_main_name_51010", "key": "hero_main_name_51010",
"text": "警卫1号" "text": "瘦高的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -5923,7 +5923,7 @@
"hid": "51011", "hid": "51011",
"name": { "name": {
"key": "hero_main_name_51011", "key": "hero_main_name_51011",
"text": "警卫2号" "text": "强壮的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -10439,7 +10439,7 @@
"hid": "51050", "hid": "51050",
"name": { "name": {
"key": "hero_main_name_51050", "key": "hero_main_name_51050",
"text": "小蜘蛛A" "text": "恐惧小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -10587,7 +10587,7 @@
"hid": "51052", "hid": "51052",
"name": { "name": {
"key": "hero_main_name_51052", "key": "hero_main_name_51052",
"text": "小蜘蛛B" "text": "恐怖小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -10883,7 +10883,7 @@
"hid": "51100", "hid": "51100",
"name": { "name": {
"key": "hero_main_name_51100", "key": "hero_main_name_51100",
"text": "埃雷特手下1号" "text": "大胡子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -10957,7 +10957,7 @@
"hid": "51101", "hid": "51101",
"name": { "name": {
"key": "hero_main_name_51101", "key": "hero_main_name_51101",
"text": "埃雷特手下2号" "text": "蓝帽子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -11179,7 +11179,7 @@
"hid": "51104", "hid": "51104",
"name": { "name": {
"key": "hero_main_name_51104", "key": "hero_main_name_51104",
"text": "羊群" "text": "羊"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -11253,7 +11253,7 @@
"hid": "51105", "hid": "51105",
"name": { "name": {
"key": "hero_main_name_51105", "key": "hero_main_name_51105",
"text": "警卫1号" "text": "瘦高的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -11327,7 +11327,7 @@
"hid": "51106", "hid": "51106",
"name": { "name": {
"key": "hero_main_name_51106", "key": "hero_main_name_51106",
"text": "警卫2号" "text": "强壮的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -11697,7 +11697,7 @@
"hid": "51111", "hid": "51111",
"name": { "name": {
"key": "hero_main_name_51111", "key": "hero_main_name_51111",
"text": "小蜘蛛A" "text": "恐惧小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -11845,7 +11845,7 @@
"hid": "51113", "hid": "51113",
"name": { "name": {
"key": "hero_main_name_51113", "key": "hero_main_name_51113",
"text": "小蜘蛛B" "text": "恐怖小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -11993,7 +11993,7 @@
"hid": "51300", "hid": "51300",
"name": { "name": {
"key": "hero_main_name_51300", "key": "hero_main_name_51300",
"text": "埃雷特手下1号" "text": "大胡子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -12067,7 +12067,7 @@
"hid": "51301", "hid": "51301",
"name": { "name": {
"key": "hero_main_name_51301", "key": "hero_main_name_51301",
"text": "埃雷特手下2号" "text": "蓝帽子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -12289,7 +12289,7 @@
"hid": "51304", "hid": "51304",
"name": { "name": {
"key": "hero_main_name_51304", "key": "hero_main_name_51304",
"text": "羊群" "text": "羊"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -12363,7 +12363,7 @@
"hid": "51305", "hid": "51305",
"name": { "name": {
"key": "hero_main_name_51305", "key": "hero_main_name_51305",
"text": "警卫1号" "text": "瘦高的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -12437,7 +12437,7 @@
"hid": "51306", "hid": "51306",
"name": { "name": {
"key": "hero_main_name_51306", "key": "hero_main_name_51306",
"text": "警卫2号" "text": "强壮的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -12807,7 +12807,7 @@
"hid": "51311", "hid": "51311",
"name": { "name": {
"key": "hero_main_name_51311", "key": "hero_main_name_51311",
"text": "小蜘蛛A" "text": "恐惧小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -12955,7 +12955,7 @@
"hid": "51313", "hid": "51313",
"name": { "name": {
"key": "hero_main_name_51313", "key": "hero_main_name_51313",
"text": "小蜘蛛B" "text": "恐怖小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -13103,7 +13103,7 @@
"hid": "51500", "hid": "51500",
"name": { "name": {
"key": "hero_main_name_51500", "key": "hero_main_name_51500",
"text": "埃雷特手下1号" "text": "大胡子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -13177,7 +13177,7 @@
"hid": "51501", "hid": "51501",
"name": { "name": {
"key": "hero_main_name_51501", "key": "hero_main_name_51501",
"text": "埃雷特手下2号" "text": "蓝帽子村民"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -13399,7 +13399,7 @@
"hid": "51504", "hid": "51504",
"name": { "name": {
"key": "hero_main_name_51504", "key": "hero_main_name_51504",
"text": "羊群" "text": "羊"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -13473,7 +13473,7 @@
"hid": "51505", "hid": "51505",
"name": { "name": {
"key": "hero_main_name_51505", "key": "hero_main_name_51505",
"text": "警卫1号" "text": "瘦高的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -13547,7 +13547,7 @@
"hid": "51506", "hid": "51506",
"name": { "name": {
"key": "hero_main_name_51506", "key": "hero_main_name_51506",
"text": "警卫2号" "text": "强壮的警卫"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -13917,7 +13917,7 @@
"hid": "51511", "hid": "51511",
"name": { "name": {
"key": "hero_main_name_51511", "key": "hero_main_name_51511",
"text": "小蜘蛛A" "text": "恐惧小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,
@ -14065,7 +14065,7 @@
"hid": "51513", "hid": "51513",
"name": { "name": {
"key": "hero_main_name_51513", "key": "hero_main_name_51513",
"text": "小蜘蛛B" "text": "恐怖小蜘蛛"
}, },
"star": 3, "star": 3,
"color": 2, "color": 2,

6
bin/json/game_mainstage.json
View File

@ -7013,8 +7013,10 @@
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
"venturemodel": "", "venturemodel": "",
"venturetype": 0, "venturetype": 1,
"ventureavatar": [], "ventureavatar": [
"Person/14002/14002_q.prefab"
],
"herocolor": 0, "herocolor": 0,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {

4
bin/json/game_opencond.json
View File

@ -2040,10 +2040,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100808
} }
], ],
"wkqbx": 2, "wkqbx": 2,

22
bin/json/game_stonetalent.json
View File

@ -2,7 +2,7 @@
{ {
"Id": 1, "Id": 1,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "js_icon_sx9", "NodeIcon": "mj_icon_attack",
"listIndex": 1, "listIndex": 1,
"Front": [], "Front": [],
"CostItem": [ "CostItem": [
@ -31,7 +31,7 @@
{ {
"Id": 2, "Id": 2,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon01", "NodeIcon": "mj_icon_life",
"listIndex": 1, "listIndex": 1,
"Front": [ "Front": [
1 1
@ -58,7 +58,7 @@
{ {
"Id": 3, "Id": 3,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon03", "NodeIcon": "mj_icon_life",
"listIndex": 1, "listIndex": 1,
"Front": [ "Front": [
1 1
@ -140,7 +140,7 @@
{ {
"Id": 6, "Id": 6,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon01", "NodeIcon": "Lifemj_icon_life",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
5 5
@ -167,7 +167,7 @@
{ {
"Id": 7, "Id": 7,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon03", "NodeIcon": "Lifemj_icon_life",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
5 5
@ -194,7 +194,7 @@
{ {
"Id": 8, "Id": 8,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "Life", "NodeIcon": "Lifemj_icon_life",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
6, 6,
@ -222,7 +222,7 @@
{ {
"Id": 9, "Id": 9,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon05", "NodeIcon": "Lifemj_icon_life",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
8 8
@ -249,7 +249,7 @@
{ {
"Id": 10, "Id": 10,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon05", "NodeIcon": "Lifemj_icon_life",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
8 8
@ -276,7 +276,7 @@
{ {
"Id": 11, "Id": 11,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon05", "NodeIcon": "Lifemj_icon_life",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
9 9
@ -303,7 +303,7 @@
{ {
"Id": 12, "Id": 12,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "js_jx_img_icon05", "NodeIcon": "Lifemj_icon_life",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
10 10
@ -330,7 +330,7 @@
{ {
"Id": 13, "Id": 13,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "js_icon_sx7", "NodeIcon": "Lifemj_icon_life",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
11, 11,

11
modules/buried/module.go
View File

@ -567,6 +567,11 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
} }
notify[mname] = append(notify[mname], cp) notify[mname] = append(notify[mname], cp)
} }
} else {
if _, ok = notify[string(comm.ModuleWtask)]; !ok {
notify[string(comm.ModuleWtask)] = make([]*pb.ConIProgress, 0)
}
notify[string(comm.ModuleWtask)] = append(notify[string(comm.ModuleWtask)], cp)
} }
} }
@ -593,11 +598,9 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
//异步通知指定模块 //异步通知指定模块
nmodule.BuriedsNotify(session, v) nmodule.BuriedsNotify(session, v)
} }
} else {
this.wtask.BuriedsNotify(session, changes)
this.smithy.BuriedsNotify(session, changes)
// this.sociaty.BuriedsNotify(session, changes)
} }
// this.wtask.BuriedsNotify(session, changes)
// this.smithy.BuriedsNotify(session, changes)
} }
// 更新并校验完成 // 更新并校验完成