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:
meixiongfeng 2023-07-27 11:56:01 +08:00
commit 6d142ceac4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/guildgve/api_challengefinish.go
View File

@ -68,7 +68,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
}
return
}
if user = this.module.ModuleUser.GetUser(session.GetUserId()); user != nil {
if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/guildgve/modelUnionRoulette.go
View File

@ -80,7 +80,7 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid string, a
users = append(users, v.Uid)
}
lock, _ := this.module.modelGuildGve.userlock(unionid)
lock, _ := this.userlock(unionid)
err = lock.Lock()
if err != nil {
this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: unionid}, log.Field{Key: "err", Value: err.Error()})

10
modules/mainline/model_mainline.go
View File

@ -88,12 +88,12 @@ func (this *ModelMline) updateprogress(data *pb.DBMainline) {
chapteraward[conf.Chapterid] = &pb.DBMainlineAward{}
}
chapteraward[conf.Chapterid].Stage++
} else {
if _, ok = exploreaward[conf.Chapterid]; !ok && conf.Episodetype != 8 {
exploreaward[conf.Chapterid] = &pb.DBMainlineAward{}
}
exploreaward[conf.Chapterid].Stage++
}
if _, ok = exploreaward[conf.Chapterid]; !ok && conf.Episodetype != 8 {
exploreaward[conf.Chapterid] = &pb.DBMainlineAward{}
}
exploreaward[conf.Chapterid].Stage++
if _, ok = groupaward[conf.GroupId]; !ok {
groupaward[conf.GroupId] = &pb.DBMainlineAward{}
}

2
modules/tools/module.go
View File

@ -74,7 +74,7 @@ func (this *Tools) GetPlayerlvConf(uid string) (conf *cfg.GamePlayerlvData, errd
user *pb.DBUser
err error
)
if user = this.ModuleUser.GetUser(uid); user != nil {
if user = this.ModuleUser.GetUser(uid); user == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.String(),