liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
wh_zcy 2023-06-15 23:53:47 +08:00
parent 8741b5fecd
commit 59ad039502
1 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
modules/worldtask/api_accept.go
View File

@ -92,60 +92,35 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
} else { } else {
task.NpcStatus = 1 task.NpcStatus = 1
for _, cid := range curTaskConf.Completetask { for _, cid := range curTaskConf.Completetask {
for _, cond := range task.Conds { task.Conds = append(task.Conds, &pb.ConIProgress{
if cid != cond.Conid { Conid: cid,
task.Conds = append(task.Conds, &pb.ConIProgress{ })
Conid: cid,
})
}
}
} }
} }
break 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{}{ update := map[string]interface{}{
"currentTasks": myWorldtask.CurrentTasks, "currentTasks": myWorldtask.CurrentTasks,