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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei 2023-06-17 01:32:21 +08:00
commit a850b4af7a
7 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_dispatch_task.json
View File

@ -1832,7 +1832,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 179, "tasktime": 147,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_39", "key": "pandamas_pandamas_dispatch_tasktxt_39",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"

12
bin/json/game_navigation.json
View File

@ -120,10 +120,10 @@
"text": "羁绊" "text": "羁绊"
}, },
"npcName": [ "npcName": [
"打造" "功能入口-藏书馆"
], ],
"functionicon": "ty_qp_zm", "functionicon": "ty_qp_hgd",
"jumpId": 1001 "jumpId": 146
}, },
{ {
"Id": 8, "Id": 8,
@ -132,7 +132,7 @@
"key": "navigation_Sheet1_scenename_8", "key": "navigation_Sheet1_scenename_8",
"text": "指挥部" "text": "指挥部"
}, },
"sceneicon": "ty_qp_tjp", "sceneicon": "ty_qp_zhb",
"functionname": { "functionname": {
"key": "navigation_Sheet1_functionname_8", "key": "navigation_Sheet1_functionname_8",
"text": "主线关卡" "text": "主线关卡"
@ -150,13 +150,13 @@
"key": "navigation_Sheet1_scenename_9", "key": "navigation_Sheet1_scenename_9",
"text": "指挥部" "text": "指挥部"
}, },
"sceneicon": "ty_qp_tjp", "sceneicon": "ty_qp_zhb",
"functionname": { "functionname": {
"key": "navigation_Sheet1_functionname_9", "key": "navigation_Sheet1_functionname_9",
"text": "星座图" "text": "星座图"
}, },
"npcName": [ "npcName": [
"手册台" "功能入口_主角星座图"
], ],
"functionicon": "ty_qp_tf", "functionicon": "ty_qp_tf",
"jumpId": 171 "jumpId": 171

2
bin/json/game_rdtasknpc.json
View File

@ -1950,7 +1950,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"GameMain", "GameMain",
"希卡普", "20400_希卡普",
"901" "901"
], ],
"event": [ "event": [

32
bin/json/game_reddot.json
View File

@ -199,7 +199,7 @@
}, },
{ {
"id": 20401, "id": 20401,
"msg_type": 2, "msg_type": 1,
"show_type": 2, "show_type": 2,
"count_type": 1, "count_type": 1,
"group": "", "group": "",
@ -217,7 +217,7 @@
}, },
{ {
"id": 20601, "id": 20601,
"msg_type": 2, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -235,7 +235,7 @@
}, },
{ {
"id": 15101, "id": 15101,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "group": "sociaty",
@ -244,7 +244,7 @@
}, },
{ {
"id": 15102, "id": 15102,
"msg_type": 1, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "group": "sociaty",
@ -307,7 +307,7 @@
}, },
{ {
"id": 16101, "id": 16101,
"msg_type": 2, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -316,7 +316,7 @@
}, },
{ {
"id": 16102, "id": 16102,
"msg_type": 2, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -325,7 +325,7 @@
}, },
{ {
"id": 16103, "id": 16103,
"msg_type": 2, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -361,7 +361,7 @@
}, },
{ {
"id": 17103, "id": 17103,
"msg_type": 2, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -370,7 +370,7 @@
}, },
{ {
"id": 17104, "id": 17104,
"msg_type": 2, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -388,7 +388,7 @@
}, },
{ {
"id": 17107, "id": 17107,
"msg_type": 1, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -523,7 +523,7 @@
}, },
{ {
"id": 19103, "id": 19103,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -541,7 +541,7 @@
}, },
{ {
"id": 19105, "id": 19105,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -568,7 +568,7 @@
}, },
{ {
"id": 19109, "id": 19109,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -577,7 +577,7 @@
}, },
{ {
"id": 19110, "id": 19110,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -613,7 +613,7 @@
}, },
{ {
"id": 21101, "id": 21101,
"msg_type": 0, "msg_type": 2,
"show_type": 1, "show_type": 1,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -667,7 +667,7 @@
}, },
{ {
"id": 24100, "id": 24100,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",

40
bin/json/game_vikingboss.json
View File

@ -4220,7 +4220,7 @@
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 100 "n": 50
} }
], ],
"dropshow": [ "dropshow": [
@ -4289,7 +4289,7 @@
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 100 "n": 50
} }
], ],
"dropshow": [ "dropshow": [
@ -4632,9 +4632,9 @@
], ],
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000001",
"n": 100 "n": 1
} }
], ],
"dropshow": [ "dropshow": [
@ -4701,9 +4701,9 @@
], ],
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000001",
"n": 100 "n": 1
} }
], ],
"dropshow": [ "dropshow": [
@ -4770,9 +4770,9 @@
], ],
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000001",
"n": 100 "n": 1
} }
], ],
"dropshow": [ "dropshow": [
@ -4844,9 +4844,9 @@
], ],
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000001",
"n": 100 "n": 1
} }
], ],
"dropshow": [ "dropshow": [
@ -4918,9 +4918,9 @@
], ],
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000001",
"n": 100 "n": 1
} }
], ],
"dropshow": [ "dropshow": [
@ -4992,9 +4992,9 @@
], ],
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "item",
"t": "diamond", "t": "10000001",
"n": 100 "n": 1
} }
], ],
"dropshow": [ "dropshow": [

9
modules/smithy/model_atlas.go
View File

@ -156,16 +156,11 @@ func (this *modelAtlas) checkReddot17102(uid string) bool {
} }
} }
} }
listCollect, _ := this.module.modelAtlas.getSmithyAtlasList(uid)
return false for _, v := range listCollect.Collect {
}
func (this *modelAtlas) checkReddot17106(uid string) bool {
list, _ := this.module.modelAtlas.getSmithyAtlasList(uid)
for _, v := range list.Collect {
if v.Activate == false { if v.Activate == false {
return true return true
} }
} }
return false return false
} }

7
modules/smithy/module.go
View File

@ -138,12 +138,7 @@ func (this *Smithy) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (r
Activated: this.modelTask.checkReddot17107(session.GetUserId()), Activated: this.modelTask.checkReddot17107(session.GetUserId()),
} }
break break
case comm.Reddot17106: //
reddot[comm.Reddot17106] = &pb.ReddotItem{
Rid: int32(comm.Reddot17106),
Activated: this.modelAtlas.checkReddot17106(session.GetUserId()),
}
break
} }
} }