diff --git a/comm/imodule.go b/comm/imodule.go index 994100efd..776465207 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -357,7 +357,7 @@ type ( // 设置工会活跃度 BingoSetActivity(session IUserSession, activity int32) error // 任务条件达成通知 - TaskcondNotify(uid string, condIds []int32) error + // TaskcondNotify(uid string, condIds []int32) error // 红点 IReddot } diff --git a/modules/rtask/api_tasktest.go b/modules/rtask/api_tasktest.go index f641a0046..e3c3b0dc8 100644 --- a/modules/rtask/api_tasktest.go +++ b/modules/rtask/api_tasktest.go @@ -19,7 +19,7 @@ func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (cod rsp := &pb.RtaskTestResp{Flag: true, RtaskType: req.RtaskType} // 校验 if req.CondiId != 0 { - condIds, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), req.CondiId) + condIds, _, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), req.CondiId) if err == nil && len(condIds) > 0 { rsp.Flag = false } diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index 81c9e883a..61fa613a2 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -10,6 +10,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" @@ -60,6 +61,7 @@ func (this *Sociaty) OnInstallComp() { this.modelSociatyLog = this.RegisterComp(new(ModelSociatyLog)).(*ModelSociatyLog) this.modelSociatyBoss = this.RegisterComp(new(ModelSociatyBoss)).(*ModelSociatyBoss) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) + event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) } func (this *Sociaty) Start() (err error) { @@ -239,15 +241,14 @@ type TaskParams struct { } // 任务条件达成通知 -func (this *Sociaty) TaskcondNotify(uid string, condIds []int32) error { - // log.Debug("公会任务", - // log.Field{Key: "uid", Value: uid}, - // log.Field{Key: "sociatyId", Value: sociatyId}, - // log.Field{Key: "condId", Value: condId}) +func (this *Sociaty) TCondFinishNotify(uid string, condIds []int32) { + log.Debug("公会任务", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "condIds", Value: condIds}) sociaty := this.modelSociaty.getUserSociaty(uid) if sociaty == nil { - return fmt.Errorf("公会未找到 uid:%v condIds:%v", uid, condIds) + return } sociatyId := sociaty.Id @@ -267,7 +268,7 @@ func (this *Sociaty) TaskcondNotify(uid string, condIds []int32) error { } } if !flag { - return nil + return } update := map[string]interface{}{ @@ -279,9 +280,9 @@ func (this *Sociaty) TaskcondNotify(uid string, condIds []int32) error { comm.Service_Worker, string(comm.Rpc_ModuleSociatyTask), &TaskParams{SociatyId: sociatyId, Uid: uid, Data: update}, &pb.EmptyResp{}) if err != nil { - return err + return } - return nil + return } func (this *Sociaty) RpcUpdateUserTask(ctx context.Context, p *TaskParams, reply *pb.EmptyResp) error { diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index 16235d0a6..c57cf1e86 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -90,7 +90,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) } else { // 已完成的任务条件 - rsp.CondiIds, err = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) + rsp.CondiIds, _, err = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) if err == nil { a.module.ModuleBuried.ActiveCondition(uid, utils.NoContain(rsp.CondiIds, curTaskConf.Completetask)...) } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 500370c47..d73d191f2 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -45,7 +45,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC myWorldtask.Uid = uid wt := myWorldtask.CurrentTask[req.GroupId] - condIds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) + condIds, _, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) if err == nil && len(condIds) > 0 { wt.CondiIds = append(wt.CondiIds, condIds...) } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 7dfd74843..f8aa62b99 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -108,7 +108,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe if v, ok := userTask.CurrentTask[req.GroupId]; ok { if _, ok := utils.Findx(v.CondiIds, condId); !ok { // - conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId) + conIds, _, err := this.module.ModuleBuried.CheckCondition(uid, condId) if err == nil && len(conIds) > 0 { condiFlag = true } else { @@ -206,7 +206,7 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT } } - condIds, err := this.module.ModuleBuried.CheckCondition(uid, condiId) + condIds, _, err := this.module.ModuleBuried.CheckCondition(uid, condiId) if err == nil && len(condIds) > 0 { nwt.CondiIds = condIds userTask.CurrentTask[nextTaskConf.Group] = nwt diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index d5920ca3c..1078c4000 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -227,7 +227,7 @@ func (this *ModelWorldtask) updateCheckCond(uid string, userLv int32, userTask * // } // } // } - condIds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId) + condIds, _, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId) if err == nil && len(condIds) > 0 { nwt.CondiIds = condIds userTask.CurrentTask[nextTaskConf.Group] = nwt