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:
liwei1dao 2023-01-04 10:25:48 +08:00
commit d78785fdfd
3 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/mainline/api_challengeover.go
View File

@ -56,14 +56,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
} }
// 校验通过 // 校验通过
if req.Report != nil { // 战斗失败 code, isWin = this.module.battle.CheckBattleReport(session, req.Report)
code, isWin = this.module.battle.CheckBattleReport(session, req.Report) if code != pb.ErrorCode_Success {
if code != pb.ErrorCode_Success { return
return
}
} else {
isWin = false
} }
if !isWin { // 战斗失败直接返回 if !isWin { // 战斗失败直接返回
// 返还 // 返还
mainline.Ps = 0 mainline.Ps = 0

36
modules/privilege/module.go
View File

@ -9,6 +9,7 @@ import (
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
"go_dreamfactory/utils" "go_dreamfactory/utils"
"time"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
) )
@ -410,17 +411,34 @@ func (this *Privilege) SendDailyPrivilegeMail(session comm.IUserSession, cId []i
} }
} }
func (this *Privilege) GetCountByPrivilegeId(uid string, pId int32) (count int32) { func (this *Privilege) GetCountByPrivilegeId(uid string, pId int32) (count int32) {
vip, err := this.modelVip.getVipList(uid) if this.IsCross() { // 跨服情况
if err != nil { if model, err := this.GetDBModuleByUid(uid, comm.TableVip, time.Hour); err == nil {
return vip := &pb.DBVip{}
} if err = model.Get(uid, vip); err == nil {
if v, ok := vip.Privilege[pId]; ok { if v, ok := vip.Privilege[pId]; ok {
data := this.configure.GetPrivilegeByType(pId) data := this.configure.GetPrivilegeByType(pId)
for _, v1 := range v.PrivilegeID { for _, v1 := range v.PrivilegeID {
if c, ok1 := data[v1]; ok1 { if c, ok1 := data[v1]; ok1 {
count += c count += c
}
}
}
}
}
} else {
vip, err := this.modelVip.getVipList(uid)
if err != nil {
return
}
if v, ok := vip.Privilege[pId]; ok {
data := this.configure.GetPrivilegeByType(pId)
for _, v1 := range v.PrivilegeID {
if c, ok1 := data[v1]; ok1 {
count += c
}
} }
} }
} }
return return
} }

2
modules/viking/api_challengeover.go
View File

@ -115,7 +115,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
for _, v1 := range atno { for _, v1 := range atno {
if v1.A == "equp" { if v1.A == "equp" {
cfg := this.configure.GetEquipmentConfigureById(v1.T) cfg := this.configure.GetEquipmentConfigureById(v1.T)
if cfg.Star == v { if cfg != nil && cfg.Star == v {
del = append(del, v1.O) del = append(del, v1.O)
} }
} }