From 88711edbd34c641bc004a475560d1a9a8ed02337 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 12 Dec 2023 11:31:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=9B=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/api_create.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 6cbfbcb1f..42ce1efb3 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -86,15 +86,6 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e update["avatar"] = globalConf.GirlHeadPortrait } - //初始化创角资源 - if val, err := this.module.configure.GetGlobalInitConf(); err == nil { - for _, v := range val.GetDataList() { - res = append(res, v.Var...) - } - if errdata, award = this.module.DispenseAtno(session, res, true); errdata != nil { - this.module.Error("发放资源失败!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: errdata.String()}) - } - } if err := this.module.modelUser.Change(session.GetUserId(), update); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -107,6 +98,16 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e ) return } + //初始化创角资源 + if val, err := this.module.configure.GetGlobalInitConf(); err == nil { + for _, v := range val.GetDataList() { + res = append(res, v.Var...) + } + if errdata, award = this.module.DispenseAtno(session, res, true); errdata != nil { + this.module.Error("发放资源失败!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: errdata.String()}) + } + } + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype72, 1)) session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{ NickName: req.NickName, From 27893c63f7ccc048a41b3b90373af990605b54e1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 12 Dec 2023 14:51:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/wtask/api_finish.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 571352732..8ab129925 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -24,6 +24,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( completesMap map[int32]struct{} = make(map[int32]struct{}) err error isfinsh bool + tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ok bool ) if errdata = this.FinishCheck(session, req); errdata != nil { @@ -131,6 +132,10 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( wtask.Completes = append(wtask.Completes, req.Tid) } + if conf.Des == 1 { + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype240, 1)) + } + if conf.Des == 1 && conf.IdAfter != 0 { //日常任务 自动接取下一个 wtask.Activations = append(wtask.Activations, conf.IdAfter) session.SendMsg(string(this.module.GetType()), "activationschange", &pb.WTaskActivationsChangePush{Activations: wtask.Activations}) @@ -154,6 +159,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeWorldtaskid, req.Tid) this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskFinishReq", award) this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WTaskFinishReq", conf.TaskendRemoveitem) + this.module.ModuleBuried.TriggerBuried(session, tasks...) }) return }