From ed1fd6f3504a6f158c3d4925454402be5707e115 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 16 Jan 2024 09:56:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pagoda/model_cycle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pagoda/model_cycle.go b/modules/pagoda/model_cycle.go index f21e5e2ea..1c041d1ed 100644 --- a/modules/pagoda/model_cycle.go +++ b/modules/pagoda/model_cycle.go @@ -43,7 +43,7 @@ func (this *ModelCycle) getPagodaCycleList(uid string) (result *pb.DBPagodaCycle result.Uid = uid result.Itype = 1 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 } else { err = fmt.Errorf("conf not found: %v", e.Error()) From 681c1e448ed5693d5075ea680ba55bad10141ec5 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 16 Jan 2024 10:35:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=89=E6=B6=88=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/entertainment/room.go | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index 1d1ee116f..d25962c9c 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -516,6 +516,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { update["maxconsumeexp"] = list.Maxconsumeexp } if list.Maxsocre < winner.Score { + list.Maxsocre = winner.Score update["maxsocre"] = list.Maxsocre } } else { @@ -545,17 +546,9 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { } this.module.model.modifyEntertainmList(winner.Userinfo.Uid, update) if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil { + p := &pb.XxlPlayer{ - Uinfo: &pb.BaseUserInfo{ - Uid: user.Uid, - Sid: user.Sid, - Name: user.Name, - Gender: user.Gender, - Skin: user.CurSkin, - Aframe: user.Curaframe, - Title: user.Curtitle, - Lv: user.Lv, - }, + Uinfo: comm.GetUserBaseInfo(user), Maxconsumeexp: list.Maxconsumeexp, Consumeexp: list.Consumeexp, Maxsocre: list.Maxsocre, @@ -626,6 +619,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { } } if list.Maxsocre < winner.Score { // 单局最大积分 + list.Maxsocre = winner.Score update["maxsocre"] = list.Maxsocre } 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 { p := &pb.XxlPlayer{ - Uinfo: &pb.BaseUserInfo{ - Uid: user.Uid, - Sid: user.Sid, - Name: user.Name, - Gender: user.Gender, - Skin: user.CurSkin, - Aframe: user.Curaframe, - Title: user.Curtitle, - Lv: user.Lv, - }, + Uinfo: comm.GetUserBaseInfo(user), Maxconsumeexp: list.Maxconsumeexp, Consumeexp: list.Consumeexp, Maxsocre: list.Maxsocre,