diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index aeb819b8b..b3f328f10 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -87,8 +87,11 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) } else { // 已完成的任务条件 - rsp.CondiIds = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) - a.module.ModuleBuried.ActiveCondition(uid, utils.NoContain(rsp.CondiIds, 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)...) + } + } a.sendMsg(session, WorldtaskSubtypeAccept, rsp) diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 275835ac6..2f47b84be 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -64,8 +64,8 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC // } // } // } - condIds := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) - if len(condIds) > 0 { + 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 41b90c0f3..0d99f7fdf 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -95,9 +95,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe condiFlag bool ) for _, condId := range curTaskConf.Completetask { - conIds := this.module.ModuleBuried.CheckCondition(uid, condId) + conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId) // if this.module.modelWorldtask.checkCondi(uid, condId) { - if len(conIds) > 0 { + if err == nil && len(conIds) > 0 { condiFlag = true } else { condiFlag = false @@ -215,8 +215,8 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT // } // } // } - condIds := this.module.ModuleBuried.CheckCondition(uid, condiId) - if len(condIds) > 0 { + condIds, err := this.module.ModuleBuried.CheckCondition(uid, condiId) + if err == nil && len(condIds) > 0 { nwt.CondiIds = condIds userTask.CurrentTask[nextTaskConf.Group] = nwt update["currentTask"] = userTask.CurrentTask diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index 7756a7e28..d5920ca3c 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -227,8 +227,8 @@ func (this *ModelWorldtask) updateCheckCond(uid string, userLv int32, userTask * // } // } // } - condIds := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId) - if len(condIds) > 0 { + condIds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId) + if err == nil && len(condIds) > 0 { nwt.CondiIds = condIds userTask.CurrentTask[nextTaskConf.Group] = nwt update["currentTask"] = userTask.CurrentTask