战斗任务

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