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

优化

Browse Source
This commit is contained in:
meixiongfeng 2023-03-31 15:51:09 +08:00
parent dd2182fa84
commit c57970e6aa
3 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mail/api_getAttachment.go
View File

@ -43,8 +43,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
} }
res = append(res, d) res = append(res, d)
} }
code = this.module.api.module.DispenseRes(session, res, true) // 领取附件 if code = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success {
if code == pb.ErrorCode_Success {
// 修改状态 // 修改状态
this.module.modelMail.MailUpdateMailAttachmentState(req.ObjID) this.module.modelMail.MailUpdateMailAttachmentState(req.ObjID)
} }
@ -91,8 +90,7 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai
fj = append(fj, v1) fj = append(fj, v1)
res = append(res, d) res = append(res, d)
} }
code = this.module.api.module.DispenseRes(session, res, true) // 领取附件 if code = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success {
if code == pb.ErrorCode_Success {
this.module.modelMail.MailUpdateMailAttachmentState(v.ObjId) this.module.modelMail.MailUpdateMailAttachmentState(v.ObjId)
v.Reward = true v.Reward = true
v.Check = true v.Check = true

50
modules/user/api_sign.go
View File

@ -3,8 +3,6 @@ package user
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
@ -18,58 +16,10 @@ func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.UserSignReq) (
//登录 //登录
func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode, data proto.Message) { func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode, data proto.Message) {
var (
update map[string]interface{}
lastSignTime int64 // 上次签到时间
)
if code = this.module.ModuleSys.IsAccess(comm.Sign, session.GetUserId()); code != pb.ErrorCode_Success { if code = this.module.ModuleSys.IsAccess(comm.Sign, session.GetUserId()); code != pb.ErrorCode_Success {
return return
} }
update = make(map[string]interface{}, 0)
if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil {
// 获取当前是第几天
lastSignTime = sign.SignTime
sign.SignTime = configure.Now().Unix()
start, _ := utils.GetMonthStartEnd()
iDay := (configure.Now().Unix() - start) / (24 * 3600)
if sign.SignTime < start { // 重置
sign.SignCount = 1
if newGroup := this.module.configure.GetSignResetConf(sign.Group + 1); newGroup != -1 { // 获取当前的组id
sign.Group = newGroup
sign.SignCount = 1
update["group"] = newGroup
}
sign.Puzzle = make([]int32, 31)
} else {
if sign.Puzzle[iDay] != 0 {
code = pb.ErrorCode_UserSign
return
}
if utils.IsYestoday(lastSignTime) {
sign.SignCount += 1
} else {
sign.SignCount = 1
}
}
sign.Day = int32(iDay)
sign.Puzzle[iDay] = 1
update["signTime"] = sign.SignTime
update["signCount"] = sign.SignCount
update["day"] = sign.Day
update["puzzle"] = sign.Puzzle
this.module.modelSign.Change(session.GetUserId(), update)
_data := this.module.configure.GetSignConf(sign.Day, sign.Group)
if _data != nil { // 发奖
this.module.DispenseRes(session, _data.Loopgift, true) // 签到奖励
// 额外奖励
if conf := this.module.configure.GetSignExtarConf(sign.SignCount, sign.Group); conf != nil {
this.module.DispenseRes(session, conf.Extra, true) // 签到额外奖励
}
}
session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSignResp{ session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSignResp{
Data: sign, Data: sign,
}) })

55
modules/user/model_sign.go
View File

@ -74,3 +74,58 @@ func (this *ModelSign) updateSignData(uid string, sign *pb.DBSign) (err error) {
} }
return return
} }
func (this *ModelSign) UserSign(session comm.IUserSession) {
var (
update map[string]interface{}
lastSignTime int64 // 上次签到时间
)
if code := this.module.ModuleSys.IsAccess(comm.Sign, session.GetUserId()); code != pb.ErrorCode_Success {
return
}
if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil {
// 获取当前是第几天
lastSignTime = sign.SignTime
sign.SignTime = configure.Now().Unix()
start, _ := utils.GetMonthStartEnd()
iDay := (configure.Now().Unix() - start) / (24 * 3600)
if sign.SignTime < start { // 重置
sign.SignCount = 1
if newGroup := this.module.configure.GetSignResetConf(sign.Group + 1); newGroup != -1 { // 获取当前的组id
sign.Group = newGroup
sign.SignCount = 1
update["group"] = newGroup
}
sign.Puzzle = make([]int32, 31)
} else {
if sign.Puzzle[iDay] != 0 {
return
}
if utils.IsYestoday(lastSignTime) {
sign.SignCount += 1
} else {
sign.SignCount = 1
}
}
sign.Day = int32(iDay)
sign.Puzzle[iDay] = 1
update["signTime"] = sign.SignTime
update["signCount"] = sign.SignCount
update["day"] = sign.Day
update["puzzle"] = sign.Puzzle
this.module.modelSign.Change(session.GetUserId(), update)
_data := this.module.configure.GetSignConf(sign.Day, sign.Group)
if _data != nil { // 发奖
this.module.DispenseRes(session, _data.Loopgift, true) // 签到奖励
// 额外奖励
if conf := this.module.configure.GetSignExtarConf(sign.SignCount, sign.Group); conf != nil {
this.module.DispenseRes(session, conf.Extra, true) // 签到额外奖励
}
}
}
}