modules/worldtask/api_accept.go

@@ -84,14 +84,13 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 	//判断是否要结束任务
 	if ((len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) || len(curTaskConf.Completetask) == 0) &&
 		curTaskConf.DeliverNpc == 0 {
-		a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
 		//结束任务
 		a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
 		a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
 	} else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 {
-		var flag bool
 		conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
 		if err == nil {
+			var flag bool
 			for _, cond := range conds {
 				if cond.State == pb.BuriedItemFinishState_buried_finish {
 					flag = true
@@ -101,15 +100,11 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 					break
 				}
 			}
+			if flag {
+				a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
+				a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
+			}
 		}
-
-		if flag {
-			a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
-			a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
-			a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
-			return
-		}
-		a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
 	} else {
 		// 已完成的任务条件
 		conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
@@ -124,8 +119,9 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 			}
 			a.module.ModuleBuried.ActiveCondition(uid, unfinishCondIds...)
 		}
-		a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
 	}
 
+	a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
+
 	return
 }

modules/worldtask/api_finish.go

@@ -93,8 +93,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 				log.Field{Key: "uid", Value: uid},
 				log.Field{Key: "taskId", Value: req.TaskId},
 			)
-			this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 			this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
+			this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 			return
 		}
 	}
@@ -160,8 +160,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 			ic.TaskComplete(session, req.TaskId)
 		}
 	}
-	this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
+
 	this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
+	this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 	return
 }