diff --git a/comm/const.go b/comm/const.go index 9da21a8ce..4746e22b0 100644 --- a/comm/const.go +++ b/comm/const.go @@ -442,12 +442,15 @@ const ( Reddot17102 ReddotType = 17102 // 铁匠铺手册台 Reddot17106 ReddotType = 17106 // 铁匠铺手册台收藏家奖励上 Reddot17107 ReddotType = 17107 // 铁匠铺手册台收藏家奖励按钮上 + //竞技场 + Reddot22100 ReddotType = 22100 //当玩家竞技场可挑战次数到达最大时 + Reddot22102 ReddotType = 22102 //当竞技场npc可以挑战时 Reddot6 ReddotType = 10006 //爬塔----可挑战红点 Reddot7 ReddotType = 10007 //爬塔----奖励红点 Reddot17 ReddotType = 10017 //星座图----红点 Reddot18 ReddotType = 10018 //英雄招募----红点 // 前端处理 - Reddot19 ReddotType = 10019 //竞技场----挑战红点 + Reddot20 ReddotType = 10020 //丛林美食馆----可挂机红点 Reddot21 ReddotType = 10021 //丛林美食馆----可升级红点 Reddot22 ReddotType = 10022 //丛林美食馆----可领取奖励红 diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index 5bbc14bc2..74efe79fe 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -459,11 +459,6 @@ func (this *modelArena) reddot(session comm.IUserSession) bool { return false } if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil { - // code = pb.ErrorCode_ConfigNoFound - // data = &pb.ErrorData{ - // Title: code.ToString(), - // Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(), - // } this.module.Error("竞技场配置未找到!", log.Field{Key: "key", Value: "ArenaTicketCos"}) return false } diff --git a/modules/arena/module.go b/modules/arena/module.go index d5f55cdd2..7b9e02cd1 100644 --- a/modules/arena/module.go +++ b/modules/arena/module.go @@ -98,8 +98,8 @@ func (this *Arena) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (re result = make(map[comm.ReddotType]bool) for _, v := range rid { switch v { - case comm.Reddot19: - result[comm.Reddot19] = this.modelArena.reddot(session) + case comm.Reddot22102: + result[comm.Reddot22102] = this.modelArena.reddot(session) break } } diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go index df96ec12a..766314507 100644 --- a/modules/reddot/api_get.go +++ b/modules/reddot/api_get.go @@ -42,12 +42,13 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda for k, v := range this.module.ModuleSociaty.Reddot(session, _rid) { reddot[int32(k)] = v } - case comm.Reddot17: - for k, v := range this.module.horoscope.Reddot(session, _rid) { + //竞技场 + case comm.Reddot22102: + for k, v := range this.module.arena.Reddot(session, _rid) { reddot[int32(k)] = v } - case comm.Reddot19: - for k, v := range this.module.arena.Reddot(session, _rid) { + case comm.Reddot17: + for k, v := range this.module.horoscope.Reddot(session, _rid) { reddot[int32(k)] = v } case comm.Reddot20, comm.Reddot21, comm.Reddot22: diff --git a/modules/reddot/api_getall.go b/modules/reddot/api_getall.go index 5da0546b3..fb420038e 100644 --- a/modules/reddot/api_getall.go +++ b/modules/reddot/api_getall.go @@ -40,16 +40,17 @@ func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq) ) { reddot[int32(k)] = v } - + //竞技场 + for k, v := range this.module.arena.Reddot(session, comm.Reddot22102) { + reddot[int32(k)] = v + } for k, v := range this.module.pagoda.Reddot(session, comm.Reddot6) { reddot[int32(k)] = v } for k, v := range this.module.horoscope.Reddot(session, comm.Reddot17) { reddot[int32(k)] = v } - for k, v := range this.module.arena.Reddot(session, comm.Reddot19) { - reddot[int32(k)] = v - } + for k, v := range this.module.gourmet.Reddot(session, comm.Reddot20, comm.Reddot21, comm.Reddot22) { reddot[int32(k)] = v }