战斗任务

This commit is contained in:
wh_zcy 2022-11-11 17:56:21 +08:00
parent 7fb01fa819
commit a4458a65df

View File

@ -72,23 +72,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
} }
} }
if curTaskConf.Completetask != 0 { var nextTaskId int32
if code = this.module.ModuleRtask.CheckCondi(uid, curTaskConf.Completetask); code != pb.ErrorCode_Success {
code = pb.ErrorCode_WorldtaskNoComplete finishCall := func() {
this.module.Debugf("任务条件:%v 未完成", curTaskConf.Completetask) nextTaskId = curTaskConf.IdAfter
// 完成任务
if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil {
code = pb.ErrorCode_WorldtaskFinish
return return
} }
// 发奖
if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success {
this.module.Errorf("资源发放失败 err:%v", err)
}
} }
// 完成任务 if curTaskConf.Completetask != 0 {
if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { if c := this.module.ModuleRtask.CheckCondi(uid, curTaskConf.Completetask); c == pb.ErrorCode_Success {
code = pb.ErrorCode_WorldtaskFinish // code = pb.ErrorCode_WorldtaskNoComplete
return // this.module.Debugf("任务条件:%v 未完成", curTaskConf.Completetask)
} // return
finishCall()
// 发奖 }
if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { } else {
this.module.Errorf("资源发放失败 err:%v", err) finishCall()
} }
rsp := &pb.WorldtaskFinishResp{ rsp := &pb.WorldtaskFinishResp{
@ -102,7 +109,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
// 任务完成推送 // 任务完成推送
if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{ if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{
NextTaskId: curTaskConf.IdAfter, NextTaskId: nextTaskId,
}); err != nil { }); err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
} }