公会申请红点

This commit is contained in:
wh_zcy 2022-11-22 11:02:28 +08:00
parent 657701c82f
commit c6329afb7e
2 changed files with 159 additions and 145 deletions

View File

@ -306,10 +306,10 @@ const (
type ReddotType int32 type ReddotType int32
const ( const (
Reddot1 ReddotType = 10001 //任务----日常活跃宝箱红点 Reddot1 ReddotType = 10001 //任务----日常任务奖励红点
Reddot2 ReddotType = 10002 //任务----周活跃宝箱红点 Reddot2 ReddotType = 10002 //任务----周常任务奖励红点
Reddot3 ReddotType = 10003 //公会----签到红点 Reddot3 ReddotType = 10003 //公会----签到红点
Reddot4 ReddotType = 10004 //任务----成就奖励红点 Reddot4 ReddotType = 10004 //任务----成就任务奖励红点
Reddot5 ReddotType = 10005 //主线关卡----可挑战红点 Reddot5 ReddotType = 10005 //主线关卡----可挑战红点
Reddot6 ReddotType = 10006 //爬塔----可挑战红点 Reddot6 ReddotType = 10006 //爬塔----可挑战红点
Reddot7 ReddotType = 10007 //爬塔----奖励红点 Reddot7 ReddotType = 10007 //爬塔----奖励红点
@ -332,9 +332,9 @@ const (
Reddot24 ReddotType = 10024 //熊猫武馆----可升级红点 Reddot24 ReddotType = 10024 //熊猫武馆----可升级红点
Reddot25 ReddotType = 10025 //熊猫武馆----可领取奖励红点 Reddot25 ReddotType = 10025 //熊猫武馆----可领取奖励红点
Reddot26 ReddotType = 10026 //邮件-----附件红点 Reddot26 ReddotType = 10026 //邮件-----附件红点
Reddot27 ReddotType = 10027 //公会----任务完成红点 Reddot27 ReddotType = 10027 //任务----日常活跃奖励红点
Reddot28 ReddotType = 10028 //公会----进度奖励红点 Reddot28 ReddotType = 10028 //任务----周常活跃奖励红点
Reddot29 ReddotType = 10029 //任务----周常任务完成红点 Reddot29 ReddotType = 10029 //公会----申请红点
Reddot30 ReddotType = 10030 //邮件-----未读邮件红点 Reddot30 ReddotType = 10030 //邮件-----未读邮件红点
) )

View File

@ -123,7 +123,19 @@ func (this *Sociaty) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (
reddot = make(map[comm.ReddotType]bool) reddot = make(map[comm.ReddotType]bool)
sociaty := this.modelSociaty.getUserSociaty(session.GetUserId()) sociaty := this.modelSociaty.getUserSociaty(session.GetUserId())
if sociaty == nil || sociaty.Id == "" { if sociaty == nil || sociaty.Id == "" {
reddot[comm.Reddot3] = false log.Warn("公会红点未获得公会信息", log.Fields{"uid": session.GetUserId()})
return
}
var applyReddot bool
if this.modelSociaty.isRight(session.GetUserId(), sociaty,
pb.SociatyJob_PRESIDENT,
pb.SociatyJob_VICEPRESIDENT,
pb.SociatyJob_ADMIN) {
if len(sociaty.ApplyRecord) > 0 {
applyReddot = true
}
return return
} }
for _, v := range rid { for _, v := range rid {
@ -132,6 +144,8 @@ func (this *Sociaty) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (
if ok := this.modelSociaty.IsSign(session.GetUserId(), sociaty); !ok { if ok := this.modelSociaty.IsSign(session.GetUserId(), sociaty); !ok {
reddot[comm.Reddot3] = true reddot[comm.Reddot3] = true
} }
case comm.Reddot29:
reddot[comm.Reddot29] = applyReddot
} }
} }
return return