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 2024-01-16 14:09:30 +08:00
commit 89606daced
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/entertainment/room.go
View File

@ -516,6 +516,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) {
update["maxconsumeexp"] = list.Maxconsumeexp update["maxconsumeexp"] = list.Maxconsumeexp
} }
if list.Maxsocre < winner.Score { if list.Maxsocre < winner.Score {
list.Maxsocre = winner.Score
update["maxsocre"] = list.Maxsocre update["maxsocre"] = list.Maxsocre
} }
} else { } else {
@ -545,17 +546,9 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) {
} }
this.module.model.modifyEntertainmList(winner.Userinfo.Uid, update) this.module.model.modifyEntertainmList(winner.Userinfo.Uid, update)
if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil { if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil {
p := &pb.XxlPlayer{ p := &pb.XxlPlayer{
Uinfo: &pb.BaseUserInfo{ Uinfo: comm.GetUserBaseInfo(user),
Uid: user.Uid,
Sid: user.Sid,
Name: user.Name,
Gender: user.Gender,
Skin: user.CurSkin,
Aframe: user.Curaframe,
Title: user.Curtitle,
Lv: user.Lv,
},
Maxconsumeexp: list.Maxconsumeexp, Maxconsumeexp: list.Maxconsumeexp,
Consumeexp: list.Consumeexp, Consumeexp: list.Consumeexp,
Maxsocre: list.Maxsocre, Maxsocre: list.Maxsocre,
@ -626,6 +619,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) {
} }
} }
if list.Maxsocre < winner.Score { // 单局最大积分 if list.Maxsocre < winner.Score { // 单局最大积分
list.Maxsocre = winner.Score
update["maxsocre"] = list.Maxsocre update["maxsocre"] = list.Maxsocre
} }
if len(update) > 0 { if len(update) > 0 {
@ -633,16 +627,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) {
} }
if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil { if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil {
p := &pb.XxlPlayer{ p := &pb.XxlPlayer{
Uinfo: &pb.BaseUserInfo{ Uinfo: comm.GetUserBaseInfo(user),
Uid: user.Uid,
Sid: user.Sid,
Name: user.Name,
Gender: user.Gender,
Skin: user.CurSkin,
Aframe: user.Curaframe,
Title: user.Curtitle,
Lv: user.Lv,
},
Maxconsumeexp: list.Maxconsumeexp, Maxconsumeexp: list.Maxconsumeexp,
Consumeexp: list.Consumeexp, Consumeexp: list.Consumeexp,
Maxsocre: list.Maxsocre, Maxsocre: list.Maxsocre,

2
modules/pagoda/model_cycle.go
View File

@ -43,7 +43,7 @@ func (this *ModelCycle) getPagodaCycleList(uid string) (result *pb.DBPagodaCycle
result.Uid = uid result.Uid = uid
result.Itype = 1 result.Itype = 1
result.Rtime = configure.Now().Unix() result.Rtime = configure.Now().Unix()
if conf, e := this.module.configure.GetPagodaCirculateConf(1, 1); e != nil { if conf, e := this.module.configure.GetPagodaCirculateConf(1, 1); e == nil {
result.Etime = configure.Now().Unix() + int64(conf.Time)*24*3600 result.Etime = configure.Now().Unix() + int64(conf.Time)*24*3600
} else { } else {
err = fmt.Errorf("conf not found: %v", e.Error()) err = fmt.Errorf("conf not found: %v", e.Error())