diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 1b40c2a1e..564a21b6c 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 179, + "tasktime": 147, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_39", "text": "这是属于悍娇虎的专属委托" diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index b023f00f8..b28def935 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -120,10 +120,10 @@ "text": "羁绊" }, "npcName": [ - "打造" + "功能入口-藏书馆" ], - "functionicon": "ty_qp_zm", - "jumpId": 1001 + "functionicon": "ty_qp_hgd", + "jumpId": 146 }, { "Id": 8, @@ -132,7 +132,7 @@ "key": "navigation_Sheet1_scenename_8", "text": "指挥部" }, - "sceneicon": "ty_qp_tjp", + "sceneicon": "ty_qp_zhb", "functionname": { "key": "navigation_Sheet1_functionname_8", "text": "主线关卡" @@ -150,13 +150,13 @@ "key": "navigation_Sheet1_scenename_9", "text": "指挥部" }, - "sceneicon": "ty_qp_tjp", + "sceneicon": "ty_qp_zhb", "functionname": { "key": "navigation_Sheet1_functionname_9", "text": "星座图" }, "npcName": [ - "手册台" + "功能入口_主角星座图" ], "functionicon": "ty_qp_tf", "jumpId": 171 diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 62e9f517b..f0d834f8e 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1950,7 +1950,7 @@ "heroid": 25001, "datas": [ "GameMain", - "希卡普", + "20400_希卡普", "901" ], "event": [ diff --git a/bin/json/game_reddot.json b/bin/json/game_reddot.json index 4eb19bc6e..3be30c460 100644 --- a/bin/json/game_reddot.json +++ b/bin/json/game_reddot.json @@ -199,7 +199,7 @@ }, { "id": 20401, - "msg_type": 2, + "msg_type": 1, "show_type": 2, "count_type": 1, "group": "", @@ -217,7 +217,7 @@ }, { "id": 20601, - "msg_type": 2, + "msg_type": 1, "show_type": 0, "count_type": 0, "group": "", @@ -235,7 +235,7 @@ }, { "id": 15101, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "sociaty", @@ -244,7 +244,7 @@ }, { "id": 15102, - "msg_type": 1, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "sociaty", @@ -307,7 +307,7 @@ }, { "id": 16101, - "msg_type": 2, + "msg_type": 1, "show_type": 0, "count_type": 0, "group": "", @@ -316,7 +316,7 @@ }, { "id": 16102, - "msg_type": 2, + "msg_type": 1, "show_type": 0, "count_type": 0, "group": "", @@ -325,7 +325,7 @@ }, { "id": 16103, - "msg_type": 2, + "msg_type": 1, "show_type": 0, "count_type": 0, "group": "", @@ -361,7 +361,7 @@ }, { "id": 17103, - "msg_type": 2, + "msg_type": 1, "show_type": 0, "count_type": 0, "group": "", @@ -370,7 +370,7 @@ }, { "id": 17104, - "msg_type": 2, + "msg_type": 1, "show_type": 0, "count_type": 0, "group": "", @@ -388,7 +388,7 @@ }, { "id": 17107, - "msg_type": 1, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "", @@ -523,7 +523,7 @@ }, { "id": 19103, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "", @@ -541,7 +541,7 @@ }, { "id": 19105, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "", @@ -568,7 +568,7 @@ }, { "id": 19109, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "", @@ -577,7 +577,7 @@ }, { "id": 19110, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "", @@ -613,7 +613,7 @@ }, { "id": 21101, - "msg_type": 0, + "msg_type": 2, "show_type": 1, "count_type": 0, "group": "", @@ -667,7 +667,7 @@ }, { "id": 24100, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "group": "", diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 0e4708c72..9c927be49 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -4220,7 +4220,7 @@ { "a": "attr", "t": "diamond", - "n": 100 + "n": 50 } ], "dropshow": [ @@ -4289,7 +4289,7 @@ { "a": "attr", "t": "diamond", - "n": 100 + "n": 50 } ], "dropshow": [ @@ -4632,9 +4632,9 @@ ], "firstprize": [ { - "a": "attr", - "t": "diamond", - "n": 100 + "a": "item", + "t": "10000001", + "n": 1 } ], "dropshow": [ @@ -4701,9 +4701,9 @@ ], "firstprize": [ { - "a": "attr", - "t": "diamond", - "n": 100 + "a": "item", + "t": "10000001", + "n": 1 } ], "dropshow": [ @@ -4770,9 +4770,9 @@ ], "firstprize": [ { - "a": "attr", - "t": "diamond", - "n": 100 + "a": "item", + "t": "10000001", + "n": 1 } ], "dropshow": [ @@ -4844,9 +4844,9 @@ ], "firstprize": [ { - "a": "attr", - "t": "diamond", - "n": 100 + "a": "item", + "t": "10000001", + "n": 1 } ], "dropshow": [ @@ -4918,9 +4918,9 @@ ], "firstprize": [ { - "a": "attr", - "t": "diamond", - "n": 100 + "a": "item", + "t": "10000001", + "n": 1 } ], "dropshow": [ @@ -4992,9 +4992,9 @@ ], "firstprize": [ { - "a": "attr", - "t": "diamond", - "n": 100 + "a": "item", + "t": "10000001", + "n": 1 } ], "dropshow": [ diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index 67486b3a2..a9dfc4ea7 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -156,16 +156,11 @@ func (this *modelAtlas) checkReddot17102(uid string) bool { } } } - - return false -} -func (this *modelAtlas) checkReddot17106(uid string) bool { - list, _ := this.module.modelAtlas.getSmithyAtlasList(uid) - for _, v := range list.Collect { + listCollect, _ := this.module.modelAtlas.getSmithyAtlasList(uid) + for _, v := range listCollect.Collect { if v.Activate == false { return true } } - return false } diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 7d189d37f..030a2d547 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -138,12 +138,7 @@ func (this *Smithy) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (r Activated: this.modelTask.checkReddot17107(session.GetUserId()), } break - case comm.Reddot17106: // - reddot[comm.Reddot17106] = &pb.ReddotItem{ - Rid: int32(comm.Reddot17106), - Activated: this.modelAtlas.checkReddot17106(session.GetUserId()), - } - break + } }