Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/worldtask/api_accept.go

@@ -92,9 +92,13 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 				} else {
 					task.NpcStatus = 1
 					for _, cid := range curTaskConf.Completetask {
-						task.Conds = append(task.Conds, &pb.ConIProgress{
-							Conid: cid,
-						})
+						for _, cond := range task.Conds {
+							if cid != cond.Conid {
+								task.Conds = append(task.Conds, &pb.ConIProgress{
+									Conid: cid,
+								})
+							}
+						}
 					}
 				}
 				break
@@ -110,9 +114,13 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 				}
 
 				for _, cid := range curTaskConf.Completetask {
-					task.Conds = append(task.Conds, &pb.ConIProgress{
-						Conid: cid,
-					})
+					for _, cond := range task.Conds {
+						if cid != cond.Conid {
+							task.Conds = append(task.Conds, &pb.ConIProgress{
+								Conid: cid,
+							})
+						}
+					}
 				}
 				tasks.TaskMap[task.TaskId] = task
 			}
@@ -127,9 +135,13 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 			NpcStatus: 1, //接取
 		}
 		for _, cid := range curTaskConf.Completetask {
-			task.Conds = append(task.Conds, &pb.ConIProgress{
-				Conid: cid,
-			})
+			for _, cond := range task.Conds {
+				if cid != cond.Conid {
+					task.Conds = append(task.Conds, &pb.ConIProgress{
+						Conid: cid,
+					})
+				}
+			}
 		}
 		tasks.TaskMap[req.TaskId] = task
 		myWorldtask.CurrentTasks[curTaskConf.Group] = tasks