From b3e16d641e22cafead85880708ba1fb4c5cd3f9e Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 29 May 2023 17:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9module=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/friend/api_cross_blacklist.go | 2 +- modules/friend/api_cross_del.go | 2 +- modules/friend/api_cross_delblack.go | 2 +- modules/friend/api_cross_refuse.go | 2 +- modules/friend/api_cross_search.go | 2 +- modules/linestory/api.go | 6 +++--- modules/linestory/api_chapter.go | 4 ++-- modules/linestory/api_maintask.go | 6 +++--- modules/linestory/api_receive.go | 16 ++++++++-------- modules/task/api_activelist.go | 2 +- modules/worldtask/api_accept.go | 25 +++---------------------- modules/worldtask/module.go | 7 ++++--- 12 files changed, 29 insertions(+), 47 deletions(-) diff --git a/modules/friend/api_cross_blacklist.go b/modules/friend/api_cross_blacklist.go index 443609c00..d6d50e3fd 100644 --- a/modules/friend/api_cross_blacklist.go +++ b/modules/friend/api_cross_blacklist.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -//黑名单列表 +// 黑名单列表 func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode) { return } diff --git a/modules/friend/api_cross_del.go b/modules/friend/api_cross_del.go index f598256e4..4950e8352 100644 --- a/modules/friend/api_cross_del.go +++ b/modules/friend/api_cross_del.go @@ -7,7 +7,7 @@ import ( "go_dreamfactory/utils" ) -//删除好友 +// 删除好友 func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError diff --git a/modules/friend/api_cross_delblack.go b/modules/friend/api_cross_delblack.go index 56339aee4..c262d98be 100644 --- a/modules/friend/api_cross_delblack.go +++ b/modules/friend/api_cross_delblack.go @@ -7,7 +7,7 @@ import ( "go_dreamfactory/utils" ) -//删除黑名单 +// 删除黑名单 func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError diff --git a/modules/friend/api_cross_refuse.go b/modules/friend/api_cross_refuse.go index 286c7e04f..d9c775002 100644 --- a/modules/friend/api_cross_refuse.go +++ b/modules/friend/api_cross_refuse.go @@ -17,7 +17,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse return } -//单个/批量拒绝 +// 单个/批量拒绝 func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return diff --git a/modules/friend/api_cross_search.go b/modules/friend/api_cross_search.go index 78938d943..3117a679f 100644 --- a/modules/friend/api_cross_search.go +++ b/modules/friend/api_cross_search.go @@ -7,7 +7,7 @@ import ( "go_dreamfactory/utils" ) -//搜索 +// 搜索 func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode) { if req.NickName == "" { code = pb.ErrorCode_FriendSearchNameEmpty diff --git a/modules/linestory/api.go b/modules/linestory/api.go index 4321b4d07..63e3aed78 100644 --- a/modules/linestory/api.go +++ b/modules/linestory/api.go @@ -13,13 +13,13 @@ const ( type apiComp struct { modules.MCompGate - service core.IService - moduleLinestory *ModuleLinestory + service core.IService + module *ModuleLinestory } func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.MCompGate.Init(service, module, comp, options) - this.moduleLinestory = module.(*ModuleLinestory) + this.module = module.(*ModuleLinestory) this.service = service return } diff --git a/modules/linestory/api_chapter.go b/modules/linestory/api_chapter.go index 3cd18431b..4372356bb 100644 --- a/modules/linestory/api_chapter.go +++ b/modules/linestory/api_chapter.go @@ -12,12 +12,12 @@ func (this *apiComp) ChapterCheck(session comm.IUserSession, req *pb.LinestoryCh func (this *apiComp) Chapter(session comm.IUserSession, req *pb.LinestoryChapterReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() - taskMap := this.moduleLinestory.modelLinestory.getChapters(uid) + taskMap := this.module.modelLinestory.getChapters(uid) rsp := &pb.LinestoryChapterResp{ TaskChapter: taskMap, } - if err := session.SendMsg(string(this.moduleLinestory.GetType()), LinestorySubTypeChapter, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), LinestorySubTypeChapter, rsp); err != nil { code = pb.ErrorCode_SystemError } return diff --git a/modules/linestory/api_maintask.go b/modules/linestory/api_maintask.go index 43d74668a..ba377d29e 100644 --- a/modules/linestory/api_maintask.go +++ b/modules/linestory/api_maintask.go @@ -9,7 +9,7 @@ import ( // 支线剧情-我的主线任务 func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (code pb.ErrorCode) { if req.ChapterId == 0 { - this.moduleLinestory.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) + this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError } return @@ -22,13 +22,13 @@ func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMainta uid := session.GetUserId() // 我的主线任务 - list := this.moduleLinestory.modelLinestory.getMaintasks(uid, req.ChapterId) + list := this.module.modelLinestory.getMaintasks(uid, req.ChapterId) rsp := &pb.LinestoryMaintaskResp{ List: list, } - if err := session.SendMsg(string(this.moduleLinestory.GetType()), LinestorySubTypeMaintask, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), LinestorySubTypeMaintask, rsp); err != nil { code = pb.ErrorCode_SystemError return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index 0c0e987fc..14ea15f43 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -11,7 +11,7 @@ import ( // 章节奖励领取 func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryReceiveReq) (code pb.ErrorCode) { if req.ChapterId == 0 { - this.moduleLinestory.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) + this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError } return @@ -22,27 +22,27 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive return } uid := session.GetUserId() - conf := this.moduleLinestory.configure.getChapterCfgById(req.ChapterId) + conf := this.module.configure.getChapterCfgById(req.ChapterId) if conf == nil { - this.moduleLinestory.Error("配置未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}) + this.module.Error("配置未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}) code = pb.ErrorCode_ConfigNoFound return } - if err := this.moduleLinestory.modelLinestory.receive(uid, req.ChapterId); err != nil { + if err := this.module.modelLinestory.receive(uid, req.ChapterId); err != nil { var customErr = new(comm.CustomError) if errors.As(err, &customErr) { code = customErr.Code } else { code = pb.ErrorCode_DBError } - this.moduleLinestory.Error("章节奖励领取失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "code", Value: code}) + this.module.Error("章节奖励领取失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "code", Value: code}) return } //发奖 - if code = this.moduleLinestory.DispenseRes(session, conf.Reward, true); code != pb.ErrorCode_Success { - this.moduleLinestory.Error("奖励发放失败", + if code = this.module.DispenseRes(session, conf.Reward, true); code != pb.ErrorCode_Success { + this.module.Error("奖励发放失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "reward", Value: conf.Reward}, ) return @@ -52,7 +52,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive ChapterId: req.ChapterId, UserAssets: utils.ConvertReward(conf.Reward...), } - if err := session.SendMsg(string(this.moduleLinestory.GetType()), LinestorySubTypeReceive, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), LinestorySubTypeReceive, rsp); err != nil { code = pb.ErrorCode_SystemError } return diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 98607c2fd..bdfc0e416 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -//活跃度列表 +// 活跃度列表 func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode) { if req.TaskTag <= 0 || req.TaskTag > 2 { code = pb.ErrorCode_TaskTagEmpty diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index 8177699b8..a84115ab7 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -85,30 +85,11 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) } else { - // 检查任务条件是否已完成 - rsp.CondiIds = a.checkCurrentCompleteCond(uid, curTaskConf.Completetask, myWorldtask) + // 已完成的任务条件 + rsp.CondiIds = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) } a.sendMsg(session, WorldtaskSubtypeAccept, rsp) - return -} - -// 检查当前任务的完成条件 -func (this *apiComp) checkCurrentCompleteCond(uid string, completeCondIds []int32, userTask *pb.DBWorldtask) (condIds []int32) { - - for _, condId := range completeCondIds { - if condId == 0 { - continue - } - - if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { - iwt, ok := m.(comm.IRtask) - if ok { - if mc := iwt.CheckCondi(uid, condId); mc == pb.ErrorCode_Success { - condIds = append(condIds, condId) - } - } - } - } + a.module.ModuleBuried.ActiveCondition(uid, curTaskConf.Completetask...) return } diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 8dd214fe7..9fd757006 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/event" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" @@ -56,12 +57,12 @@ func (this *Worldtask) Start() (err error) { } func (this *Worldtask) TCondFinishNotify(uid string, conids []int32) { - session, ok:= this.GetUserSession(uid) - if !ok{ + session, ok := this.GetUserSession(uid) + if !ok { return } this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condIds", Value: conids}) - + // 玩家世界任务 userTask, err := this.modelWorldtask.getWorldtask(uid) if err != nil {