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

支持当前有多任务并行

Browse Source
This commit is contained in:
wh_zcy 2023-06-05 19:02:25 +08:00
parent c5f69fd093
commit 06e57e6650
7 changed files with 631 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/worldtask/api_accept.go
View File

@ -76,17 +76,37 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
return return
} }
if myWorldtask.CurrentTask == nil { if myWorldtask.CurrentTaskMap == nil {
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask) myWorldtask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
if tasks, ok := myWorldtask.CurrentTaskMap[curTaskConf.Group]; ok {
for _, task := range tasks.TaskMap {
if req.TaskId == task.TaskId {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskNoAccept,
Title: pb.ErrorCode_WorldtaskNoAccept.ToString(),
Message: fmt.Sprintf("不能重复接取 taskId:%v", req.TaskId),
}
return
} else {
tasks.TaskMap[task.TaskId] = &pb.Worldtask{
TaskId: req.TaskId, TaskId: req.TaskId,
TaskType: curTaskConf.Des, TaskType: curTaskConf.Des,
NpcStatus: 1, //接取 NpcStatus: 1, //接取
} }
}
}
} else {
tasks.TaskMap[req.TaskId] = &pb.Worldtask{
TaskId: req.TaskId,
TaskType: curTaskConf.Des,
NpcStatus: 1, //接取
}
}
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTask": myWorldtask.CurrentTaskMap,
} }
if err := a.module.modelWorldtask.Change(uid, update); err != nil { if err := a.module.modelWorldtask.Change(uid, update); err != nil {

35
modules/worldtask/api_completetask.go
View File

@ -54,8 +54,17 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
return return
} }
myWorldtask.Uid = uid myWorldtask.Uid = uid
wt := myWorldtask.CurrentTask[req.GroupId]
wt, ok := myWorldtask.CurrentTaskMap[req.GroupId]
if !ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskGroupIdNosame,
Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(),
}
return
}
// 校验任务条件
conds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) conds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId)
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -64,19 +73,35 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
Message: comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error(), Message: comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error(),
} }
} }
// 设置当前任务的完成条件
for _, task := range wt.TaskMap {
if req.TaskId == task.TaskId {
for _, cond := range conds { for _, cond := range conds {
for _, exist_cond := range wt.Conds { for _, exist_cond := range task.Conds {
if cond.Conid == exist_cond.Conid { if cond.Conid == exist_cond.Conid {
continue continue
} }
wt.Conds = append(wt.Conds, cond) task.Conds = append(task.Conds, cond)
}
}
break
} }
} }
myWorldtask.CurrentTask[req.GroupId] = wt // for _, cond := range conds {
// for _, exist_cond := range wt.Tasks {
// if cond.Conid == exist_cond.Conid {
// continue
// }
// wt.Conds = append(wt.Conds, cond)
// }
// }
myWorldtask.CurrentTaskMap[req.GroupId] = wt
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTask": myWorldtask.CurrentTaskMap,
} }
if err := this.module.modelWorldtask.Change(uid, update); err != nil { if err := this.module.modelWorldtask.Change(uid, update); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{

19
modules/worldtask/api_mine.go
View File

@ -41,15 +41,16 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
return return
} }
if myWorldtask.CurrentTask == nil { if myWorldtask.CurrentTaskMap == nil {
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask) myWorldtask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
//查询当前所有任务组下的完成条件数据 //查询当前所有任务组下的完成条件数据
var condIds []int32 var condIds []int32
condMap := make(map[int32][]int32) condMap := make(map[int32][]int32)
for k, v := range myWorldtask.CurrentTask { for k, v := range myWorldtask.CurrentTaskMap {
cfg, err := this.module.configure.getWorldtaskById(v.TaskId) for _, t := range v.TaskMap {
cfg, err := this.module.configure.getWorldtaskById(t.TaskId)
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, Code: pb.ErrorCode_ConfigNoFound,
@ -65,6 +66,8 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
} }
} }
}
condIds = utils.RemoveDuplicate(condIds) condIds = utils.RemoveDuplicate(condIds)
this.module.modelWorldtask.updateRandomTask(uid, myWorldtask) this.module.modelWorldtask.updateRandomTask(uid, myWorldtask)
@ -80,13 +83,17 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
} }
for k, v := range condMap { for k, v := range condMap {
mw := myWorldtask.CurrentTask[k] if mw, ok := myWorldtask.CurrentTaskMap[k]; ok {
for _, task := range mw.TaskMap {
for _, cond := range conds { for _, cond := range conds {
if _, ok := utils.Findx(v, cond.Conid); ok { if _, ok := utils.Findx(v, cond.Conid); ok {
mw.Conds = append(mw.Conds, cond) task.Conds = append(task.Conds, cond)
} }
} }
} }
}
}
rsp := &pb.WorldtaskMineResp{ rsp := &pb.WorldtaskMineResp{
Task: myWorldtask, Task: myWorldtask,

128
modules/worldtask/model_worldtask.go
View File

@ -92,10 +92,10 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
} }
update["uid"] = task.Uid update["uid"] = task.Uid
wt := &pb.Worldtask{ // wt := &pb.Worldtask{
TaskId: taskId, // TaskId: taskId,
TaskType: taskConf.Des, // TaskType: taskConf.Des,
} // }
for _, tId := range task.TaskList { for _, tId := range task.TaskList {
if tId == taskId { if tId == taskId {
@ -105,17 +105,17 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
task.TaskList = append(task.TaskList, taskId) task.TaskList = append(task.TaskList, taskId)
if task.CurrentTask == nil { if task.CurrentTaskMap == nil {
task.CurrentTask = make(map[int32]*pb.Worldtask) task.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
//有下个任务 //有下个任务
if taskConf.IdAfter != 0 { // if taskConf.IdAfter != 0 {
wt.NpcStatus = 0 // wt.NpcStatus = 0
wt.DeliverNpc = 0 // wt.DeliverNpc = 0
task.CurrentTask[groupId] = wt // task.CurrentTasks[groupId] = wt
update["currentTask"] = task.CurrentTask // update["currentTask"] = task.CurrentTasks
} // }
update["taskList"] = task.TaskList update["taskList"] = task.TaskList
@ -142,8 +142,7 @@ func (this *ModelWorldtask) findNextTasks(parentTaskId int32) (taskIds []int32)
} }
// 更新当前任务的完成条件 // 更新当前任务的完成条件
func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, userTask *pb.DBWorldtask, nextTaskId int32) *pb.DBWorldtask { func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, userTask *pb.DBWorldtask, currentTaskId, nextTaskId int32) *pb.DBWorldtask {
//检查下个任务的完成条件
nextTaskConf, err := this.moduleWorldtask.configure.getWorldtaskById(nextTaskId) nextTaskConf, err := this.moduleWorldtask.configure.getWorldtaskById(nextTaskId)
if err != nil { if err != nil {
return nil return nil
@ -160,35 +159,48 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
return nil return nil
} }
if userTask.CurrentTask == nil { if userTask.CurrentTaskMap == nil {
userTask.CurrentTask = make(map[int32]*pb.Worldtask) userTask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
update := make(map[string]interface{}) update := make(map[string]interface{})
if (len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0) || nwt, ok := userTask.CurrentTaskMap[nextTaskConf.Group]
len(nextTaskConf.Completetask) == 0 {
wt := &pb.Worldtask{
TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
}
userTask.CurrentTask[nextTaskConf.Group] = wt
update["currentTask"] = userTask.CurrentTask
} else {
nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
if ok { if ok {
nwt.TaskId = nextTaskId // 删除
nwt.TaskType = nextTaskConf.Des delete(nwt.TaskMap, currentTaskId)
} else {
nwt = &pb.Worldtask{
TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
}
} }
userTask.CurrentTask[nextTaskConf.Group] = nwt nwt.TaskMap[nextTaskId] = &pb.Worldtask{
update["currentTask"] = userTask.CurrentTask TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
} }
update["currentTask"] = nwt
// if (len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0) ||
// len(nextTaskConf.Completetask) == 0 {
// wt := &pb.Worldtask{
// TaskId: nextTaskId,
// TaskType: nextTaskConf.Des,
// }
// userTask.CurrentTasks[nextTaskConf.Group] = wt
// } else {
// nwt, ok := userTask.CurrentTasks[nextTaskConf.Group]
// if ok {
// nwt.TaskId = nextTaskId
// nwt.TaskType = nextTaskConf.Des
// } else {
// nwt = &pb.Worldtask{
// TaskId: nextTaskId,
// TaskType: nextTaskConf.Des,
// }
// }
// userTask.CurrentTasks[nextTaskConf.Group] = nwt
// }
// update["currentTask"] = userTask.CurrentTasks
if len(update) > 0 { if len(update) > 0 {
if err := this.Change(uid, update); err != nil { if err := this.Change(uid, update); err != nil {
return nil return nil
@ -209,33 +221,31 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId in
nextTaskIds := this.findNextTasks(curTaskConf.Key) nextTaskIds := this.findNextTasks(curTaskConf.Key)
this.moduleWorldtask.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds}) this.moduleWorldtask.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds})
nextTask := make(map[int32]*pb.Worldtask) nextTask := make(map[int32]*pb.Worldtasks)
for _, next := range nextTaskIds { for _, next := range nextTaskIds {
ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, next) ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, curTaskConf.Key, next)
if ut != nil { if ut != nil {
for k, v := range ut.CurrentTask { for k, v := range ut.CurrentTaskMap {
nextTask[k] = &pb.Worldtask{ nextTask[k] = v
TaskId: v.TaskId,
}
} }
} }
} }
if nextTaskIds == nil { if nextTaskIds == nil {
nextTask[groupId] = &pb.Worldtask{} //表示没有下一个任务 nextTask[groupId] = &pb.Worldtasks{} //表示没有下一个任务
} }
if curTaskConf.IdAfter == 0 { if curTaskConf.IdAfter == 0 {
// 章节完成 // 章节完成
if _, ok := userTask.Chapters[groupId]; !ok { if _, ok := userTask.Chapters[groupId]; !ok {
delete(userTask.CurrentTask, groupId) delete(userTask.CurrentTaskMap, groupId)
if userTask.Chapters == nil { if userTask.Chapters == nil {
userTask.Chapters = make(map[int32]int32) userTask.Chapters = make(map[int32]int32)
} }
userTask.Chapters[groupId] = 1 //已解锁待领取 userTask.Chapters[groupId] = 1 //已解锁待领取
update := map[string]interface{}{ update := map[string]interface{}{
"chapters": userTask.Chapters, "chapters": userTask.Chapters,
"currentTask": userTask.CurrentTask, "currentTask": userTask.CurrentTaskMap,
} }
this.Change(session.GetUserId(), update) this.Change(session.GetUserId(), update)
} }
@ -337,10 +347,21 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
if err != nil || gwtd == nil { if err != nil || gwtd == nil {
continue continue
} }
myWorldtask.CurrentTask[gwtd.Group] = &pb.Worldtask{ if task, ok := myWorldtask.CurrentTaskMap[gwtd.Group]; ok {
task.TaskMap[v] = &pb.Worldtask{
TaskId: v, TaskId: v,
TaskType: gwtd.Des, TaskType: gwtd.Des,
} }
} else {
taskMap := make(map[int32]*pb.Worldtask)
taskMap[v] = &pb.Worldtask{
TaskId: v,
TaskType: gwtd.Des,
}
myWorldtask.CurrentTaskMap[gwtd.Group] = &pb.Worldtasks{
TaskMap: taskMap,
}
}
} }
update["daliyRefreshTime"] = configure.Now().Unix() update["daliyRefreshTime"] = configure.Now().Unix()
} }
@ -354,16 +375,29 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
if err != nil || gwtd == nil { if err != nil || gwtd == nil {
continue continue
} }
myWorldtask.CurrentTask[gwtd.Group] = &pb.Worldtask{
if task, ok := myWorldtask.CurrentTaskMap[gwtd.Group]; ok {
task.TaskMap[v] = &pb.Worldtask{
TaskId: v, TaskId: v,
TaskType: gwtd.Des, TaskType: gwtd.Des,
} }
} else {
taskMap := make(map[int32]*pb.Worldtask)
taskMap[v] = &pb.Worldtask{
TaskId: v,
TaskType: gwtd.Des,
} }
myWorldtask.CurrentTaskMap[gwtd.Group] = &pb.Worldtasks{
TaskMap: taskMap,
}
}
}
update["weekRefreshTime"] = configure.Now().Unix() update["weekRefreshTime"] = configure.Now().Unix()
} }
} }
update["currentTask"] = myWorldtask.CurrentTask update["currentTask"] = myWorldtask.CurrentTaskMap
if err := this.Change(uid, update); err != nil { if err := this.Change(uid, update); err != nil {
return return

155
modules/worldtask/module.go
View File

@ -119,82 +119,97 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
return return
} }
var groupId, taskId int32
// 检索condId是否是世界任务的完成条件 // 检索condId是否是世界任务的完成条件
taskConds := make(map[int32][]*pb.CurrentTask)
finishedCondIds := []*pb.ConIProgress{} finishedCondIds := []*pb.ConIProgress{}
for _, cfg := range worldtaskConf.GetDataList() { for _, cfg := range worldtaskConf.GetDataList() {
for _, condId := range cfg.Completetask { for _, condId := range cfg.Completetask {
for _, cond := range conds { for _, cond := range conds {
if condId == cond.Conid { if condId == cond.Conid {
//校验任务是否是当前任务 //校验任务是否是当前任务
if task, ok := userTask.CurrentTask[cfg.Group]; ok { if task, ok := userTask.CurrentTaskMap[cfg.Group]; ok {
if task.NpcStatus == 1 && cfg.Key == task.TaskId { var currentTasks []*pb.CurrentTask
groupId = cfg.Group for _, t := range task.TaskMap {
taskId = cfg.Key if t.NpcStatus == 1 && cfg.Key == t.TaskId {
finishedCondIds = append(finishedCondIds, cond) finishedCondIds = append(finishedCondIds, cond)
currentTasks = append(currentTasks, &pb.CurrentTask{
GroupId: cfg.Group,
TaskId: cfg.Key,
})
} }
} }
break taskConds[cfg.Group] = currentTasks
}
} }
} }
} }
} }
this.Debug("完成条件", // this.Debug("完成条件",
log.Field{Key: "taskId", Value: taskId}, // log.Field{Key: "taskId", Value: taskId},
log.Field{Key: "condIds", Value: finishedCondIds}) // log.Field{Key: "condIds", Value: finishedCondIds})
if len(finishedCondIds) == 0 { if len(finishedCondIds) == 0 {
return return
} }
// 当前任务配置 // 当前任务配置
curTaskConf, err := this.configure.getWorldtaskById(taskId) // curTaskConf, err := this.configure.getWorldtaskById(taskId)
if err != nil || curTaskConf == nil { // if err != nil || curTaskConf == nil {
return // return
} // }
if userTask.CurrentTask == nil { // if userTask.CurrentTaskMap == nil {
userTask.CurrentTask = make(map[int32]*pb.Worldtask) // userTask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} // }
wt, ok := userTask.CurrentTask[groupId] // wt, ok := userTask.CurrentTaskMap[groupId]
if !ok { // if !ok {
wt = &pb.Worldtask{} // wt = &pb.Worldtasks{}
} // }
for _, cond1 := range finishedCondIds { // // for _, condId := range finishedCondIds {
for _, cond2 := range wt.Conds {
if cond2.Conid == cond1.Conid {
cond2 = cond1
} else {
wt.Conds = append(wt.Conds, cond1)
}
}
}
userTask.CurrentTask[groupId] = wt // for _, cond1 := range finishedCondIds {
// for _, cond2 := range wt.Conds {
// if cond2.Conid == cond1.Conid {
// cond2 = cond1
// } else {
// wt.Conds = append(wt.Conds, cond1)
// }
// }
// }
for _, v := range userTask.CurrentTask { // userTask.CurrentTaskMap[groupId] = wt
if curTaskConf.Key == v.TaskId {
if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付 // for _, v := range userTask.CurrentTaskMap {
this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf) // if curTaskConf.Key == v.TaskId {
this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf) // if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付
} else { // this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf)
update := map[string]interface{}{ // this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf)
"currentTask": userTask.CurrentTask, // } else {
} // update := map[string]interface{}{
this.modelWorldtask.Change(uid, update) // "currentTask": userTask.CurrentTaskMap,
} // }
break // this.modelWorldtask.Change(uid, update)
// }
// break
// }
// }
var currentTasks []*pb.CurrentTask
for _, tasks := range taskConds {
for _, t := range tasks {
currentTasks = append(currentTasks, t)
} }
} }
session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{ session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{
GroupId: groupId, // GroupId: groupId,
TaskId: taskId, // TaskId: taskId,
Conds: wt.Conds, // Conds: wt.Conds,
Tasks: currentTasks,
}) })
return return
@ -273,16 +288,18 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
//下个任务 //下个任务
nextTaskIds := this.modelWorldtask.findNextTasks(taskId) nextTaskIds := this.modelWorldtask.findNextTasks(taskId)
if mytask.CurrentTask == nil { if mytask.CurrentTaskMap == nil {
mytask.CurrentTask = make(map[int32]*pb.Worldtask) mytask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
if len(nextTaskIds) >= 1 { if len(nextTaskIds) >= 1 {
mytask.CurrentTask[groupId] = &pb.Worldtask{ if t, ok := mytask.CurrentTaskMap[groupId]; ok {
t.TaskMap[nextTaskIds[0]] = &pb.Worldtask{
TaskId: nextTaskIds[0], TaskId: nextTaskIds[0],
TaskType: 2, //设置主线类型 TaskType: 2, //设置主线类型
} }
update["currentTask"] = mytask.CurrentTask }
update["currentTask"] = mytask.CurrentTaskMap
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
@ -348,15 +365,17 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32)
"taskList": mytask.TaskList, "taskList": mytask.TaskList,
} }
if mytask.CurrentTask == nil { if mytask.CurrentTaskMap == nil {
mytask.CurrentTask = make(map[int32]*pb.Worldtask) mytask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
mytask.CurrentTask[taskConf.Group] = &pb.Worldtask{ if t, ok := mytask.CurrentTaskMap[taskConf.Group]; ok {
t.TaskMap[taskId] = &pb.Worldtask{
TaskId: taskId, TaskId: taskId,
TaskType: taskConf.Des, TaskType: taskConf.Des, //设置主线类型
} }
update["currentTask"] = mytask.CurrentTask }
update["currentTask"] = mytask.CurrentTaskMap
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
return err return err
@ -390,29 +409,26 @@ func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32)
return return
} }
myWorldtask, err := this.modelWorldtask.getWorldtask(uid)
if err != nil {
this.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return
}
// 当前任务配置 // 当前任务配置
curTaskConf, err := this.configure.getWorldtaskById(taskId) curTaskConf, err := this.configure.getWorldtaskById(taskId)
if err != nil || curTaskConf == nil { if err != nil || curTaskConf == nil {
return return
} }
if myWorldtask.CurrentTask == nil { if mytask.CurrentTaskMap == nil {
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask) mytask.CurrentTaskMap = make(map[int32]*pb.Worldtasks)
} }
myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
if v, ok1 := mytask.CurrentTaskMap[curTaskConf.Group]; ok1 {
v.TaskMap[taskId] = &pb.Worldtask{
TaskId: taskId, TaskId: taskId,
TaskType: curTaskConf.Des, TaskType: curTaskConf.Des,
NpcStatus: 1, NpcStatus: 1,
} }
}
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTask": mytask.CurrentTaskMap,
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
@ -424,8 +440,8 @@ func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32)
len(curTaskConf.Completetask) == 0) && len(curTaskConf.Completetask) == 0) &&
curTaskConf.DeliverNpc == 0 { curTaskConf.DeliverNpc == 0 {
//结束任务 //结束任务
this.modelWorldtask.taskFinish(session, groupId, taskId, myWorldtask, curTaskConf) this.modelWorldtask.taskFinish(session, groupId, taskId, mytask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, groupId, myWorldtask, curTaskConf) this.modelWorldtask.taskFinishPush(session, groupId, mytask, curTaskConf)
} }
return return
@ -463,9 +479,12 @@ func (this *Worldtask) UpdateTaskStatus(uid string, taskId int32) {
} }
} }
myWorldtask.CurrentTask[curTaskConf.Group] = wt if tasks, ok := myWorldtask.CurrentTaskMap[curTaskConf.Group]; ok {
tasks.TaskMap[taskId] = wt
}
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTask": myWorldtask.CurrentTaskMap,
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {

186
pb/worldtask_db.pb.go
View File

@ -27,7 +27,7 @@ type DBWorldtask struct {
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID
TaskList []int32 `protobuf:"varint,3,rep,packed,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表 TaskList []int32 `protobuf:"varint,3,rep,packed,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表
CurrentTask map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTask,proto3" json:"currentTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTask"` //正在进行的任务 CurrentTaskMap map[int32]*Worldtasks `protobuf:"bytes,4,rep,name=currentTaskMap,proto3" json:"currentTaskMap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTasks"` //正在进行的任务
Chapters map[int32]int32 `protobuf:"bytes,5,rep,name=chapters,proto3" json:"chapters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"chapters"` //key章节ID v状态 1已解锁2已领取 Chapters map[int32]int32 `protobuf:"bytes,5,rep,name=chapters,proto3" json:"chapters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"chapters"` //key章节ID v状态 1已解锁2已领取
DaliyRefreshTime int64 `protobuf:"varint,6,opt,name=daliyRefreshTime,proto3" json:"daliyRefreshTime" bson:"daliyRefreshTime"` DaliyRefreshTime int64 `protobuf:"varint,6,opt,name=daliyRefreshTime,proto3" json:"daliyRefreshTime" bson:"daliyRefreshTime"`
WeekRefreshTime int64 `protobuf:"varint,7,opt,name=weekRefreshTime,proto3" json:"weekRefreshTime" bson:"weekRefreshTime"` WeekRefreshTime int64 `protobuf:"varint,7,opt,name=weekRefreshTime,proto3" json:"weekRefreshTime" bson:"weekRefreshTime"`
@ -79,9 +79,9 @@ func (x *DBWorldtask) GetTaskList() []int32 {
return nil return nil
} }
func (x *DBWorldtask) GetCurrentTask() map[int32]*Worldtask { func (x *DBWorldtask) GetCurrentTaskMap() map[int32]*Worldtasks {
if x != nil { if x != nil {
return x.CurrentTask return x.CurrentTaskMap
} }
return nil return nil
} }
@ -107,12 +107,59 @@ func (x *DBWorldtask) GetWeekRefreshTime() int64 {
return 0 return 0
} }
type Worldtasks struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TaskMap map[int32]*Worldtask `protobuf:"bytes,1,rep,name=taskMap,proto3" json:"taskMap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"tasks"` //
}
func (x *Worldtasks) Reset() {
*x = Worldtasks{}
if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Worldtasks) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Worldtasks) ProtoMessage() {}
func (x *Worldtasks) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use Worldtasks.ProtoReflect.Descriptor instead.
func (*Worldtasks) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_db_proto_rawDescGZIP(), []int{1}
}
func (x *Worldtasks) GetTaskMap() map[int32]*Worldtask {
if x != nil {
return x.TaskMap
}
return nil
}
type Worldtask struct { type Worldtask struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskIds"` //任务ID TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskId"` //任务ID
TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情 TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情
NpcStatus int32 `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"` //NPC任务完成状态0未完成 1完成 NpcStatus int32 `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"` //NPC任务完成状态0未完成 1完成
Conds []*ConIProgress `protobuf:"bytes,6,rep,name=conds,proto3" json:"conds" bson:"conds"` //任务完成条件 Conds []*ConIProgress `protobuf:"bytes,6,rep,name=conds,proto3" json:"conds" bson:"conds"` //任务完成条件
@ -122,7 +169,7 @@ type Worldtask struct {
func (x *Worldtask) Reset() { func (x *Worldtask) Reset() {
*x = Worldtask{} *x = Worldtask{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1] mi := &file_worldtask_worldtask_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -135,7 +182,7 @@ func (x *Worldtask) String() string {
func (*Worldtask) ProtoMessage() {} func (*Worldtask) ProtoMessage() {}
func (x *Worldtask) ProtoReflect() protoreflect.Message { func (x *Worldtask) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1] mi := &file_worldtask_worldtask_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -148,7 +195,7 @@ func (x *Worldtask) ProtoReflect() protoreflect.Message {
// Deprecated: Use Worldtask.ProtoReflect.Descriptor instead. // Deprecated: Use Worldtask.ProtoReflect.Descriptor instead.
func (*Worldtask) Descriptor() ([]byte, []int) { func (*Worldtask) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_db_proto_rawDescGZIP(), []int{1} return file_worldtask_worldtask_db_proto_rawDescGZIP(), []int{2}
} }
func (x *Worldtask) GetTaskId() int32 { func (x *Worldtask) GetTaskId() int32 {
@ -192,44 +239,53 @@ var file_worldtask_worldtask_db_proto_rawDesc = []byte{
0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c, 0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16,
0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x93, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa0, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b,
0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b,
0x4c, 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54,
0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x44,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65,
0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e,
0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x36, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x12, 0x36,
0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43,
0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68,
0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52,
0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03,
0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x77, 0x65, 0x65, 0x52, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69,
0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65,
0x69, 0x6d, 0x65, 0x1a, 0x4a, 0x0a, 0x10, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x4e, 0x0a, 0x13,
0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x6f,
0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x32, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b,
0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x4d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x57, 0x6f, 0x72, 0x6c,
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e,
0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x74, 0x72, 0x79, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x1a, 0x46, 0x0a, 0x0c,
0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x23, 0x0a, 0x05, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20,
0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x33, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61,
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61,
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61,
0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74,
0x61, 0x74, 0x75, 0x73, 0x12, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65,
0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c,
0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64,
0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -244,24 +300,28 @@ func file_worldtask_worldtask_db_proto_rawDescGZIP() []byte {
return file_worldtask_worldtask_db_proto_rawDescData return file_worldtask_worldtask_db_proto_rawDescData
} }
var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_worldtask_worldtask_db_proto_goTypes = []interface{}{ var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
(*DBWorldtask)(nil), // 0: DBWorldtask (*DBWorldtask)(nil), // 0: DBWorldtask
(*Worldtask)(nil), // 1: Worldtask (*Worldtasks)(nil), // 1: Worldtasks
nil, // 2: DBWorldtask.CurrentTaskEntry (*Worldtask)(nil), // 2: Worldtask
nil, // 3: DBWorldtask.ChaptersEntry nil, // 3: DBWorldtask.CurrentTaskMapEntry
(*ConIProgress)(nil), // 4: ConIProgress nil, // 4: DBWorldtask.ChaptersEntry
nil, // 5: Worldtasks.TaskMapEntry
(*ConIProgress)(nil), // 6: ConIProgress
} }
var file_worldtask_worldtask_db_proto_depIdxs = []int32{ var file_worldtask_worldtask_db_proto_depIdxs = []int32{
2, // 0: DBWorldtask.currentTask:type_name -> DBWorldtask.CurrentTaskEntry 3, // 0: DBWorldtask.currentTaskMap:type_name -> DBWorldtask.CurrentTaskMapEntry
3, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry 4, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry
4, // 2: Worldtask.conds:type_name -> ConIProgress 5, // 2: Worldtasks.taskMap:type_name -> Worldtasks.TaskMapEntry
1, // 3: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask 6, // 3: Worldtask.conds:type_name -> ConIProgress
4, // [4:4] is the sub-list for method output_type 1, // 4: DBWorldtask.CurrentTaskMapEntry.value:type_name -> Worldtasks
4, // [4:4] is the sub-list for method input_type 2, // 5: Worldtasks.TaskMapEntry.value:type_name -> Worldtask
4, // [4:4] is the sub-list for extension type_name 6, // [6:6] is the sub-list for method output_type
4, // [4:4] is the sub-list for extension extendee 6, // [6:6] is the sub-list for method input_type
0, // [0:4] is the sub-list for field type_name 6, // [6:6] is the sub-list for extension type_name
6, // [6:6] is the sub-list for extension extendee
0, // [0:6] is the sub-list for field type_name
} }
func init() { file_worldtask_worldtask_db_proto_init() } func init() { file_worldtask_worldtask_db_proto_init() }
@ -284,6 +344,18 @@ func file_worldtask_worldtask_db_proto_init() {
} }
} }
file_worldtask_worldtask_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Worldtasks); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_worldtask_worldtask_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Worldtask); i { switch v := v.(*Worldtask); i {
case 0: case 0:
return &v.state return &v.state
@ -302,7 +374,7 @@ func file_worldtask_worldtask_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc, RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 4, NumMessages: 6,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

391
pb/worldtask_msg.pb.go
View File

@ -215,9 +215,7 @@ type WorldtaskCompletecondisPush struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` Tasks []*CurrentTask `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
Conds []*ConIProgress `protobuf:"bytes,3,rep,name=conds,proto3" json:"conds"`
} }
func (x *WorldtaskCompletecondisPush) Reset() { func (x *WorldtaskCompletecondisPush) Reset() {
@ -252,21 +250,70 @@ func (*WorldtaskCompletecondisPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{4} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{4}
} }
func (x *WorldtaskCompletecondisPush) GetGroupId() int32 { func (x *WorldtaskCompletecondisPush) GetTasks() []*CurrentTask {
if x != nil {
return x.Tasks
}
return nil
}
type CurrentTask struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
Conds []*ConIProgress `protobuf:"bytes,3,rep,name=conds,proto3" json:"conds"`
}
func (x *CurrentTask) Reset() {
*x = CurrentTask{}
if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CurrentTask) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CurrentTask) ProtoMessage() {}
func (x *CurrentTask) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use CurrentTask.ProtoReflect.Descriptor instead.
func (*CurrentTask) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{5}
}
func (x *CurrentTask) GetGroupId() int32 {
if x != nil { if x != nil {
return x.GroupId return x.GroupId
} }
return 0 return 0
} }
func (x *WorldtaskCompletecondisPush) GetTaskId() int32 { func (x *CurrentTask) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
} }
return 0 return 0
} }
func (x *WorldtaskCompletecondisPush) GetConds() []*ConIProgress { func (x *CurrentTask) GetConds() []*ConIProgress {
if x != nil { if x != nil {
return x.Conds return x.Conds
} }
@ -287,7 +334,7 @@ type WorldtaskCompleteCondiReq struct {
func (x *WorldtaskCompleteCondiReq) Reset() { func (x *WorldtaskCompleteCondiReq) Reset() {
*x = WorldtaskCompleteCondiReq{} *x = WorldtaskCompleteCondiReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5] mi := &file_worldtask_worldtask_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -300,7 +347,7 @@ func (x *WorldtaskCompleteCondiReq) String() string {
func (*WorldtaskCompleteCondiReq) ProtoMessage() {} func (*WorldtaskCompleteCondiReq) ProtoMessage() {}
func (x *WorldtaskCompleteCondiReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskCompleteCondiReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5] mi := &file_worldtask_worldtask_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -313,7 +360,7 @@ func (x *WorldtaskCompleteCondiReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskCompleteCondiReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskCompleteCondiReq.ProtoReflect.Descriptor instead.
func (*WorldtaskCompleteCondiReq) Descriptor() ([]byte, []int) { func (*WorldtaskCompleteCondiReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{5} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6}
} }
func (x *WorldtaskCompleteCondiReq) GetGroupId() int32 { func (x *WorldtaskCompleteCondiReq) GetGroupId() int32 {
@ -349,7 +396,7 @@ type WorldtaskCompleteCondiResp struct {
func (x *WorldtaskCompleteCondiResp) Reset() { func (x *WorldtaskCompleteCondiResp) Reset() {
*x = WorldtaskCompleteCondiResp{} *x = WorldtaskCompleteCondiResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[6] mi := &file_worldtask_worldtask_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -362,7 +409,7 @@ func (x *WorldtaskCompleteCondiResp) String() string {
func (*WorldtaskCompleteCondiResp) ProtoMessage() {} func (*WorldtaskCompleteCondiResp) ProtoMessage() {}
func (x *WorldtaskCompleteCondiResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskCompleteCondiResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[6] mi := &file_worldtask_worldtask_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -375,7 +422,7 @@ func (x *WorldtaskCompleteCondiResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskCompleteCondiResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskCompleteCondiResp.ProtoReflect.Descriptor instead.
func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) { func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{7}
} }
func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 { func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 {
@ -405,7 +452,7 @@ type WorldtaskFinishReq struct {
func (x *WorldtaskFinishReq) Reset() { func (x *WorldtaskFinishReq) Reset() {
*x = WorldtaskFinishReq{} *x = WorldtaskFinishReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[7] mi := &file_worldtask_worldtask_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -418,7 +465,7 @@ func (x *WorldtaskFinishReq) String() string {
func (*WorldtaskFinishReq) ProtoMessage() {} func (*WorldtaskFinishReq) ProtoMessage() {}
func (x *WorldtaskFinishReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskFinishReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[7] mi := &file_worldtask_worldtask_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -431,7 +478,7 @@ func (x *WorldtaskFinishReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskFinishReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskFinishReq.ProtoReflect.Descriptor instead.
func (*WorldtaskFinishReq) Descriptor() ([]byte, []int) { func (*WorldtaskFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{7} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8}
} }
func (x *WorldtaskFinishReq) GetGroupId() int32 { func (x *WorldtaskFinishReq) GetGroupId() int32 {
@ -459,7 +506,7 @@ type WorldtaskFinishResp struct {
func (x *WorldtaskFinishResp) Reset() { func (x *WorldtaskFinishResp) Reset() {
*x = WorldtaskFinishResp{} *x = WorldtaskFinishResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[8] mi := &file_worldtask_worldtask_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -472,7 +519,7 @@ func (x *WorldtaskFinishResp) String() string {
func (*WorldtaskFinishResp) ProtoMessage() {} func (*WorldtaskFinishResp) ProtoMessage() {}
func (x *WorldtaskFinishResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskFinishResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[8] mi := &file_worldtask_worldtask_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -485,7 +532,7 @@ func (x *WorldtaskFinishResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskFinishResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskFinishResp.ProtoReflect.Descriptor instead.
func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) { func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9}
} }
func (x *WorldtaskFinishResp) GetTaskId() int32 { func (x *WorldtaskFinishResp) GetTaskId() int32 {
@ -501,14 +548,14 @@ type WorldtaskNexttaskPush struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
NextTask map[int32]*Worldtask `protobuf:"bytes,1,rep,name=nextTask,proto3" json:"nextTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` NextTask map[int32]*Worldtasks `protobuf:"bytes,1,rep,name=nextTask,proto3" json:"nextTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
FinishedTaskIds []int32 `protobuf:"varint,2,rep,packed,name=finishedTaskIds,proto3" json:"finishedTaskIds"` // 当前完成的任务 FinishedTaskIds []int32 `protobuf:"varint,2,rep,packed,name=finishedTaskIds,proto3" json:"finishedTaskIds"` // 当前完成的任务
} }
func (x *WorldtaskNexttaskPush) Reset() { func (x *WorldtaskNexttaskPush) Reset() {
*x = WorldtaskNexttaskPush{} *x = WorldtaskNexttaskPush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] mi := &file_worldtask_worldtask_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -521,7 +568,7 @@ func (x *WorldtaskNexttaskPush) String() string {
func (*WorldtaskNexttaskPush) ProtoMessage() {} func (*WorldtaskNexttaskPush) ProtoMessage() {}
func (x *WorldtaskNexttaskPush) ProtoReflect() protoreflect.Message { func (x *WorldtaskNexttaskPush) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] mi := &file_worldtask_worldtask_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -534,10 +581,10 @@ func (x *WorldtaskNexttaskPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskNexttaskPush.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskNexttaskPush.ProtoReflect.Descriptor instead.
func (*WorldtaskNexttaskPush) Descriptor() ([]byte, []int) { func (*WorldtaskNexttaskPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{10}
} }
func (x *WorldtaskNexttaskPush) GetNextTask() map[int32]*Worldtask { func (x *WorldtaskNexttaskPush) GetNextTask() map[int32]*Worldtasks {
if x != nil { if x != nil {
return x.NextTask return x.NextTask
} }
@ -564,7 +611,7 @@ type WorldtaskBattleStartReq struct {
func (x *WorldtaskBattleStartReq) Reset() { func (x *WorldtaskBattleStartReq) Reset() {
*x = WorldtaskBattleStartReq{} *x = WorldtaskBattleStartReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[10] mi := &file_worldtask_worldtask_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -577,7 +624,7 @@ func (x *WorldtaskBattleStartReq) String() string {
func (*WorldtaskBattleStartReq) ProtoMessage() {} func (*WorldtaskBattleStartReq) ProtoMessage() {}
func (x *WorldtaskBattleStartReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleStartReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[10] mi := &file_worldtask_worldtask_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -590,7 +637,7 @@ func (x *WorldtaskBattleStartReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleStartReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleStartReq.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleStartReq) Descriptor() ([]byte, []int) { func (*WorldtaskBattleStartReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{10} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{11}
} }
func (x *WorldtaskBattleStartReq) GetBattleConfId() int32 { func (x *WorldtaskBattleStartReq) GetBattleConfId() int32 {
@ -618,7 +665,7 @@ type WorldtaskBattleStartResp struct {
func (x *WorldtaskBattleStartResp) Reset() { func (x *WorldtaskBattleStartResp) Reset() {
*x = WorldtaskBattleStartResp{} *x = WorldtaskBattleStartResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[11] mi := &file_worldtask_worldtask_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -631,7 +678,7 @@ func (x *WorldtaskBattleStartResp) String() string {
func (*WorldtaskBattleStartResp) ProtoMessage() {} func (*WorldtaskBattleStartResp) ProtoMessage() {}
func (x *WorldtaskBattleStartResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleStartResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[11] mi := &file_worldtask_worldtask_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -644,7 +691,7 @@ func (x *WorldtaskBattleStartResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleStartResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleStartResp.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleStartResp) Descriptor() ([]byte, []int) { func (*WorldtaskBattleStartResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{11} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{12}
} }
func (x *WorldtaskBattleStartResp) GetInfo() *BattleInfo { func (x *WorldtaskBattleStartResp) GetInfo() *BattleInfo {
@ -670,7 +717,7 @@ type WorldtaskBattleFinishReq struct {
func (x *WorldtaskBattleFinishReq) Reset() { func (x *WorldtaskBattleFinishReq) Reset() {
*x = WorldtaskBattleFinishReq{} *x = WorldtaskBattleFinishReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[12] mi := &file_worldtask_worldtask_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -683,7 +730,7 @@ func (x *WorldtaskBattleFinishReq) String() string {
func (*WorldtaskBattleFinishReq) ProtoMessage() {} func (*WorldtaskBattleFinishReq) ProtoMessage() {}
func (x *WorldtaskBattleFinishReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[12] mi := &file_worldtask_worldtask_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -696,7 +743,7 @@ func (x *WorldtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleFinishReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleFinishReq.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) { func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{12} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{13}
} }
func (x *WorldtaskBattleFinishReq) GetGroupId() int32 { func (x *WorldtaskBattleFinishReq) GetGroupId() int32 {
@ -745,7 +792,7 @@ type WorldtaskBattleFinishResp struct {
func (x *WorldtaskBattleFinishResp) Reset() { func (x *WorldtaskBattleFinishResp) Reset() {
*x = WorldtaskBattleFinishResp{} *x = WorldtaskBattleFinishResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[13] mi := &file_worldtask_worldtask_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -758,7 +805,7 @@ func (x *WorldtaskBattleFinishResp) String() string {
func (*WorldtaskBattleFinishResp) ProtoMessage() {} func (*WorldtaskBattleFinishResp) ProtoMessage() {}
func (x *WorldtaskBattleFinishResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[13] mi := &file_worldtask_worldtask_msg_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -771,7 +818,7 @@ func (x *WorldtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleFinishResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleFinishResp.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleFinishResp) Descriptor() ([]byte, []int) { func (*WorldtaskBattleFinishResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{13} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{14}
} }
func (x *WorldtaskBattleFinishResp) GetTaskId() int32 { func (x *WorldtaskBattleFinishResp) GetTaskId() int32 {
@ -793,7 +840,7 @@ type WorldtaskFinishIdsPush struct {
func (x *WorldtaskFinishIdsPush) Reset() { func (x *WorldtaskFinishIdsPush) Reset() {
*x = WorldtaskFinishIdsPush{} *x = WorldtaskFinishIdsPush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[14] mi := &file_worldtask_worldtask_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -806,7 +853,7 @@ func (x *WorldtaskFinishIdsPush) String() string {
func (*WorldtaskFinishIdsPush) ProtoMessage() {} func (*WorldtaskFinishIdsPush) ProtoMessage() {}
func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message { func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[14] mi := &file_worldtask_worldtask_msg_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -819,7 +866,7 @@ func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskFinishIdsPush.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskFinishIdsPush.ProtoReflect.Descriptor instead.
func (*WorldtaskFinishIdsPush) Descriptor() ([]byte, []int) { func (*WorldtaskFinishIdsPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{14} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{15}
} }
func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask { func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask {
@ -841,7 +888,7 @@ type WorldtaskChapterrewardReq struct {
func (x *WorldtaskChapterrewardReq) Reset() { func (x *WorldtaskChapterrewardReq) Reset() {
*x = WorldtaskChapterrewardReq{} *x = WorldtaskChapterrewardReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[15] mi := &file_worldtask_worldtask_msg_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -854,7 +901,7 @@ func (x *WorldtaskChapterrewardReq) String() string {
func (*WorldtaskChapterrewardReq) ProtoMessage() {} func (*WorldtaskChapterrewardReq) ProtoMessage() {}
func (x *WorldtaskChapterrewardReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskChapterrewardReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[15] mi := &file_worldtask_worldtask_msg_proto_msgTypes[16]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -867,7 +914,7 @@ func (x *WorldtaskChapterrewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskChapterrewardReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskChapterrewardReq.ProtoReflect.Descriptor instead.
func (*WorldtaskChapterrewardReq) Descriptor() ([]byte, []int) { func (*WorldtaskChapterrewardReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{15} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16}
} }
func (x *WorldtaskChapterrewardReq) GetGroupId() int32 { func (x *WorldtaskChapterrewardReq) GetGroupId() int32 {
@ -888,7 +935,7 @@ type WorldtaskChapterrewardResp struct {
func (x *WorldtaskChapterrewardResp) Reset() { func (x *WorldtaskChapterrewardResp) Reset() {
*x = WorldtaskChapterrewardResp{} *x = WorldtaskChapterrewardResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[16] mi := &file_worldtask_worldtask_msg_proto_msgTypes[17]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -901,7 +948,7 @@ func (x *WorldtaskChapterrewardResp) String() string {
func (*WorldtaskChapterrewardResp) ProtoMessage() {} func (*WorldtaskChapterrewardResp) ProtoMessage() {}
func (x *WorldtaskChapterrewardResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskChapterrewardResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[16] mi := &file_worldtask_worldtask_msg_proto_msgTypes[17]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -914,7 +961,7 @@ func (x *WorldtaskChapterrewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskChapterrewardResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskChapterrewardResp.ProtoReflect.Descriptor instead.
func (*WorldtaskChapterrewardResp) Descriptor() ([]byte, []int) { func (*WorldtaskChapterrewardResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{17}
} }
func (x *WorldtaskChapterrewardResp) GetGroupId() int32 { func (x *WorldtaskChapterrewardResp) GetGroupId() int32 {
@ -946,83 +993,86 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
0x64, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63,
0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64,
0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64,
0x69, 0x49, 0x64, 0x73, 0x22, 0x74, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x69, 0x49, 0x64, 0x73, 0x22, 0x41, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50,
0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b,
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x64, 0x0a, 0x0b, 0x43, 0x75, 0x72, 0x72, 0x65,
0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x19, 0x57, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64,
0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x22, 0x67, 0x0a,
0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72,
0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f,
0x69, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02,
0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63,
0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69,
0x69, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01,
0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63,
0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x57, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xcc, 0x01, 0x0a, 0x15, 0x57,
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b,
0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b,
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e,
0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65,
0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68,
0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52,
0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73,
0x1a, 0x47, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72,
0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f,
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
0xb1, 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74,
0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67,
0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d,
0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xcd, 0x01,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74,
0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c,
0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x68, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e,
0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x28, 0x05, 0x52, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b,
0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x49, 0x64, 0x73, 0x1a, 0x48, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x64, 0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74,
0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06,
0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
0x6e, 0x66, 0x6f, 0x22, 0xb1, 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71,
0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01,
0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64,
0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52,
0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64,
0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16,
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49,
0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69,
0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64,
0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35,
0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74,
0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67,
0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72,
0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -1037,47 +1087,50 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte {
return file_worldtask_worldtask_msg_proto_rawDescData return file_worldtask_worldtask_msg_proto_rawDescData
} }
var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
(*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq
(*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp
(*WorldtaskAcceptReq)(nil), // 2: WorldtaskAcceptReq (*WorldtaskAcceptReq)(nil), // 2: WorldtaskAcceptReq
(*WorldtaskAcceptResp)(nil), // 3: WorldtaskAcceptResp (*WorldtaskAcceptResp)(nil), // 3: WorldtaskAcceptResp
(*WorldtaskCompletecondisPush)(nil), // 4: WorldtaskCompletecondisPush (*WorldtaskCompletecondisPush)(nil), // 4: WorldtaskCompletecondisPush
(*WorldtaskCompleteCondiReq)(nil), // 5: WorldtaskCompleteCondiReq (*CurrentTask)(nil), // 5: CurrentTask
(*WorldtaskCompleteCondiResp)(nil), // 6: WorldtaskCompleteCondiResp (*WorldtaskCompleteCondiReq)(nil), // 6: WorldtaskCompleteCondiReq
(*WorldtaskFinishReq)(nil), // 7: WorldtaskFinishReq (*WorldtaskCompleteCondiResp)(nil), // 7: WorldtaskCompleteCondiResp
(*WorldtaskFinishResp)(nil), // 8: WorldtaskFinishResp (*WorldtaskFinishReq)(nil), // 8: WorldtaskFinishReq
(*WorldtaskNexttaskPush)(nil), // 9: WorldtaskNexttaskPush (*WorldtaskFinishResp)(nil), // 9: WorldtaskFinishResp
(*WorldtaskBattleStartReq)(nil), // 10: WorldtaskBattleStartReq (*WorldtaskNexttaskPush)(nil), // 10: WorldtaskNexttaskPush
(*WorldtaskBattleStartResp)(nil), // 11: WorldtaskBattleStartResp (*WorldtaskBattleStartReq)(nil), // 11: WorldtaskBattleStartReq
(*WorldtaskBattleFinishReq)(nil), // 12: WorldtaskBattleFinishReq (*WorldtaskBattleStartResp)(nil), // 12: WorldtaskBattleStartResp
(*WorldtaskBattleFinishResp)(nil), // 13: WorldtaskBattleFinishResp (*WorldtaskBattleFinishReq)(nil), // 13: WorldtaskBattleFinishReq
(*WorldtaskFinishIdsPush)(nil), // 14: WorldtaskFinishIdsPush (*WorldtaskBattleFinishResp)(nil), // 14: WorldtaskBattleFinishResp
(*WorldtaskChapterrewardReq)(nil), // 15: WorldtaskChapterrewardReq (*WorldtaskFinishIdsPush)(nil), // 15: WorldtaskFinishIdsPush
(*WorldtaskChapterrewardResp)(nil), // 16: WorldtaskChapterrewardResp (*WorldtaskChapterrewardReq)(nil), // 16: WorldtaskChapterrewardReq
nil, // 17: WorldtaskNexttaskPush.NextTaskEntry (*WorldtaskChapterrewardResp)(nil), // 17: WorldtaskChapterrewardResp
(*DBWorldtask)(nil), // 18: DBWorldtask nil, // 18: WorldtaskNexttaskPush.NextTaskEntry
(*ConIProgress)(nil), // 19: ConIProgress (*DBWorldtask)(nil), // 19: DBWorldtask
(*BattleFormation)(nil), // 20: BattleFormation (*ConIProgress)(nil), // 20: ConIProgress
(*BattleInfo)(nil), // 21: BattleInfo (*BattleFormation)(nil), // 21: BattleFormation
(*BattleReport)(nil), // 22: BattleReport (*BattleInfo)(nil), // 22: BattleInfo
(*Worldtask)(nil), // 23: Worldtask (*BattleReport)(nil), // 23: BattleReport
(*Worldtask)(nil), // 24: Worldtask
(*Worldtasks)(nil), // 25: Worldtasks
} }
var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask 19, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
19, // 1: WorldtaskCompletecondisPush.conds:type_name -> ConIProgress 5, // 1: WorldtaskCompletecondisPush.tasks:type_name -> CurrentTask
17, // 2: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry 20, // 2: CurrentTask.conds:type_name -> ConIProgress
20, // 3: WorldtaskBattleStartReq.battle:type_name -> BattleFormation 18, // 3: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
21, // 4: WorldtaskBattleStartResp.info:type_name -> BattleInfo 21, // 4: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
22, // 5: WorldtaskBattleFinishReq.report:type_name -> BattleReport 22, // 5: WorldtaskBattleStartResp.info:type_name -> BattleInfo
23, // 6: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask 23, // 6: WorldtaskBattleFinishReq.report:type_name -> BattleReport
23, // 7: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask 24, // 7: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
8, // [8:8] is the sub-list for method output_type 25, // 8: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtasks
8, // [8:8] is the sub-list for method input_type 9, // [9:9] is the sub-list for method output_type
8, // [8:8] is the sub-list for extension type_name 9, // [9:9] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension extendee 9, // [9:9] is the sub-list for extension type_name
0, // [0:8] is the sub-list for field type_name 9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
} }
func init() { file_worldtask_worldtask_msg_proto_init() } func init() { file_worldtask_worldtask_msg_proto_init() }
@ -1150,7 +1203,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskCompleteCondiReq); i { switch v := v.(*CurrentTask); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1162,7 +1215,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskCompleteCondiResp); i { switch v := v.(*WorldtaskCompleteCondiReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1174,7 +1227,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskFinishReq); i { switch v := v.(*WorldtaskCompleteCondiResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1186,7 +1239,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskFinishResp); i { switch v := v.(*WorldtaskFinishReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1198,7 +1251,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskNexttaskPush); i { switch v := v.(*WorldtaskFinishResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1210,7 +1263,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleStartReq); i { switch v := v.(*WorldtaskNexttaskPush); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1222,7 +1275,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleStartResp); i { switch v := v.(*WorldtaskBattleStartReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1234,7 +1287,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleFinishReq); i { switch v := v.(*WorldtaskBattleStartResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1246,7 +1299,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleFinishResp); i { switch v := v.(*WorldtaskBattleFinishReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1258,7 +1311,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskFinishIdsPush); i { switch v := v.(*WorldtaskBattleFinishResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1270,7 +1323,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskChapterrewardReq); i { switch v := v.(*WorldtaskFinishIdsPush); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1282,6 +1335,18 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskChapterrewardReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_worldtask_worldtask_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskChapterrewardResp); i { switch v := v.(*WorldtaskChapterrewardResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1300,7 +1365,7 @@ func file_worldtask_worldtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc, RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 18, NumMessages: 19,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },