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-07 17:31:50 +08:00
parent 06e57e6650
commit b64efd67e7
10 changed files with 250 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/v2/ui/views/worldtask_mine.go
View File

@ -51,12 +51,12 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
//接取 //接取
acceptBtn := widget.NewButton("接取", func() { acceptBtn := widget.NewButton("接取", func() {
groupId := widget.NewEntry() // groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID" // groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry() taskIdEntry := widget.NewEntry()
taskIdEntry.PlaceHolder = "任务ID" taskIdEntry.PlaceHolder = "任务ID"
form := widget.NewForm( form := widget.NewForm(
widget.NewFormItem("组ID", groupId), // widget.NewFormItem("组ID", groupId),
widget.NewFormItem("任务ID", taskIdEntry), widget.NewFormItem("任务ID", taskIdEntry),
) )
@ -67,8 +67,7 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
t.MainType, t.MainType,
"accept", "accept",
&pb.WorldtaskAcceptReq{ &pb.WorldtaskAcceptReq{
GroupId: cast.ToInt32(groupId.Text), TaskId: cast.ToInt32(taskIdEntry.Text),
TaskId: cast.ToInt32(taskIdEntry.Text),
}); err != nil { }); err != nil {
logrus.Error(err) logrus.Error(err)
} }
@ -82,14 +81,14 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
// 完成任务条件 // 完成任务条件
completeBtn := widget.NewButton("任务条件", func() { completeBtn := widget.NewButton("任务条件", func() {
groupId := widget.NewEntry() // groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID" // groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry() taskIdEntry := widget.NewEntry()
taskIdEntry.PlaceHolder = "任务ID" taskIdEntry.PlaceHolder = "任务ID"
condiId := widget.NewEntry() condiId := widget.NewEntry()
condiId.PlaceHolder = "条件" condiId.PlaceHolder = "条件"
form := widget.NewForm( form := widget.NewForm(
widget.NewFormItem("组ID", groupId), // widget.NewFormItem("组ID", groupId),
widget.NewFormItem("任务ID", taskIdEntry), widget.NewFormItem("任务ID", taskIdEntry),
widget.NewFormItem("完成条件", condiId), widget.NewFormItem("完成条件", condiId),
) )
@ -101,7 +100,6 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
t.MainType, t.MainType,
"completecondi", "completecondi",
&pb.WorldtaskCompleteCondiReq{ &pb.WorldtaskCompleteCondiReq{
GroupId: cast.ToInt32(groupId.Text),
TaskId: cast.ToInt32(taskIdEntry.Text), TaskId: cast.ToInt32(taskIdEntry.Text),
CondiId: cast.ToInt32(condiId.Text), CondiId: cast.ToInt32(condiId.Text),
}); err != nil { }); err != nil {
@ -117,12 +115,9 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
// 交付任务 // 交付任务
this.juqingBtn = widget.NewButton("交付任务", func() { this.juqingBtn = widget.NewButton("交付任务", func() {
groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry() taskIdEntry := widget.NewEntry()
taskIdEntry.PlaceHolder = "任务ID" taskIdEntry.PlaceHolder = "任务ID"
form := widget.NewForm( form := widget.NewForm(
widget.NewFormItem("组ID", groupId),
widget.NewFormItem("任务ID", taskIdEntry), widget.NewFormItem("任务ID", taskIdEntry),
) )
@ -133,7 +128,6 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
t.MainType, t.MainType,
worldtask.WorldtaskSubtypeFinish, worldtask.WorldtaskSubtypeFinish,
&pb.WorldtaskFinishReq{ &pb.WorldtaskFinishReq{
GroupId: cast.ToInt32(groupId.Text),
TaskId: cast.ToInt32(taskIdEntry.Text), TaskId: cast.ToInt32(taskIdEntry.Text),
}); err != nil { }); err != nil {
logrus.Error(err) logrus.Error(err)

42
modules/worldtask/api_accept.go
View File

@ -9,7 +9,7 @@ import (
// 任务接取 // 任务接取
func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) { func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) {
if req.TaskId <= 0 || req.GroupId <= 0 { if req.TaskId <= 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(), Title: pb.ErrorCode_ReqParameterError.ToString(),
@ -67,7 +67,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
} }
// 前置任务ID 只有世界任务才校验前置 // 前置任务ID 只有世界任务才校验前置
if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) { if !a.module.modelWorldtask.IsPreFinished(myWorldtask, curTaskConf) {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskLastUnFinished, Code: pb.ErrorCode_WorldtaskLastUnFinished,
Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(), Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(),
@ -76,20 +76,28 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
return return
} }
if myWorldtask.CurrentTaskMap == nil { if myWorldtask.CurrentTasks == nil {
myWorldtask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) myWorldtask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
if tasks, ok := myWorldtask.CurrentTaskMap[curTaskConf.Group]; ok { if tasks, ok := myWorldtask.CurrentTasks[curTaskConf.Group]; ok {
for _, task := range tasks.TaskMap { for _, task := range tasks.TaskMap {
if req.TaskId == task.TaskId { if req.TaskId == task.TaskId {
errdata = &pb.ErrorData{ if task.NpcStatus == 1 {
Code: pb.ErrorCode_WorldtaskNoAccept, errdata = &pb.ErrorData{
Title: pb.ErrorCode_WorldtaskNoAccept.ToString(), Code: pb.ErrorCode_WorldtaskNoAccept,
Message: fmt.Sprintf("不能重复接取 taskId:%v", req.TaskId), Title: pb.ErrorCode_WorldtaskNoAccept.ToString(),
Message: fmt.Sprintf("不能重复接取 taskId:%v", req.TaskId),
}
return
} else {
task.NpcStatus = 1
} }
return break
} else { } else {
if tasks.TaskMap == nil {
tasks.TaskMap = make(map[int32]*pb.Worldtask)
}
tasks.TaskMap[task.TaskId] = &pb.Worldtask{ tasks.TaskMap[task.TaskId] = &pb.Worldtask{
TaskId: req.TaskId, TaskId: req.TaskId,
TaskType: curTaskConf.Des, TaskType: curTaskConf.Des,
@ -98,15 +106,19 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
} }
} }
} else { } else {
tasks = &pb.Worldtasks{
TaskMap: make(map[int32]*pb.Worldtask),
}
tasks.TaskMap[req.TaskId] = &pb.Worldtask{ tasks.TaskMap[req.TaskId] = &pb.Worldtask{
TaskId: req.TaskId, TaskId: req.TaskId,
TaskType: curTaskConf.Des, TaskType: curTaskConf.Des,
NpcStatus: 1, //接取 NpcStatus: 1, //接取
} }
myWorldtask.CurrentTasks[curTaskConf.Group] = tasks
} }
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTaskMap, "currentTasks": myWorldtask.CurrentTasks,
} }
if err := a.module.modelWorldtask.Change(uid, update); err != nil { if err := a.module.modelWorldtask.Change(uid, update); err != nil {
@ -122,8 +134,8 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
curTaskConf.DeliverNpc == 0 { curTaskConf.DeliverNpc == 0 {
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
//结束任务 //结束任务
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinish(session, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
} else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 { } else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 {
var flag bool var flag bool
conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
@ -141,8 +153,8 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
if flag { if flag {
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinish(session, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
return return
} }
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)

4
modules/worldtask/api_battlefinish.go
View File

@ -10,7 +10,7 @@ import (
// 战斗结束的请求 // 战斗结束的请求
func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) { func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) {
if req.GroupId <= 0 || req.BattleConfId <= 0 || req.TaskId <= 0 || req.Report == nil { if req.BattleConfId <= 0 || req.TaskId <= 0 || req.Report == nil {
this.module.Error("世界任务战斗结束参数错误", this.module.Error("世界任务战斗结束参数错误",
log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "params", Value: req.String()}, log.Field{Key: "params", Value: req.String()},
@ -62,7 +62,7 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
rsp := &pb.WorldtaskBattleFinishResp{} rsp := &pb.WorldtaskBattleFinishResp{}
if len(taskConf.Completetask) == 0 { if len(taskConf.Completetask) == 0 {
if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil { if err := this.module.modelWorldtask.finishTask(req.TaskId, userTask); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(), Title: pb.ErrorCode_DBError.ToString(),

23
modules/worldtask/api_completetask.go
View File

@ -7,7 +7,7 @@ import (
// 任务完成条件 // 任务完成条件
func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) { func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) {
if req.GroupId <= 0 || req.TaskId <= 0 || req.CondiId <= 0 { if req.TaskId <= 0 || req.CondiId <= 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(), Title: pb.ErrorCode_ReqParameterError.ToString(),
@ -55,15 +55,6 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
} }
myWorldtask.Uid = uid myWorldtask.Uid = uid
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 {
@ -75,8 +66,8 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
} }
// 设置当前任务的完成条件 // 设置当前任务的完成条件
for _, task := range wt.TaskMap { for _, tasks := range myWorldtask.CurrentTasks {
if req.TaskId == task.TaskId { if task, ok := tasks.TaskMap[req.TaskId]; ok {
for _, cond := range conds { for _, cond := range conds {
for _, exist_cond := range task.Conds { for _, exist_cond := range task.Conds {
if cond.Conid == exist_cond.Conid { if cond.Conid == exist_cond.Conid {
@ -98,10 +89,10 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
// } // }
// } // }
myWorldtask.CurrentTaskMap[req.GroupId] = wt // myWorldtask.CurrentTaskMap[curTaskConf.Group] = wt
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTaskMap, "currentTasks": myWorldtask.CurrentTasks,
} }
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{
@ -116,8 +107,8 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
//结束任务 //结束任务
if curTaskConf.DeliverNpc == 0 { if curTaskConf.DeliverNpc == 0 {
this.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) this.module.modelWorldtask.taskFinish(session, req.TaskId, myWorldtask, curTaskConf)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) this.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
} }
return return
} }

27
modules/worldtask/api_finish.go
View File

@ -11,7 +11,7 @@ import (
// 世界任务完成 // 世界任务完成
func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) { func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) {
if req.GroupId == 0 || req.TaskId == 0 { if req.TaskId == 0 {
this.module.Error("世界任务完成参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) this.module.Error("世界任务完成参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
@ -51,14 +51,14 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
return return
} }
if curTaskConf.Group != req.GroupId { // if curTaskConf.Group != req.GroupId {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskGroupIdNosame, // Code: pb.ErrorCode_WorldtaskGroupIdNosame,
Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(), // Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(),
Message: fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId), // Message: fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId),
} // }
return // return
} // }
if curTaskConf.DeliverNpc == 0 { if curTaskConf.DeliverNpc == 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -94,7 +94,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
} }
// 前置任务ID 只有世界任务才校验前置 // 前置任务ID 只有世界任务才校验前置
if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) { if !this.module.modelWorldtask.IsPreFinished(userTask, curTaskConf) {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskLastUnFinished, Code: pb.ErrorCode_WorldtaskLastUnFinished,
Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(), Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(),
@ -111,7 +111,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "taskId", Value: req.TaskId},
) )
this.sendMsg(session, WorldtaskSubtypeFinish, rsp) this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf) this.module.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
return return
} }
} }
@ -147,7 +147,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
} }
// 完成任务 // 完成任务
if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { if err := this.module.modelWorldtask.finishTask(req.TaskId, userTask); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskFinish, Code: pb.ErrorCode_WorldtaskFinish,
Title: pb.ErrorCode_WorldtaskFinish.ToString(), Title: pb.ErrorCode_WorldtaskFinish.ToString(),
@ -159,7 +159,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
if errdata = this.module.DispenseRes(session, curTaskConf.Reword, true); errdata != nil { if errdata = this.module.DispenseRes(session, curTaskConf.Reword, true); errdata != nil {
this.module.Error("资源发放", this.module.Error("资源发放",
log.Field{Key: "uid", Value: uid}, log.Field{Key: "uid", Value: uid},
log.Field{Key: "groupId", Value: req.GroupId},
log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "taskId", Value: req.TaskId},
log.Field{Key: "reword", Value: curTaskConf.Reword}, log.Field{Key: "reword", Value: curTaskConf.Reword},
log.Field{Key: "errdata", Value: errdata}, log.Field{Key: "errdata", Value: errdata},
@ -179,6 +178,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
} }
} }
this.sendMsg(session, WorldtaskSubtypeFinish, rsp) this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf) this.module.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
return return
} }

8
modules/worldtask/api_mine.go
View File

@ -41,14 +41,14 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
return return
} }
if myWorldtask.CurrentTaskMap == nil { if myWorldtask.CurrentTasks == nil {
myWorldtask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) myWorldtask.CurrentTasks = 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.CurrentTaskMap { for k, v := range myWorldtask.CurrentTasks {
for _, t := range v.TaskMap { for _, t := range v.TaskMap {
cfg, err := this.module.configure.getWorldtaskById(t.TaskId) cfg, err := this.module.configure.getWorldtaskById(t.TaskId)
if err != nil { if err != nil {
@ -83,7 +83,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
} }
for k, v := range condMap { for k, v := range condMap {
if mw, ok := myWorldtask.CurrentTaskMap[k]; ok { if mw, ok := myWorldtask.CurrentTasks[k]; ok {
for _, task := range mw.TaskMap { 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 {

80
modules/worldtask/model_worldtask.go
View File

@ -42,7 +42,7 @@ func (this *ModelWorldtask) getWorldtask(uid string) (*pb.DBWorldtask, error) {
// 判断前置任务是否完成 // 判断前置任务是否完成
// true 已完成 false未完成 // true 已完成 false未完成
func (this *ModelWorldtask) IsPreFinished(groupId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool { func (this *ModelWorldtask) IsPreFinished(userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool {
var ( var (
lastTaskId int32 lastTaskId int32
preTaskFinished bool preTaskFinished bool
@ -73,7 +73,7 @@ func (this *ModelWorldtask) isFinished(taskId int32, list []*pb.Worldtask) bool
} }
// 完成任务 // 完成任务
func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldtask) error { func (this *ModelWorldtask) finishTask(taskId int32, task *pb.DBWorldtask) error {
if task == nil { if task == nil {
return errors.New("worldtask is nil") return errors.New("worldtask is nil")
} }
@ -105,8 +105,8 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
task.TaskList = append(task.TaskList, taskId) task.TaskList = append(task.TaskList, taskId)
if task.CurrentTaskMap == nil { if task.CurrentTasks == nil {
task.CurrentTaskMap = make(map[int32]*pb.Worldtasks) task.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
//有下个任务 //有下个任务
@ -114,7 +114,7 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
// wt.NpcStatus = 0 // wt.NpcStatus = 0
// wt.DeliverNpc = 0 // wt.DeliverNpc = 0
// task.CurrentTasks[groupId] = wt // task.CurrentTasks[groupId] = wt
// update["currentTask"] = task.CurrentTasks // update[""] = task.CurrentTasks
// } // }
update["taskList"] = task.TaskList update["taskList"] = task.TaskList
@ -159,47 +159,30 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
return nil return nil
} }
if userTask.CurrentTaskMap == nil { if userTask.CurrentTasks == nil {
userTask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) userTask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
update := make(map[string]interface{}) update := make(map[string]interface{})
nwt, ok := userTask.CurrentTaskMap[nextTaskConf.Group] nwt, ok := userTask.CurrentTasks[nextTaskConf.Group]
if ok { if ok {
// 删除 // 删除
delete(nwt.TaskMap, currentTaskId) delete(nwt.TaskMap, currentTaskId)
} }
if nwt == nil {
nwt = &pb.Worldtasks{
TaskMap: make(map[int32]*pb.Worldtask),
}
userTask.CurrentTasks[nextTaskConf.Group] = nwt
}
nwt.TaskMap[nextTaskId] = &pb.Worldtask{ nwt.TaskMap[nextTaskId] = &pb.Worldtask{
TaskId: nextTaskId, TaskId: nextTaskId,
TaskType: nextTaskConf.Des, TaskType: nextTaskConf.Des,
} }
update["currentTask"] = nwt update["currentTasks"] = userTask.CurrentTasks
// 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 {
@ -211,7 +194,7 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
} }
// 任务完成推送 // 任务完成推送
func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) { func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) {
this.updateRandomTask(session.GetUserId(), userTask) this.updateRandomTask(session.GetUserId(), userTask)
u := this.moduleWorldtask.ModuleUser.GetUser(session.GetUserId()) u := this.moduleWorldtask.ModuleUser.GetUser(session.GetUserId())
if u == nil { if u == nil {
@ -225,27 +208,27 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId in
for _, next := range nextTaskIds { for _, next := range nextTaskIds {
ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, curTaskConf.Key, next) ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, curTaskConf.Key, next)
if ut != nil { if ut != nil {
for k, v := range ut.CurrentTaskMap { for k, v := range ut.CurrentTasks {
nextTask[k] = v nextTask[k] = v
} }
} }
} }
if nextTaskIds == nil { if nextTaskIds == nil {
nextTask[groupId] = &pb.Worldtasks{} //表示没有下一个任务 nextTask[curTaskConf.Group] = &pb.Worldtasks{} //表示没有下一个任务
} }
if curTaskConf.IdAfter == 0 { if curTaskConf.IdAfter == 0 {
// 章节完成 // 章节完成
if _, ok := userTask.Chapters[groupId]; !ok { if _, ok := userTask.Chapters[curTaskConf.Group]; !ok {
delete(userTask.CurrentTaskMap, groupId) delete(userTask.CurrentTasks, curTaskConf.Group)
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[curTaskConf.Group] = 1 //已解锁待领取
update := map[string]interface{}{ update := map[string]interface{}{
"chapters": userTask.Chapters, "chapters": userTask.Chapters,
"currentTask": userTask.CurrentTaskMap, "currentTasks": userTask.CurrentTasks,
} }
this.Change(session.GetUserId(), update) this.Change(session.GetUserId(), update)
} }
@ -259,11 +242,10 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId in
} }
// 任务完成 // 任务完成
func (this *ModelWorldtask) taskFinish(session comm.IUserSession, groupId, taskId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) { func (this *ModelWorldtask) taskFinish(session comm.IUserSession, taskId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) {
if err := this.finishTask(groupId, taskId, userTask); err != nil { if err := this.finishTask(taskId, userTask); err != nil {
this.moduleWorldtask.Error("完成任务失败", this.moduleWorldtask.Error("完成任务失败",
log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "groupId", Value: groupId},
log.Field{Key: "taskId", Value: taskId}, log.Field{Key: "taskId", Value: taskId},
log.Field{Key: "err", Value: err.Error()}, log.Field{Key: "err", Value: err.Error()},
) )
@ -347,7 +329,7 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
if err != nil || gwtd == nil { if err != nil || gwtd == nil {
continue continue
} }
if task, ok := myWorldtask.CurrentTaskMap[gwtd.Group]; ok { if task, ok := myWorldtask.CurrentTasks[gwtd.Group]; ok {
task.TaskMap[v] = &pb.Worldtask{ task.TaskMap[v] = &pb.Worldtask{
TaskId: v, TaskId: v,
TaskType: gwtd.Des, TaskType: gwtd.Des,
@ -358,7 +340,7 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
TaskId: v, TaskId: v,
TaskType: gwtd.Des, TaskType: gwtd.Des,
} }
myWorldtask.CurrentTaskMap[gwtd.Group] = &pb.Worldtasks{ myWorldtask.CurrentTasks[gwtd.Group] = &pb.Worldtasks{
TaskMap: taskMap, TaskMap: taskMap,
} }
} }
@ -376,7 +358,7 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
continue continue
} }
if task, ok := myWorldtask.CurrentTaskMap[gwtd.Group]; ok { if task, ok := myWorldtask.CurrentTasks[gwtd.Group]; ok {
task.TaskMap[v] = &pb.Worldtask{ task.TaskMap[v] = &pb.Worldtask{
TaskId: v, TaskId: v,
TaskType: gwtd.Des, TaskType: gwtd.Des,
@ -387,7 +369,7 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
TaskId: v, TaskId: v,
TaskType: gwtd.Des, TaskType: gwtd.Des,
} }
myWorldtask.CurrentTaskMap[gwtd.Group] = &pb.Worldtasks{ myWorldtask.CurrentTasks[gwtd.Group] = &pb.Worldtasks{
TaskMap: taskMap, TaskMap: taskMap,
} }
} }
@ -397,7 +379,7 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
} }
} }
update["currentTask"] = myWorldtask.CurrentTaskMap update["currentTasks"] = myWorldtask.CurrentTasks
if err := this.Change(uid, update); err != nil { if err := this.Change(uid, update); err != nil {
return return

46
modules/worldtask/module.go
View File

@ -128,7 +128,7 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
for _, cond := range conds { for _, cond := range conds {
if condId == cond.Conid { if condId == cond.Conid {
//校验任务是否是当前任务 //校验任务是否是当前任务
if task, ok := userTask.CurrentTaskMap[cfg.Group]; ok { if task, ok := userTask.CurrentTasks[cfg.Group]; ok {
var currentTasks []*pb.CurrentTask var currentTasks []*pb.CurrentTask
for _, t := range task.TaskMap { for _, t := range task.TaskMap {
if t.NpcStatus == 1 && cfg.Key == t.TaskId { if t.NpcStatus == 1 && cfg.Key == t.TaskId {
@ -160,11 +160,11 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
// return // return
// } // }
// if userTask.CurrentTaskMap == nil { // if userTask.CurrentTasks == nil {
// userTask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) // userTask.CurrentTasks = make(map[int32]*pb.Worldtasks)
// } // }
// wt, ok := userTask.CurrentTaskMap[groupId] // wt, ok := userTask.CurrentTasks[groupId]
// if !ok { // if !ok {
// wt = &pb.Worldtasks{} // wt = &pb.Worldtasks{}
// } // }
@ -181,16 +181,16 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
// } // }
// } // }
// userTask.CurrentTaskMap[groupId] = wt // userTask.CurrentTasks[groupId] = wt
// for _, v := range userTask.CurrentTaskMap { // for _, v := range userTask.CurrentTasks {
// if curTaskConf.Key == v.TaskId { // if curTaskConf.Key == v.TaskId {
// if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付 // if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付
// this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf) // this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf)
// this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf) // this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf)
// } else { // } else {
// update := map[string]interface{}{ // update := map[string]interface{}{
// "currentTask": userTask.CurrentTaskMap, // "currentTask": userTask.CurrentTasks,
// } // }
// this.modelWorldtask.Change(uid, update) // this.modelWorldtask.Change(uid, update)
// } // }
@ -288,18 +288,18 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
//下个任务 //下个任务
nextTaskIds := this.modelWorldtask.findNextTasks(taskId) nextTaskIds := this.modelWorldtask.findNextTasks(taskId)
if mytask.CurrentTaskMap == nil { if mytask.CurrentTasks == nil {
mytask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) mytask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
if len(nextTaskIds) >= 1 { if len(nextTaskIds) >= 1 {
if t, ok := mytask.CurrentTaskMap[groupId]; ok { if t, ok := mytask.CurrentTasks[groupId]; ok {
t.TaskMap[nextTaskIds[0]] = &pb.Worldtask{ t.TaskMap[nextTaskIds[0]] = &pb.Worldtask{
TaskId: nextTaskIds[0], TaskId: nextTaskIds[0],
TaskType: 2, //设置主线类型 TaskType: 2, //设置主线类型
} }
} }
update["currentTask"] = mytask.CurrentTaskMap update["currentTasks"] = mytask.CurrentTasks
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
@ -365,17 +365,17 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32)
"taskList": mytask.TaskList, "taskList": mytask.TaskList,
} }
if mytask.CurrentTaskMap == nil { if mytask.CurrentTasks == nil {
mytask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) mytask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
if t, ok := mytask.CurrentTaskMap[taskConf.Group]; ok { if t, ok := mytask.CurrentTasks[taskConf.Group]; ok {
t.TaskMap[taskId] = &pb.Worldtask{ t.TaskMap[taskId] = &pb.Worldtask{
TaskId: taskId, TaskId: taskId,
TaskType: taskConf.Des, //设置主线类型 TaskType: taskConf.Des, //设置主线类型
} }
} }
update["currentTask"] = mytask.CurrentTaskMap update["currentTasks"] = mytask.CurrentTasks
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
return err return err
@ -415,11 +415,11 @@ func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32)
return return
} }
if mytask.CurrentTaskMap == nil { if mytask.CurrentTasks == nil {
mytask.CurrentTaskMap = make(map[int32]*pb.Worldtasks) mytask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
if v, ok1 := mytask.CurrentTaskMap[curTaskConf.Group]; ok1 { if v, ok1 := mytask.CurrentTasks[curTaskConf.Group]; ok1 {
v.TaskMap[taskId] = &pb.Worldtask{ v.TaskMap[taskId] = &pb.Worldtask{
TaskId: taskId, TaskId: taskId,
TaskType: curTaskConf.Des, TaskType: curTaskConf.Des,
@ -428,7 +428,7 @@ func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32)
} }
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": mytask.CurrentTaskMap, "currentTasks": mytask.CurrentTasks,
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
@ -440,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, mytask, curTaskConf) this.modelWorldtask.taskFinish(session, taskId, mytask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, groupId, mytask, curTaskConf) this.modelWorldtask.taskFinishPush(session, mytask, curTaskConf)
} }
return return
@ -479,12 +479,12 @@ func (this *Worldtask) UpdateTaskStatus(uid string, taskId int32) {
} }
} }
if tasks, ok := myWorldtask.CurrentTaskMap[curTaskConf.Group]; ok { if tasks, ok := myWorldtask.CurrentTasks[curTaskConf.Group]; ok {
tasks.TaskMap[taskId] = wt tasks.TaskMap[taskId] = wt
} }
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTaskMap, "currentTasks": myWorldtask.CurrentTasks,
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {

106
pb/worldtask_db.pb.go
View File

@ -25,10 +25,10 @@ type DBWorldtask struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
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"` // 任务列表
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"` //正在进行的任务 CurrentTasks map[int32]*Worldtasks `protobuf:"bytes,4,rep,name=currentTasks,proto3" json:"currentTasks" 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) GetCurrentTaskMap() map[int32]*Worldtasks { func (x *DBWorldtask) GetCurrentTasks() map[int32]*Worldtasks {
if x != nil { if x != nil {
return x.CurrentTaskMap return x.CurrentTasks
} }
return nil return nil
} }
@ -239,53 +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, 0xa0, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x98, 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, 0x48, 0x0a, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x42, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54,
0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x44, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x57,
0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72,
0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x12, 0x36, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x36, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x70,
0x0a, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57,
0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72,
0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73,
0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x64, 0x61, 0x6c, 0x69,
0x52, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f,
0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18,
0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65,
0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x4e, 0x0a, 0x13, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x4c, 0x0a, 0x11, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e,
0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73,
0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x6f, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x32, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x32, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28,
0x4d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x0b, 0x32, 0x18, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2e, 0x54,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x74, 0x61, 0x73,
0x74, 0x72, 0x79, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x1a, 0x46, 0x0a, 0x0c, 0x6b, 0x4d, 0x61, 0x70, 0x1a, 0x46, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45,
0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a,
0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03,
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c,
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x23, 0x0a, 0x05,
0x61, 0x74, 0x75, 0x73, 0x12, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f,
0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64,
0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18,
0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70,
0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x33,
} }
var ( var (
@ -305,17 +305,17 @@ var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
(*DBWorldtask)(nil), // 0: DBWorldtask (*DBWorldtask)(nil), // 0: DBWorldtask
(*Worldtasks)(nil), // 1: Worldtasks (*Worldtasks)(nil), // 1: Worldtasks
(*Worldtask)(nil), // 2: Worldtask (*Worldtask)(nil), // 2: Worldtask
nil, // 3: DBWorldtask.CurrentTaskMapEntry nil, // 3: DBWorldtask.CurrentTasksEntry
nil, // 4: DBWorldtask.ChaptersEntry nil, // 4: DBWorldtask.ChaptersEntry
nil, // 5: Worldtasks.TaskMapEntry nil, // 5: Worldtasks.TaskMapEntry
(*ConIProgress)(nil), // 6: ConIProgress (*ConIProgress)(nil), // 6: ConIProgress
} }
var file_worldtask_worldtask_db_proto_depIdxs = []int32{ var file_worldtask_worldtask_db_proto_depIdxs = []int32{
3, // 0: DBWorldtask.currentTaskMap:type_name -> DBWorldtask.CurrentTaskMapEntry 3, // 0: DBWorldtask.currentTasks:type_name -> DBWorldtask.CurrentTasksEntry
4, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry 4, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry
5, // 2: Worldtasks.taskMap:type_name -> Worldtasks.TaskMapEntry 5, // 2: Worldtasks.taskMap:type_name -> Worldtasks.TaskMapEntry
6, // 3: Worldtask.conds:type_name -> ConIProgress 6, // 3: Worldtask.conds:type_name -> ConIProgress
1, // 4: DBWorldtask.CurrentTaskMapEntry.value:type_name -> Worldtasks 1, // 4: DBWorldtask.CurrentTasksEntry.value:type_name -> Worldtasks
2, // 5: Worldtasks.TaskMapEntry.value:type_name -> Worldtask 2, // 5: Worldtasks.TaskMapEntry.value:type_name -> Worldtask
6, // [6:6] is the sub-list for method output_type 6, // [6:6] is the sub-list for method output_type
6, // [6:6] is the sub-list for method input_type 6, // [6:6] is the sub-list for method input_type

202
pb/worldtask_msg.pb.go
View File

@ -112,8 +112,7 @@ type WorldtaskAcceptReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
} }
func (x *WorldtaskAcceptReq) Reset() { func (x *WorldtaskAcceptReq) Reset() {
@ -148,13 +147,6 @@ func (*WorldtaskAcceptReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{2} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{2}
} }
func (x *WorldtaskAcceptReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
}
func (x *WorldtaskAcceptReq) GetTaskId() int32 { func (x *WorldtaskAcceptReq) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
@ -326,9 +318,8 @@ type WorldtaskCompleteCondiReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` CondiId int32 `protobuf:"varint,2,opt,name=condiId,proto3" json:"condiId"`
CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"`
} }
func (x *WorldtaskCompleteCondiReq) Reset() { func (x *WorldtaskCompleteCondiReq) Reset() {
@ -363,13 +354,6 @@ func (*WorldtaskCompleteCondiReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6}
} }
func (x *WorldtaskCompleteCondiReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
}
func (x *WorldtaskCompleteCondiReq) GetTaskId() int32 { func (x *WorldtaskCompleteCondiReq) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
@ -445,8 +429,7 @@ type WorldtaskFinishReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //分组ID TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID
} }
func (x *WorldtaskFinishReq) Reset() { func (x *WorldtaskFinishReq) Reset() {
@ -481,13 +464,6 @@ func (*WorldtaskFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8}
} }
func (x *WorldtaskFinishReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
}
func (x *WorldtaskFinishReq) GetTaskId() int32 { func (x *WorldtaskFinishReq) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
@ -707,7 +683,6 @@ type WorldtaskBattleFinishReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields 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"` //任务ID TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID
CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` //完成条件ID CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` //完成条件ID
BattleConfId int32 `protobuf:"varint,4,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID BattleConfId int32 `protobuf:"varint,4,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
@ -746,13 +721,6 @@ func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{13} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{13}
} }
func (x *WorldtaskBattleFinishReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
}
func (x *WorldtaskBattleFinishReq) GetTaskId() int32 { func (x *WorldtaskBattleFinishReq) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
@ -985,94 +953,88 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d,
0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18,
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x2c, 0x0a, 0x12, 0x57, 0x6f, 0x72,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12,
0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64,
0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a,
0x64, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x41, 0x0a, 0x1b, 0x57, 0x6f,
0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63,
0x69, 0x49, 0x64, 0x73, 0x22, 0x41, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73,
0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65,
0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x64, 0x0a,
0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x0b, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x18, 0x0a, 0x07,
0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x64, 0x0a, 0x0b, 0x43, 0x75, 0x72, 0x72, 0x65,
0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 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, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64,
0x73, 0x18, 0x03, 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, 0x22, 0x67, 0x0a,
0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 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, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69,
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, 0x12, 0x18, 0x0a, 0x07,
0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63,
0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x61, 0x73, 0x6b, 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, 0x22, 0x2d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x23,
0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xcd, 0x01, 0x6e, 0x64, 0x73, 0x22, 0x4d, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71,
0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
0x68, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43,
0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, 0x70,
0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x28, 0x05, 0x52, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64,
0x49, 0x64, 0x73, 0x1a, 0x48, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x22, 0x2d, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22,
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0xcd, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x75, 0x73, 0x68, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72,
0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x79, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x0a, 0x0f, 0x66,
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02,
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61,
0x6e, 0x66, 0x6f, 0x22, 0xb1, 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x48, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73,
0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28,
0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c,
0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x97, 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f,
0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e,
0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 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, 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, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x72, 0x6f, 0x74, 0x6f, 0x33,
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 (