From f54b48bb145db3c5ced2c780e806610cd81f313f Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 31 Mar 2023 20:13:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A5=BD=E5=8F=8B?= =?UTF-8?q?=E9=A9=B1=E9=80=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_expulsion.go | 78 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index 9d383dad5..22c67610b 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -21,8 +21,8 @@ func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeE ///练功请求 驱逐 func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode, data proto.Message) { var ( - err error - ok bool + err error + // ok bool room *pb.DBPracticeRoom froom *pb.DBPracticeRoom pillar *pb.DBPracticePillar @@ -180,44 +180,44 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls defer func() { this.module.PutUserSession(_session) }() - if _session, ok = this.module.GetUserSession(pillar.Uid); ok { - if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { - return - } - if code = this.module.DispenseRes(_session, append(ants1, ants2...), true); code != pb.ErrorCode_Success { - return - } - if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { - return - } - } else { - if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { - return - } - if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { - return - } - res := make([]*pb.UserAssets, 0) - for _, v := range ants1 { - res = append(res, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } - for _, v := range ants2 { - res = append(res, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } - this.module.mail.SendNewMail(&pb.DBMailData{ - Cid: "Drivethemail", - CreateTime: uint64(configure.Now().Unix()), - Items: res, - }, pillar.Uid) + // if _session, ok = this.module.GetUserSession(pillar.Uid); ok { + // if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { + // return + // } + // if code = this.module.DispenseRes(_session, append(ants1, ants2...), true); code != pb.ErrorCode_Success { + // return + // } + // if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { + // return + // } + // } else { + if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { + return } + if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { + return + } + res := make([]*pb.UserAssets, 0) + for _, v := range ants1 { + res = append(res, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + }) + } + for _, v := range ants2 { + res = append(res, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + }) + } + this.module.mail.SendNewMail(&pb.DBMailData{ + Cid: "Drivethemail", + CreateTime: uint64(configure.Now().Unix()), + Items: res, + }, pillar.Uid) + // } froom.Knapsack[pillar.Teacher] = 0 froom.Knapsack[pillar.Prop] = 0 From 28f532599deedc8191cf45ff9d865ce55b3ab367 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 31 Mar 2023 20:16:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=AD=A6=E9=A6=86?= =?UTF-8?q?=E9=A9=B1=E9=80=90=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_expulsion.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index 22c67610b..8f0101dff 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -21,8 +21,8 @@ func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeE ///练功请求 驱逐 func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode, data proto.Message) { var ( - err error - // ok bool + err error + ok bool room *pb.DBPracticeRoom froom *pb.DBPracticeRoom pillar *pb.DBPracticePillar @@ -178,8 +178,11 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls } } defer func() { - this.module.PutUserSession(_session) + if ok { //在线直接推送消息 + this.module.PutUserSession(_session) + } }() + _session, ok = this.module.GetUserSession(pillar.Uid) // if _session, ok = this.module.GetUserSession(pillar.Uid); ok { // if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { // return From 719c2cde42ec605daf2d1e07e03f7044fbe33ac4 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 31 Mar 2023 20:25:17 +0800 Subject: [PATCH 3/3] update reward --- modules/worldtask/api_finish.go | 40 +++++++++++++--------------- modules/worldtask/model_worldtask.go | 22 +++++++-------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 7dd8143c1..63d51799c 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -203,32 +203,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe ) return } - + // 发奖 + if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { + this.module.Error("资源发放", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "groupId", Value: req.GroupId}, + log.Field{Key: "taskId", Value: req.TaskId}, + log.Field{Key: "reword", Value: curTaskConf.Reword}, + log.Field{Key: "code", Value: code}, + ) + } + //判断是否配置了通知module - if len(curTaskConf.Module) == 0 { - // 发奖 - if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { - this.module.Error("资源发放", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "groupId", Value: req.GroupId}, - log.Field{Key: "taskId", Value: req.TaskId}, - log.Field{Key: "reword", Value: curTaskConf.Reword}, - log.Field{Key: "code", Value: code}, - ) + for _, m := range curTaskConf.Module { + i, err := this.service.GetModule(core.M_Modules(m)) + if err != nil { + this.module.Errorln(err) + continue } - } else { - for _, m := range curTaskConf.Module { - i, err := this.service.GetModule(core.M_Modules(m)) - if err != nil { - this.module.Errorln(err) - continue - } - if ic, ok := i.(comm.ITaskComplete); ok { - ic.TaskComplete(session, req.TaskId) - } + if ic, ok := i.(comm.ITaskComplete); ok { + ic.TaskComplete(session, req.TaskId) } } + } //判断任务是否已完成 diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index e3fba5c7c..ad8e124a2 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -273,20 +273,18 @@ func (this *ModelWorldtask) taskFinish(session comm.IUserSession, groupId, taskI return } + this.moduleWorldtask.DispenseRes(session, curTaskConf.Reword, true) //判断是否配置了通知module - if len(curTaskConf.Module) == 0 { - this.moduleWorldtask.DispenseRes(session, curTaskConf.Reword, true) - } else { - for _, m := range curTaskConf.Module { - i, err := this.service.GetModule(core.M_Modules(m)) - if err != nil { - this.moduleWorldtask.Errorln(err) - continue - } + for _, m := range curTaskConf.Module { + i, err := this.service.GetModule(core.M_Modules(m)) + if err != nil { + this.moduleWorldtask.Errorln(err) + continue + } - if ic, ok := i.(comm.ITaskComplete); ok { - ic.TaskComplete(session, taskId) - } + if ic, ok := i.(comm.ITaskComplete); ok { + ic.TaskComplete(session, taskId) } } + }