From 0e56af52ca0516e18e090449e30b0d5f6a1d3940 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 2 Jan 2024 17:13:14 +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/herotask/api_Info.go | 2 +- modules/herotask/api_receive.go | 2 +- modules/integral/api_challenge.go | 2 +- modules/integral/api_challengeover.go | 2 +- modules/integral/api_getlist.go | 4 ++-- modules/kftask/api_Info.go | 2 +- modules/kftask/api_receive.go | 2 +- modules/mainline/api_info.go | 2 +- modules/mainline/api_shop.go | 2 +- modules/mainline/api_taskchaptereward.go | 2 +- modules/mainline/api_taskinfo.go | 2 +- modules/moonlv/api_getlist.go | 2 +- modules/moonlv/api_lvaward.go | 4 ++-- modules/stonehenge/api_taskinfo.go | 2 +- modules/stonehenge/api_taskreceive.go | 2 +- modules/warorder/api_completealltask.go | 2 +- modules/warorder/api_completetask.go | 2 +- modules/weektask/api_Info.go | 2 +- modules/weektask/api_receive.go | 2 +- modules/wtask/api_accept.go | 2 +- modules/wtask/api_completecondi.go | 2 +- modules/wtask/api_finish.go | 2 +- modules/wtask/module.go | 8 ++++---- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/herotask/api_Info.go b/modules/herotask/api_Info.go index a14b1d902..e1e221be7 100644 --- a/modules/herotask/api_Info.go +++ b/modules/herotask/api_Info.go @@ -38,7 +38,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroTaskInfoReq) (e condiIds = append(condiIds, k) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil { return } diff --git a/modules/herotask/api_receive.go b/modules/herotask/api_receive.go index 68332fd95..ad8dcb298 100644 --- a/modules/herotask/api_receive.go +++ b/modules/herotask/api_receive.go @@ -69,7 +69,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.HeroTaskReceiveR } } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil { return } diff --git a/modules/integral/api_challenge.go b/modules/integral/api_challenge.go index b7dc30271..7ec7d9d9d 100644 --- a/modules/integral/api_challenge.go +++ b/modules/integral/api_challenge.go @@ -26,7 +26,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle if errdata != nil { return // 参数校验失败直接返回 } - list, err := this.module.modelIntegral.getIntegralList(session.GetUserId()) + list, err := this.module.modelIntegral.getIntegralList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_PagodaNotFound, // 道具数量不足 diff --git a/modules/integral/api_challengeover.go b/modules/integral/api_challengeover.go index 85add7cc0..ca0e813b4 100644 --- a/modules/integral/api_challengeover.go +++ b/modules/integral/api_challengeover.go @@ -37,7 +37,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh return // 参数校验失败直接返回 } - list, err := this.module.modelIntegral.getIntegralList(session.GetUserId()) + list, err := this.module.modelIntegral.getIntegralList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_PagodaNotFound, diff --git a/modules/integral/api_getlist.go b/modules/integral/api_getlist.go index 0c07c1dd6..6507daccf 100644 --- a/modules/integral/api_getlist.go +++ b/modules/integral/api_getlist.go @@ -20,7 +20,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.IntegralGetListR list *pb.DBIntegralBoss err error ) - list, err = this.module.modelIntegral.getIntegralList(session.GetUserId()) + list, err = this.module.modelIntegral.getIntegralList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -81,7 +81,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.IntegralGetListR for _, v := range this.module.configure.GetIntegralCondition() { szTaskid = append(szTaskid, v.TaskId) // 获取任务id } - if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), szTaskid...); err == nil { + if data, err := this.module.ModuleBuried.CheckCondition(session, szTaskid...); err == nil { for _, v := range data { if v.State == pb.BuriedItemFinishState_buried_finish { diff --git a/modules/kftask/api_Info.go b/modules/kftask/api_Info.go index eab063056..e2af4ad73 100644 --- a/modules/kftask/api_Info.go +++ b/modules/kftask/api_Info.go @@ -38,7 +38,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (err condiIds = append(condiIds, k) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil { return } diff --git a/modules/kftask/api_receive.go b/modules/kftask/api_receive.go index 4f9d2b70b..09f98c2b8 100644 --- a/modules/kftask/api_receive.go +++ b/modules/kftask/api_receive.go @@ -72,7 +72,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq return } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Venturetask); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, conf.Venturetask); err != nil { return } diff --git a/modules/mainline/api_info.go b/modules/mainline/api_info.go index 956f30a1c..0230d78d6 100644 --- a/modules/mainline/api_info.go +++ b/modules/mainline/api_info.go @@ -62,7 +62,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (e for k, _ := range tasks { condiIds = append(condiIds, k) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil { return } session.SendMsg(string(this.module.GetType()), "info", &pb.MainlineInfoResp{ diff --git a/modules/mainline/api_shop.go b/modules/mainline/api_shop.go index bc12fa582..2148f6d08 100644 --- a/modules/mainline/api_shop.go +++ b/modules/mainline/api_shop.go @@ -39,7 +39,7 @@ func (this *apiComp) Shop(session comm.IUserSession, req *pb.MainlineShopReq) (e condiIds = append(condiIds, v.Unlock) } info.Unlock = make(map[int32]int32) - if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err == nil { + if data, err := this.module.ModuleBuried.CheckCondition(session, condiIds...); err == nil { for pos, v := range data { if int32(v.State) == 1 { // 记录解锁的数据 key := shopinfo[pos].Key diff --git a/modules/mainline/api_taskchaptereward.go b/modules/mainline/api_taskchaptereward.go index 53be4a5f1..c84a14145 100644 --- a/modules/mainline/api_taskchaptereward.go +++ b/modules/mainline/api_taskchaptereward.go @@ -53,7 +53,7 @@ func (this *apiComp) TaskChapteReward(session comm.IUserSession, req *pb.Mainlin } if taskids := this.module.configure.getgroupTasks(req.Chapteid); len(taskids) > 0 { for _, v := range taskids { - if progress, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), v.Taskid); err == nil { + if progress, err := this.module.ModuleBuried.CheckCondition(session, v.Taskid); err == nil { for _, v := range progress { if v.State == pb.BuriedItemFinishState_buried_unfinish { errdata = &pb.ErrorData{ diff --git a/modules/mainline/api_taskinfo.go b/modules/mainline/api_taskinfo.go index 299e10259..0e0355acf 100644 --- a/modules/mainline/api_taskinfo.go +++ b/modules/mainline/api_taskinfo.go @@ -37,7 +37,7 @@ func (this *apiComp) TaskInfo(session comm.IUserSession, req *pb.MainlineTaskInf condiIds = append(condiIds, k) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil { return } diff --git a/modules/moonlv/api_getlist.go b/modules/moonlv/api_getlist.go index 094661be6..11426a23e 100644 --- a/modules/moonlv/api_getlist.go +++ b/modules/moonlv/api_getlist.go @@ -14,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MoonlvGetLi // 获取护月等级基本信息 func (this *apiComp) GetList(session comm.IUserSession, req *pb.MoonlvGetListReq) (errdata *pb.ErrorData) { - list, err := this.module.modelMoonlv.getMoonlvList(session.GetUserId()) + list, err := this.module.modelMoonlv.getMoonlvList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/moonlv/api_lvaward.go b/modules/moonlv/api_lvaward.go index de87af5d1..e409e93cb 100644 --- a/modules/moonlv/api_lvaward.go +++ b/modules/moonlv/api_lvaward.go @@ -25,7 +25,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e atno []*pb.UserAtno ) update = make(map[string]interface{}, 0) - list, err := this.module.modelMoonlv.getMoonlvList(session.GetUserId()) + list, err := this.module.modelMoonlv.getMoonlvList(session) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -73,7 +73,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e szTaskid = append(szTaskid, v.TaskId) // 获取任务id } } - if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), szTaskid...); err == nil { + if data, err := this.module.ModuleBuried.CheckCondition(session, szTaskid...); err == nil { for _, v := range data { tmp := &pb.MoonTask{ TaskId: v.Conid, diff --git a/modules/stonehenge/api_taskinfo.go b/modules/stonehenge/api_taskinfo.go index 1ff217274..b76b04bd6 100644 --- a/modules/stonehenge/api_taskinfo.go +++ b/modules/stonehenge/api_taskinfo.go @@ -45,7 +45,7 @@ func (this *apiComp) TaskInfo(session comm.IUserSession, req *pb.StonehengeTaskI tasks = append(tasks, v.TaskId) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil { return } session.SendMsg(string(this.module.GetType()), "taskinfo", &pb.StonehengeTaskInfoResp{Conlds: progress, Task: info.Task}) diff --git a/modules/stonehenge/api_taskreceive.go b/modules/stonehenge/api_taskreceive.go index 2e8cf5277..d2336953d 100644 --- a/modules/stonehenge/api_taskreceive.go +++ b/modules/stonehenge/api_taskreceive.go @@ -51,7 +51,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.StonehengeTa return } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.TaskId); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, conf.TaskId); err != nil { return } diff --git a/modules/warorder/api_completealltask.go b/modules/warorder/api_completealltask.go index e45527c83..64bfb5f35 100644 --- a/modules/warorder/api_completealltask.go +++ b/modules/warorder/api_completealltask.go @@ -87,7 +87,7 @@ func (this *apiComp) CompleteAllTask(session comm.IUserSession, req *pb.Warorder } } - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + if condis, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil { return } diff --git a/modules/warorder/api_completetask.go b/modules/warorder/api_completetask.go index 6aaf0bf86..eb0b3f8c5 100644 --- a/modules/warorder/api_completetask.go +++ b/modules/warorder/api_completetask.go @@ -117,7 +117,7 @@ func (this *apiComp) CompleteTask(session comm.IUserSession, req *pb.WarorderCom } } - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Parameter); err != nil { + if condis, err = this.module.ModuleBuried.CheckCondition(session, conf.Parameter); err != nil { return } diff --git a/modules/weektask/api_Info.go b/modules/weektask/api_Info.go index 1ff28c71f..cbd3f0033 100644 --- a/modules/weektask/api_Info.go +++ b/modules/weektask/api_Info.go @@ -68,7 +68,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WeekTaskInfoReq) (e tasks = append(tasks, v.TypeId) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(), diff --git a/modules/weektask/api_receive.go b/modules/weektask/api_receive.go index a2bbd6074..0fda1e4ac 100644 --- a/modules/weektask/api_receive.go +++ b/modules/weektask/api_receive.go @@ -90,7 +90,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR tasks = append(tasks, v.TypeId) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil { + if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, Title: pb.ErrorCode_ExternalModule.ToString(), diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go index 31b43132e..aa6d03905 100644 --- a/modules/wtask/api_accept.go +++ b/modules/wtask/api_accept.go @@ -70,7 +70,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) ( wtask.Accepts = append(wtask.Accepts, req.Tid) update["activations"] = wtask.Activations update["accepts"] = wtask.Accepts - if errdata = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), conf.Completetask...); err != nil { + if errdata = this.module.ModuleBuried.ActiveCondition(session, conf.Completetask...); err != nil { return } diff --git a/modules/wtask/api_completecondi.go b/modules/wtask/api_completecondi.go index d9013476d..798c82271 100644 --- a/modules/wtask/api_completecondi.go +++ b/modules/wtask/api_completecondi.go @@ -77,7 +77,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WTaskCompl return } if len(conf.Completetask) > 0 { - if progress, err = this.module.ModuleBuried.FinishConditionAndCheck(session.GetUserId(), []int32{req.CondiId}, conf.Completetask...); err != nil { + if progress, err = this.module.ModuleBuried.FinishConditionAndCheck(session, []int32{req.CondiId}, conf.Completetask...); err != nil { this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index f18594ce8..423e06e1f 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -64,7 +64,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( } if len(conf.Completetask) > 0 { - if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Completetask...); err != nil { + if condis, err = this.module.ModuleBuried.CheckCondition(session, conf.Completetask...); err != nil { this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 50b45e14e..91e6875a1 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -129,7 +129,7 @@ func (this *WTask) BuriedsNotify(session comm.IUserSession, condis []*pb.ConIPro } } if needcheck { //校验有变化的任务 的完成条件 - if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil { + if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil { this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) return } @@ -420,7 +420,7 @@ func (this *WTask) InquireTaskProgress(session comm.IUserSession, tasks ...int32 } } if len(checkcondls) > 0 { - if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil { + if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil { this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, @@ -610,7 +610,7 @@ func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask } } if len(checkcondls) > 0 { - if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil { + if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil { this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()}) errdata = &pb.ErrorData{ Code: pb.ErrorCode_ExternalModule, @@ -769,7 +769,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa } if changeAccept { - if errdata = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil { + if errdata = this.ModuleBuried.ActiveCondition(session, condiIds...); err != nil { return } progress, errdata = this.pushtaskprogress(session, wtask, ispush)