diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 99460e6f5..243c649ec 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -47,12 +47,14 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe if curTaskConf.Group != req.GroupId { code = pb.ErrorCode_WorldtaskGroupIdNosame data.Title = code.ToString() + data.Message = fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId) return } if curTaskConf.DeliverNpc == 0 { code = pb.ErrorCode_WorldtaskNoProcess data.Title = code.ToString() + data.Message = "配置DeliverNpc字段是0" return } @@ -68,6 +70,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe userTask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { code = pb.ErrorCode_DBError + data.Title = code.ToString() + data.Message = err.Error() return } if userTask.Uid == "" { @@ -76,9 +80,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe // 前置任务ID 只有世界任务才校验前置 if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) { - this.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key}) code = pb.ErrorCode_WorldtaskLastUnFinished - this.sendMsg(session, WorldtaskSubtypeFinish, rsp) + data.Title = code.ToString() + data.Message = fmt.Sprintf("任务[%v]的前置任务 [%v] 未完成", curTaskConf.Key, curTaskConf.Ontxe) return } @@ -90,6 +94,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe log.Field{Key: "taskId", Value: req.TaskId}, ) this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf) + this.sendMsg(session, WorldtaskSubtypeFinish, rsp) return } } @@ -102,7 +107,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe for _, condId := range curTaskConf.Completetask { if v, ok := userTask.CurrentTask[req.GroupId]; ok { if _, ok := utils.Findx(v.CondiIds, condId); !ok { - // + // conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId) if err == nil && len(conIds) > 0 { condiFlag = true @@ -120,16 +125,12 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe data.Title = code.ToString() return } - this.sendMsg(session, WorldtaskSubtypeFinish, rsp) + // 完成任务 if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { code = pb.ErrorCode_WorldtaskFinish - 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: "err", Value: err.Error()}, - ) + data.Title = code.ToString() + data.Message = err.Error() return } // 发奖