From 7e7ef7d1b45ba407a36b2df8bfe9fff9436c4176 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 23 Nov 2022 16:58:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E4=BB=BB=E5=8A=A1=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 4 +++- modules/gourmet/api_getlist.go | 1 + modules/mail/model_mail.go | 1 - modules/mainline/api_challengeover.go | 3 +++ modules/pagoda/api_challengeover.go | 19 +++---------------- modules/pagoda/module.go | 16 +++++++++++++++- modules/privilege/module.go | 1 - 7 files changed, 25 insertions(+), 20 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index 41d828b1b..a3754d083 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -224,7 +224,9 @@ type ( IPagoda interface { ModifyPagodaFloor(session IUserSession, level int32) (code pb.ErrorCode) CheckUserBasePagodaInfo(uid string) (data *pb.DBPagodaRecord) // 查询玩家最佳通关记录 - CheckPagodaMaxFloor(uid string, pagodaType int32) int32 // 查询塔通关难度type 1 表示普通塔 2 赛季塔 + + // Check Rtype84 Rtype85 Rtype86 + CheckPagodaMaxFloor(uid string, pagodaType int32) int32 // 查询塔通关难度type 1 表示普通塔 2 赛季塔 ///红点 IReddot } diff --git a/modules/gourmet/api_getlist.go b/modules/gourmet/api_getlist.go index 2205c35b8..b02ee7dc0 100644 --- a/modules/gourmet/api_getlist.go +++ b/modules/gourmet/api_getlist.go @@ -30,6 +30,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.GourmetGetListRe this.module.modelGourmet.CalculationGourmet(session.GetUserId(), _gourmet) session.SendMsg(string(this.module.GetType()), GourmetGetListResp, &pb.GourmetGetListResp{Data: _gourmet}) + // 任务统计 this.module.ModuleRtask.SendToRtask(session, comm.Rtype136, _gourmet.TotalTime) return } diff --git a/modules/mail/model_mail.go b/modules/mail/model_mail.go index 445bf8203..9b3c587f4 100644 --- a/modules/mail/model_mail.go +++ b/modules/mail/model_mail.go @@ -89,7 +89,6 @@ func (this *modelMail) MailGetMailAttachmentState(objId string) (*pb.DBMailData, err := this.DB.FindOne(comm.TableMail, bson.M{"_id": objId}).Decode(&nd) return nd, err - //return !nd.Reward && len(nd.GetItems()) > 0 && nd.Uid == uid } // 更新领取附件状态 diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 86c053e2a..ff7d95496 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -113,5 +113,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh } session.SendMsg(string(this.module.GetType()), MainlineChallengeOverResp, &pb.MainlineChallengeOverResp{Data: mainline}) + // 主线任务统计 Rtype60 + this.module.ModuleRtask.SendToRtask(session, comm.Rtype60, 1) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype61, int32(req.MainlineId)) return } diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index a68799aa7..d023af708 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -71,6 +71,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal if code != pb.ErrorCode_Success { return } + costTime = req.Report.Costtime // 加经验 if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { for _, v := range req.Report.Info.Redflist[0].Team { @@ -93,23 +94,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) } - if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { - sz := make([]*pb.LineUp, 5) - for i, v := range req.Report.Info.Redflist[0].Team { - if v != nil { - sz[i] = &pb.LineUp{ - Cid: v.HeroID, - Star: v.Star, - Lv: v.Lv, - } - } - } - if req.Report != nil { - costTime = req.Report.Costtime - } - this.module.modulerank.SetNormalPagodaRankList("pagodaRank", pagoda.PagodaId<<8+costTime, session.GetUserId()) - } + //this.module.modulerank.SetNormalPagodaRankList("pagodaRank", pagoda.PagodaId<<16-costTime, session.GetUserId()) + // 普通塔通关了 Nomalcfg := this.module.configure.GetPagodaConfigData(comm.PagodaType, pagoda.PagodaId+1) if Nomalcfg == nil { diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 8c56d48a6..2d25c2dda 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -119,7 +119,6 @@ func (this *Pagoda) CleanSeasonPagodaData() (code pb.ErrorCode) { log.Errorf("delete failed") } } - return } @@ -192,6 +191,8 @@ func (this *Pagoda) CheckPoint6(uid string) bool { func (this *Pagoda) Rpc_ModuleSeasonPagodaReward(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) { this.Debug("Rpc_ModuleSeasonPagodaReward", log.Fields{"args": args.String()}) this.modulerank.seasonSettlement() + // 清除战令信息 + this.CleanPassCheck() } func (this *Pagoda) CheckPoint7(uid string) bool { @@ -225,3 +226,16 @@ func (this *Pagoda) CheckPagodaMaxFloor(uid string, pagodaType int32) int32 { } return 0 } + +func (this *Pagoda) CleanPassCheck() (code pb.ErrorCode) { + list, _ := this.modelSeasonPagoda.getSeasonPagodaList("") + if list.Id == "" { + code = pb.ErrorCode_PagodaConditionErr // 领取条件没达到 + return + } + if list.PagodaId <= list.PassCheckID { // 层数校验 + code = pb.ErrorCode_PagodaConditionErr // 领取条件没达到 + return + } + return +} diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 049521eb2..ef8ba1310 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -98,7 +98,6 @@ func (this *Privilege) CreatePrivilegeCard(session comm.IUserSession, cId string code = pb.ErrorCode_PayRenewTimeErr return } - } if err = this.modelPrivilege.Change(session.GetUserId(), map[string]interface{}{ "eTime": v.ETime,