From ca95f7e02d55931c0f049655fcdf56f6e0eab77c Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 26 Jun 2023 17:46:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/model_task.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/smithy/model_task.go b/modules/smithy/model_task.go index efe7e25fb..adf672a50 100644 --- a/modules/smithy/model_task.go +++ b/modules/smithy/model_task.go @@ -126,10 +126,14 @@ func (this *modelTask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { task.Received = 1 } } else { - newTask = append(newTask, &pb.TujianTask{ + nt := &pb.TujianTask{ TaskId: k, Cond: v, - }) + } + if v.State == pb.BuriedItemFinishState_buried_finish { + nt.Received = 1 + } + newTask = append(newTask, nt) } } dt.Tasks = append(dt.Tasks, newTask...) From c700e565a4b40329a0bad6897666c79abd208a7b Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 26 Jun 2023 17:46:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=A9=E6=95=B0=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/api_login.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 340a3052f..cd9bf0d6e 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -128,7 +128,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err if this.module.modelUser.isLoginFirst(lastLoginTime) { this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix()))) - + go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1)) this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime) // 清理点赞 this.module.ModuleFriend.ResetFriend(user.Uid) @@ -150,14 +150,15 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err } else { rsp.Ex = expand } - } else { + } else { //新号 rsp.Ex = &pb.DBUserExpand{} this.module.modelSign.UserSign(session) + go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1)) } this.module.RecoverUserPsStart(user.Uid) // 日常登录任务 - go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1)) + go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype7, 1)) this.module.ModulePrivilege.CheckDailyPrivilegeMail(session) rsp.Data = user