diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index 5e58e5af6..2857f3ad9 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -92,60 +92,35 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) } else { task.NpcStatus = 1 for _, cid := range curTaskConf.Completetask { - for _, cond := range task.Conds { - if cid != cond.Conid { - task.Conds = append(task.Conds, &pb.ConIProgress{ - Conid: cid, - }) - } - } + task.Conds = append(task.Conds, &pb.ConIProgress{ + Conid: cid, + }) + } } break - } else { - if tasks.TaskMap == nil { - tasks.TaskMap = make(map[int32]*pb.Worldtask) - } - - task := &pb.Worldtask{ - TaskId: req.TaskId, - TaskType: curTaskConf.Des, - NpcStatus: 1, //接取 - } - - for _, cid := range curTaskConf.Completetask { - for _, cond := range task.Conds { - if cid != cond.Conid { - task.Conds = append(task.Conds, &pb.ConIProgress{ - Conid: cid, - }) - } - } - } - tasks.TaskMap[task.TaskId] = task } } - } else { - tasks = &pb.Worldtasks{ - TaskMap: make(map[int32]*pb.Worldtask), - } - task := &pb.Worldtask{ - TaskId: req.TaskId, - TaskType: curTaskConf.Des, - NpcStatus: 1, //接取 - } - for _, cid := range curTaskConf.Completetask { - 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 - } + } + // else { + // tasks = &pb.Worldtasks{ + // TaskMap: make(map[int32]*pb.Worldtask), + // } + // task := &pb.Worldtask{ + // TaskId: req.TaskId, + // TaskType: curTaskConf.Des, + // NpcStatus: 1, //接取 + // } + + // for _, cid := range curTaskConf.Completetask { + // task.Conds = append(task.Conds, &pb.ConIProgress{ + // Conid: cid, + // }) + // } + + // tasks.TaskMap[req.TaskId] = task + // myWorldtask.CurrentTasks[curTaskConf.Group] = tasks + // } update := map[string]interface{}{ "currentTasks": myWorldtask.CurrentTasks,