战斗任务

modules/worldtask/api_finish.go

@@ -72,24 +72,31 @@ 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
-			this.module.Debugf("任务条件:%v 未完成", curTaskConf.Completetask)
-			return
-		}
-	}
 
+	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 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{
 		GroupId: req.GroupId,
@@ -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{
-		NextTaskId: curTaskConf.IdAfter,
+		NextTaskId: nextTaskId,
 	}); err != nil {
 		code = pb.ErrorCode_SystemError
 	}