From c20b66c5cc6d310f35de70b75228dafaeb72b374 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 27 Jul 2023 19:09:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/guildgve/api_roulette.go | 1 - modules/guildgve/modelUnionRoulette.go | 2 +- modules/mainline/model_mainline.go | 9 +++++---- modules/mainline/module.go | 9 ++++++++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/guildgve/api_roulette.go b/modules/guildgve/api_roulette.go index 49719bdc2..d32831d95 100644 --- a/modules/guildgve/api_roulette.go +++ b/modules/guildgve/api_roulette.go @@ -70,7 +70,6 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett if confs[index].Push == 1 { //推送通知 go this.module.modelUnionroulette.roulettechangePush(req.Guildid, session.GetUserId(), user.Name, confs[index].Id, award) } - session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award}) return } diff --git a/modules/guildgve/modelUnionRoulette.go b/modules/guildgve/modelUnionRoulette.go index 8081593ab..b66374600 100644 --- a/modules/guildgve/modelUnionRoulette.go +++ b/modules/guildgve/modelUnionRoulette.go @@ -100,7 +100,7 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid, uname st Award: award, } info.Roulette = append(info.Roulette, record) - + this.updateUnionRoulette(info) this.module.SendMsgToUsers(string(this.module.GetType()), "roulettechange", &pb.GuildGveRouletteChangePush{ Record: record, }, users...) diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go index f0bb91f02..da749330d 100644 --- a/modules/mainline/model_mainline.go +++ b/modules/mainline/model_mainline.go @@ -89,11 +89,12 @@ func (this *ModelMline) updateprogress(data *pb.DBMainline) { } chapteraward[conf.Chapterid].Stage++ } - if _, ok = exploreaward[conf.Chapterid]; !ok && conf.Episodetype != 8 { - exploreaward[conf.Chapterid] = &pb.DBMainlineAward{} + if conf.Episodetype != 8 { + if _, ok = exploreaward[conf.Chapterid]; !ok { + exploreaward[conf.Chapterid] = &pb.DBMainlineAward{} + } + exploreaward[conf.Chapterid].Stage++ } - exploreaward[conf.Chapterid].Stage++ - if _, ok = groupaward[conf.GroupId]; !ok { groupaward[conf.GroupId] = &pb.DBMainlineAward{} } diff --git a/modules/mainline/module.go b/modules/mainline/module.go index 36b23a438..222815400 100644 --- a/modules/mainline/module.go +++ b/modules/mainline/module.go @@ -99,7 +99,14 @@ func (this *Mainline) BingoJumpLevel(session comm.IUserSession, level int32) (er err error ) - this.configure.GetMainStageConfs() + if confs, err = this.configure.GetMainStageConfs(); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } info, err = this.modelMline.getMainlineData(session.GetUserId()) if err != nil { errdata = &pb.ErrorData{