diff --git a/cmd/v2/lib/pb/protocol.go b/cmd/v2/lib/pb/protocol.go index a0cb5c05e..2d7e92b99 100644 --- a/cmd/v2/lib/pb/protocol.go +++ b/cmd/v2/lib/pb/protocol.go @@ -41,7 +41,7 @@ var ( string(comm.ModuleShop), string(comm.ModuleMline), string(comm.ModulePagoda), - string(comm.ModuleRtask), + // string(comm.ModuleRtask), string(comm.ModuleLinestory), string(comm.ModuleGourmet), string(comm.ModuleSociaty), @@ -127,9 +127,9 @@ var ( "pagoda": { common.MF(comm.ModulePagoda, "getlist"), }, - "rtask": { - common.MF(comm.ModuleRtask, "rtest"), - }, + // "rtask": { + // common.MF(comm.ModuleRtask, "rtest"), + // }, "linestory": { common.MF(comm.ModuleLinestory, linestory.LinestorySubTypeChapter), common.MF(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp), @@ -154,6 +154,7 @@ var ( "worldtask": { common.MF(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine), common.MF(comm.ModuleWorldtask, "check"), + common.MF(comm.ModuleWorldtask, "test"), }, "smithy": { common.MF(comm.ModuleSmithy, "customer"), @@ -672,18 +673,18 @@ var ( Enabled: true, }, // rtask - string(comm.ModuleRtask): { - NavLabel: "随机任务", - MainType: string(comm.ModuleRtask), - Enabled: true, - }, - common.MF(comm.ModuleRtask, "rtest"): { - NavLabel: "测试条件", - Desc: "测试任务触发", - MainType: string(comm.ModuleRtask), - SubType: "rtest", - Enabled: true, - }, + // string(comm.ModuleRtask): { + // NavLabel: "随机任务", + // MainType: string(comm.ModuleRtask), + // Enabled: true, + // }, + // common.MF(comm.ModuleRtask, "rtest"): { + // NavLabel: "测试条件", + // Desc: "测试任务触发", + // MainType: string(comm.ModuleRtask), + // SubType: "rtest", + // Enabled: true, + // }, //linestory string(comm.ModuleLinestory): { NavLabel: "支线剧情任务", @@ -814,6 +815,13 @@ var ( SubType: "check", Enabled: true, }, + common.MF(comm.ModuleWorldtask, "test"): { + NavLabel: "触发条件", + Desc: "触发条件", + MainType: string(comm.ModuleWorldtask), + SubType: "test", + Enabled: true, + }, // smithy string(comm.ModuleSmithy): { NavLabel: "铁匠铺", diff --git a/cmd/v2/ui/navview.go b/cmd/v2/ui/navview.go index 4380e2884..dd953f4f0 100644 --- a/cmd/v2/ui/navview.go +++ b/cmd/v2/ui/navview.go @@ -95,7 +95,7 @@ var ( // pagoda common.MF(comm.ModulePagoda, "getlist"): &formview.PagodaListView{}, // rtask - common.MF(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, + // common.MF(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, // linestory common.MF(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, common.MF(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): &formview.FetterstoryView{}, @@ -115,6 +115,7 @@ var ( //worldtask common.MF(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): &formview.WorldtaskMineView{}, common.MF(comm.ModuleWorldtask, "check"): &formview.CheckWorldtaskView{}, + common.MF(comm.ModuleWorldtask, "test"): &formview.RtaskTestView{}, //smithy common.MF(comm.ModuleSmithy, "customer"): &formview.SmithyView{}, //武馆派遣 diff --git a/cmd/v2/ui/views/rtask_record.go b/cmd/v2/ui/views/rtask_record.go index 4b0fb03f4..ea945cadd 100644 --- a/cmd/v2/ui/views/rtask_record.go +++ b/cmd/v2/ui/views/rtask_record.go @@ -2,11 +2,8 @@ package formview import ( "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" "fyne.io/fyne/v2" - "github.com/sirupsen/logrus" ) type RtaskRecordView struct { @@ -15,10 +12,10 @@ type RtaskRecordView struct { func (this *RtaskRecordView) CreateView(t *model.TestCase) fyne.CanvasObject { - this.form.OnSubmit = func() { - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.TaskGetrecordReq{}); err != nil { - logrus.Error(err) - } - } + // this.form.OnSubmit = func() { + // if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.TaskGetrecordReq{}); err != nil { + // logrus.Error(err) + // } + // } return this.form } diff --git a/cmd/v2/ui/views/rtask_testview.go b/cmd/v2/ui/views/rtask_testview.go index 03d81dbc0..023a2d30e 100644 --- a/cmd/v2/ui/views/rtask_testview.go +++ b/cmd/v2/ui/views/rtask_testview.go @@ -67,7 +67,7 @@ func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { if err := service.GetPttService().SendToClient( t.MainType, t.SubType, - &pb.RtaskTestReq{ + &pb.WorldtaskTestReq{ RtaskType: cast.ToInt32(rtaskTypeInput.Text), Params: utils.TrInt32(paramsInput.Text), CondiId: cast.ToInt32(condiInput.Text), @@ -233,7 +233,7 @@ func (this *RtaskTestView) rtestListener() { this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{ OnNotify: func(d interface{}, args ...interface{}) { data := d.(*pb.UserMessage) - if data.MainType == string(comm.ModuleRtask) && + if data.MainType == string(comm.ModuleWorldtask) && data.SubType == "rtest" { rsp := &pb.RtaskTestResp{} diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index 732899a75..38ee37c1d 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -129,6 +129,8 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) return } + a.module.ModuleBuried.ActiveCondition(uid, curTaskConf.Completetask...) + //判断是否要结束任务 if ((len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) || len(curTaskConf.Completetask) == 0) && curTaskConf.DeliverNpc == 0 { @@ -143,7 +145,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) for _, cond := range conds { if cond.State == pb.BuriedItemFinishState_buried_finish { flag = true - rsp.Conds = append(rsp.Conds, cond) + rsp.Conds = append(rsp.Conds, cond) } else { flag = false break @@ -162,15 +164,16 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) // 已完成的任务条件 conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) if err == nil { - var unfinishCondIds []int32 + // var unfinishCondIds []int32 for _, cond := range conds { if cond.State == pb.BuriedItemFinishState_buried_finish { rsp.Conds = append(rsp.Conds, cond) - } else if cond.State == pb.BuriedItemFinishState_buried_unfinish { - unfinishCondIds = append(unfinishCondIds, cond.Conid) } + // else if cond.State == pb.BuriedItemFinishState_buried_unfinish { + // unfinishCondIds = append(unfinishCondIds, cond.Conid) + // } } - a.module.ModuleBuried.ActiveCondition(uid, unfinishCondIds...) + // a.module.ModuleBuried.ActiveCondition(uid, unfinishCondIds...) } a.sendMsg(session, WorldtaskSubtypeAccept, rsp) } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index b952fef28..51e2a5182 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -63,6 +63,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC Title: pb.ErrorCode_ExternalModule.ToString(), Message: comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error(), } + return } // 设置当前任务的完成条件 @@ -80,17 +81,6 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC } } - // 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[curTaskConf.Group] = wt - update := map[string]interface{}{ "currentTasks": myWorldtask.CurrentTasks, } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 278134862..687fede69 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -51,15 +51,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe return } - // if curTaskConf.Group != req.GroupId { - // errdata = &pb.ErrorData{ - // Code: pb.ErrorCode_WorldtaskGroupIdNosame, - // Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(), - // Message: fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId), - // } - // return - // } - if curTaskConf.DeliverNpc == 0 { errdata = &pb.ErrorData{ Code: pb.ErrorCode_WorldtaskNoProcess, diff --git a/modules/worldtask/api_test.go b/modules/worldtask/api_test.go new file mode 100644 index 000000000..53790cc6c --- /dev/null +++ b/modules/worldtask/api_test.go @@ -0,0 +1,55 @@ +package worldtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +func (this *apiComp) TestCheck(session comm.IUserSession, req *pb.WorldtaskTestReq) (errdata *pb.ErrorData) { + if len(req.Params) < 1 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +func (this *apiComp) Test(session comm.IUserSession, req *pb.WorldtaskTestReq) (errdata *pb.ErrorData) { + if errdata = this.TestCheck(session, req); errdata != nil { + return + } + rsp := &pb.WorldtaskTestResp{Flag: true, RtaskType: req.RtaskType} + // 校验 + if req.CondiId != 0 { + condIds, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), req.CondiId) + if err == nil && len(condIds) > 0 { + rsp.Flag = true + } + // 触发 + } else if req.RtaskType != 0 && len(req.Params) > 0 { + conds := []int32{} + switch len(req.Params) { + case 2: + conds[0] = req.Params[1] + case 3: + conds[0] = req.Params[1] + conds[1] = req.Params[2] + case 4: + conds[0] = req.Params[1] + conds[1] = req.Params[2] + conds[2] = req.Params[3] + case 5: + conds[0] = req.Params[1] + conds[1] = req.Params[2] + conds[2] = req.Params[3] + conds[3] = req.Params[4] + } + this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.TaskType(req.RtaskType), req.Params[0], conds...)) + + rsp.Flag = true + } + + session.SendMsg(string(this.module.GetType()), "test", rsp) + return +} diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index a7b3f817a..6b3ade21c 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -126,16 +126,17 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { for _, cfg := range worldtaskConf.GetDataList() { for _, condId := range cfg.Completetask { for _, cond := range conds { - if condId == cond.Conid { + if condId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish { //校验任务是否是当前任务 if task, ok := userTask.CurrentTasks[cfg.Group]; ok { var currentTasks []*pb.CurrentTask for _, t := range task.TaskMap { - if t.NpcStatus == 1 && cfg.Key == t.TaskId { + if cfg.Key == t.TaskId { finishedCondIds = append(finishedCondIds, cond) currentTasks = append(currentTasks, &pb.CurrentTask{ GroupId: cfg.Group, TaskId: cfg.Key, + Conds: finishedCondIds, }) } } @@ -146,71 +147,35 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { } } - // this.Debug("完成条件", - // log.Field{Key: "taskId", Value: taskId}, - // log.Field{Key: "condIds", Value: finishedCondIds}) - if len(finishedCondIds) == 0 { + // this.Debug("未匹配到完成的条件") return } - // 当前任务配置 - // curTaskConf, err := this.configure.getWorldtaskById(taskId) - // if err != nil || curTaskConf == nil { - // return - // } - - // if userTask.CurrentTasks == nil { - // userTask.CurrentTasks = make(map[int32]*pb.Worldtasks) - // } - - // wt, ok := userTask.CurrentTasks[groupId] - // if !ok { - // wt = &pb.Worldtasks{} - // } - - // // for _, condId := range finishedCondIds { - - // for _, cond1 := range finishedCondIds { - // for _, cond2 := range wt.Conds { - // if cond2.Conid == cond1.Conid { - // cond2 = cond1 - // } else { - // wt.Conds = append(wt.Conds, cond1) - // } - // } - // } - - // userTask.CurrentTasks[groupId] = wt - - // for _, v := range userTask.CurrentTasks { - // if curTaskConf.Key == v.TaskId { - // if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付 - // this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf) - // this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf) - // } else { - // update := map[string]interface{}{ - // "currentTask": userTask.CurrentTasks, - // } - // this.modelWorldtask.Change(uid, update) - // } - // break - // } - // } - var currentTasks []*pb.CurrentTask for _, tasks := range taskConds { for _, t := range tasks { + // for _, cond := range t.Conds { + // if cond.State == pb.BuriedItemFinishState_buried_finish { + curTaskConf, err := this.configure.getWorldtaskById(t.TaskId) + if err != nil || curTaskConf == nil { + return + } + if curTaskConf.DeliverNpc == 0 { + this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf) + this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf) + } currentTasks = append(currentTasks, t) + // } + // } } } - session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{ - // GroupId: groupId, - // TaskId: taskId, - // Conds: wt.Conds, - Tasks: currentTasks, - }) + if len(currentTasks) > 0 { + session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{ + Tasks: currentTasks, + }) + } return } @@ -340,11 +305,6 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32) //重置taskList mytask.TaskList = []int32{} - // 判断任务ID是否已完成 - // if _, ok := utils.Findx(mytask.TaskList, taskId); ok { - // this.Error("GM 世界任务已完成", log.Field{Key: "taskId", Value: taskId}) - // return comm.NewCustomError(pb.ErrorCode_WorldtaskFinihed) - // } worldtaskConf, err := this.configure.getWorldtaskCfg() if err != nil { @@ -365,16 +325,18 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32) "taskList": mytask.TaskList, } - if mytask.CurrentTasks == nil { - mytask.CurrentTasks = make(map[int32]*pb.Worldtasks) + mytask.CurrentTasks = make(map[int32]*pb.Worldtasks) + + tasks := &pb.Worldtasks{ + TaskMap: make(map[int32]*pb.Worldtask), } - if t, ok := mytask.CurrentTasks[taskConf.Group]; ok { - t.TaskMap[taskId] = &pb.Worldtask{ - TaskId: taskId, - TaskType: taskConf.Des, //设置主线类型 - } + tasks.TaskMap[taskId] = &pb.Worldtask{ + TaskId: taskId, + TaskType: taskConf.Des, } + + mytask.CurrentTasks[taskConf.Group] = tasks update["currentTasks"] = mytask.CurrentTasks if err := this.modelWorldtask.Change(uid, update); err != nil { diff --git a/pb/task_msg.pb.go b/pb/task_msg.pb.go index 8f83358fa..ed64f6532 100644 --- a/pb/task_msg.pb.go +++ b/pb/task_msg.pb.go @@ -20,91 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type TaskGetrecordReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *TaskGetrecordReq) Reset() { - *x = TaskGetrecordReq{} - if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TaskGetrecordReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TaskGetrecordReq) ProtoMessage() {} - -func (x *TaskGetrecordReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[0] - 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 TaskGetrecordReq.ProtoReflect.Descriptor instead. -func (*TaskGetrecordReq) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{0} -} - -type TaskGetrecordResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Record *DBRtaskRecord `protobuf:"bytes,1,opt,name=record,proto3" json:"record"` -} - -func (x *TaskGetrecordResp) Reset() { - *x = TaskGetrecordResp{} - if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TaskGetrecordResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TaskGetrecordResp) ProtoMessage() {} - -func (x *TaskGetrecordResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_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 TaskGetrecordResp.ProtoReflect.Descriptor instead. -func (*TaskGetrecordResp) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *TaskGetrecordResp) GetRecord() *DBRtaskRecord { - if x != nil { - return x.Record - } - return nil -} - //任务触发 type TaskSendReq struct { state protoimpl.MessageState @@ -118,7 +33,7 @@ type TaskSendReq struct { func (x *TaskSendReq) Reset() { *x = TaskSendReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[2] + mi := &file_task_task_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -131,7 +46,7 @@ func (x *TaskSendReq) String() string { func (*TaskSendReq) ProtoMessage() {} func (x *TaskSendReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[2] + mi := &file_task_task_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -144,7 +59,7 @@ func (x *TaskSendReq) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskSendReq.ProtoReflect.Descriptor instead. func (*TaskSendReq) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{2} + return file_task_task_msg_proto_rawDescGZIP(), []int{0} } func (x *TaskSendReq) GetTaskType() int32 { @@ -172,7 +87,7 @@ type TaskSendResp struct { func (x *TaskSendResp) Reset() { *x = TaskSendResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[3] + mi := &file_task_task_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -185,7 +100,7 @@ func (x *TaskSendResp) String() string { func (*TaskSendResp) ProtoMessage() {} func (x *TaskSendResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[3] + mi := &file_task_task_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -198,7 +113,7 @@ func (x *TaskSendResp) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskSendResp.ProtoReflect.Descriptor instead. func (*TaskSendResp) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{3} + return file_task_task_msg_proto_rawDescGZIP(), []int{1} } func (x *TaskSendResp) GetIsSucc() bool { @@ -221,7 +136,7 @@ type TaskReceiveReq struct { func (x *TaskReceiveReq) Reset() { *x = TaskReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[4] + mi := &file_task_task_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -234,7 +149,7 @@ func (x *TaskReceiveReq) String() string { func (*TaskReceiveReq) ProtoMessage() {} func (x *TaskReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[4] + mi := &file_task_task_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -247,7 +162,7 @@ func (x *TaskReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskReceiveReq.ProtoReflect.Descriptor instead. func (*TaskReceiveReq) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{4} + return file_task_task_msg_proto_rawDescGZIP(), []int{2} } func (x *TaskReceiveReq) GetTaskTag() int32 { @@ -275,7 +190,7 @@ type TaskReceiveResp struct { func (x *TaskReceiveResp) Reset() { *x = TaskReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[5] + mi := &file_task_task_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -288,7 +203,7 @@ func (x *TaskReceiveResp) String() string { func (*TaskReceiveResp) ProtoMessage() {} func (x *TaskReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[5] + mi := &file_task_task_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -301,7 +216,7 @@ func (x *TaskReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskReceiveResp.ProtoReflect.Descriptor instead. func (*TaskReceiveResp) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{5} + return file_task_task_msg_proto_rawDescGZIP(), []int{3} } func (x *TaskReceiveResp) GetTaskId() int32 { @@ -323,7 +238,7 @@ type TaskListReq struct { func (x *TaskListReq) Reset() { *x = TaskListReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[6] + mi := &file_task_task_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -336,7 +251,7 @@ func (x *TaskListReq) String() string { func (*TaskListReq) ProtoMessage() {} func (x *TaskListReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[6] + mi := &file_task_task_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -349,7 +264,7 @@ func (x *TaskListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskListReq.ProtoReflect.Descriptor instead. func (*TaskListReq) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{6} + return file_task_task_msg_proto_rawDescGZIP(), []int{4} } func (x *TaskListReq) GetTaskTag() int32 { @@ -370,7 +285,7 @@ type TaskListResp struct { func (x *TaskListResp) Reset() { *x = TaskListResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[7] + mi := &file_task_task_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -383,7 +298,7 @@ func (x *TaskListResp) String() string { func (*TaskListResp) ProtoMessage() {} func (x *TaskListResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[7] + mi := &file_task_task_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -396,7 +311,7 @@ func (x *TaskListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskListResp.ProtoReflect.Descriptor instead. func (*TaskListResp) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{7} + return file_task_task_msg_proto_rawDescGZIP(), []int{5} } func (x *TaskListResp) GetList() []*TaskData { @@ -418,7 +333,7 @@ type TaskActiveListReq struct { func (x *TaskActiveListReq) Reset() { *x = TaskActiveListReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[8] + mi := &file_task_task_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -431,7 +346,7 @@ func (x *TaskActiveListReq) String() string { func (*TaskActiveListReq) ProtoMessage() {} func (x *TaskActiveListReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[8] + mi := &file_task_task_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -444,7 +359,7 @@ func (x *TaskActiveListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskActiveListReq.ProtoReflect.Descriptor instead. func (*TaskActiveListReq) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{8} + return file_task_task_msg_proto_rawDescGZIP(), []int{6} } func (x *TaskActiveListReq) GetTaskTag() int32 { @@ -466,7 +381,7 @@ type TaskActiveListResp struct { func (x *TaskActiveListResp) Reset() { *x = TaskActiveListResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[9] + mi := &file_task_task_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -479,7 +394,7 @@ func (x *TaskActiveListResp) String() string { func (*TaskActiveListResp) ProtoMessage() {} func (x *TaskActiveListResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[9] + mi := &file_task_task_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -492,7 +407,7 @@ func (x *TaskActiveListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskActiveListResp.ProtoReflect.Descriptor instead. func (*TaskActiveListResp) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{9} + return file_task_task_msg_proto_rawDescGZIP(), []int{7} } func (x *TaskActiveListResp) GetList() []*ActivityData { @@ -522,7 +437,7 @@ type TaskActiveReceiveReq struct { func (x *TaskActiveReceiveReq) Reset() { *x = TaskActiveReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[10] + mi := &file_task_task_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -535,7 +450,7 @@ func (x *TaskActiveReceiveReq) String() string { func (*TaskActiveReceiveReq) ProtoMessage() {} func (x *TaskActiveReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[10] + mi := &file_task_task_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -548,7 +463,7 @@ func (x *TaskActiveReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskActiveReceiveReq.ProtoReflect.Descriptor instead. func (*TaskActiveReceiveReq) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{10} + return file_task_task_msg_proto_rawDescGZIP(), []int{8} } func (x *TaskActiveReceiveReq) GetTaskTag() int32 { @@ -577,7 +492,7 @@ type TaskActiveReceiveResp struct { func (x *TaskActiveReceiveResp) Reset() { *x = TaskActiveReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[11] + mi := &file_task_task_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -590,7 +505,7 @@ func (x *TaskActiveReceiveResp) String() string { func (*TaskActiveReceiveResp) ProtoMessage() {} func (x *TaskActiveReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[11] + mi := &file_task_task_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -603,7 +518,7 @@ func (x *TaskActiveReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskActiveReceiveResp.ProtoReflect.Descriptor instead. func (*TaskActiveReceiveResp) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{11} + return file_task_task_msg_proto_rawDescGZIP(), []int{9} } func (x *TaskActiveReceiveResp) GetTaskTag() int32 { @@ -632,7 +547,7 @@ type TaskFinishedPush struct { func (x *TaskFinishedPush) Reset() { *x = TaskFinishedPush{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[12] + mi := &file_task_task_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -645,7 +560,7 @@ func (x *TaskFinishedPush) String() string { func (*TaskFinishedPush) ProtoMessage() {} func (x *TaskFinishedPush) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[12] + mi := &file_task_task_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -658,7 +573,7 @@ func (x *TaskFinishedPush) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskFinishedPush.ProtoReflect.Descriptor instead. func (*TaskFinishedPush) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{12} + return file_task_task_msg_proto_rawDescGZIP(), []int{10} } func (x *TaskFinishedPush) GetTaskId() int32 { @@ -680,7 +595,7 @@ type TaskActiveReceivePush struct { func (x *TaskActiveReceivePush) Reset() { *x = TaskActiveReceivePush{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[13] + mi := &file_task_task_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -693,7 +608,7 @@ func (x *TaskActiveReceivePush) String() string { func (*TaskActiveReceivePush) ProtoMessage() {} func (x *TaskActiveReceivePush) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[13] + mi := &file_task_task_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -706,7 +621,7 @@ func (x *TaskActiveReceivePush) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskActiveReceivePush.ProtoReflect.Descriptor instead. func (*TaskActiveReceivePush) Descriptor() ([]byte, []int) { - return file_task_task_msg_proto_rawDescGZIP(), []int{13} + return file_task_task_msg_proto_rawDescGZIP(), []int{11} } func (x *TaskActiveReceivePush) GetTaskTag() int32 { @@ -728,55 +643,50 @@ var File_task_task_msg_proto protoreflect.FileDescriptor var file_task_task_msg_proto_rawDesc = []byte{ 0x0a, 0x13, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x74, 0x61, 0x73, 0x6b, - 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x54, 0x61, 0x73, - 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, - 0x11, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x41, 0x0a, 0x0b, 0x54, 0x61, - 0x73, 0x6b, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, - 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, - 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x26, 0x0a, - 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, - 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, - 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x3a, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, - 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, - 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, - 0x64, 0x22, 0x29, 0x0a, 0x0f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 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, 0x27, 0x0a, 0x0b, - 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, + 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x41, 0x0a, 0x0b, 0x54, 0x61, 0x73, + 0x6b, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, + 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x26, 0x0a, 0x0c, + 0x54, 0x61, 0x73, 0x6b, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, + 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, + 0x53, 0x75, 0x63, 0x63, 0x22, 0x3a, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, + 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, + 0x22, 0x29, 0x0a, 0x0f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 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, 0x27, 0x0a, 0x0b, 0x54, + 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, + 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, + 0x6b, 0x54, 0x61, 0x67, 0x22, 0x2d, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c, + 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, + 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, + 0x61, 0x67, 0x22, 0x4f, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, + 0x79, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x40, 0x0a, 0x14, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, - 0x73, 0x6b, 0x54, 0x61, 0x67, 0x22, 0x2d, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, - 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, - 0x76, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, - 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, - 0x54, 0x61, 0x67, 0x22, 0x4f, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, - 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x6c, 0x69, 0x73, - 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x65, 0x22, 0x40, 0x0a, 0x14, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, - 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, - 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, - 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x41, 0x0a, 0x15, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, - 0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x54, 0x61, 0x73, - 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 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, 0x41, 0x0a, 0x15, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, + 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x41, 0x0a, 0x15, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x54, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 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, 0x41, 0x0a, 0x15, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, + 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, + 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -791,35 +701,31 @@ func file_task_task_msg_proto_rawDescGZIP() []byte { return file_task_task_msg_proto_rawDescData } -var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12) var file_task_task_msg_proto_goTypes = []interface{}{ - (*TaskGetrecordReq)(nil), // 0: TaskGetrecordReq - (*TaskGetrecordResp)(nil), // 1: TaskGetrecordResp - (*TaskSendReq)(nil), // 2: TaskSendReq - (*TaskSendResp)(nil), // 3: TaskSendResp - (*TaskReceiveReq)(nil), // 4: TaskReceiveReq - (*TaskReceiveResp)(nil), // 5: TaskReceiveResp - (*TaskListReq)(nil), // 6: TaskListReq - (*TaskListResp)(nil), // 7: TaskListResp - (*TaskActiveListReq)(nil), // 8: TaskActiveListReq - (*TaskActiveListResp)(nil), // 9: TaskActiveListResp - (*TaskActiveReceiveReq)(nil), // 10: TaskActiveReceiveReq - (*TaskActiveReceiveResp)(nil), // 11: TaskActiveReceiveResp - (*TaskFinishedPush)(nil), // 12: TaskFinishedPush - (*TaskActiveReceivePush)(nil), // 13: TaskActiveReceivePush - (*DBRtaskRecord)(nil), // 14: DBRtaskRecord - (*TaskData)(nil), // 15: TaskData - (*ActivityData)(nil), // 16: ActivityData + (*TaskSendReq)(nil), // 0: TaskSendReq + (*TaskSendResp)(nil), // 1: TaskSendResp + (*TaskReceiveReq)(nil), // 2: TaskReceiveReq + (*TaskReceiveResp)(nil), // 3: TaskReceiveResp + (*TaskListReq)(nil), // 4: TaskListReq + (*TaskListResp)(nil), // 5: TaskListResp + (*TaskActiveListReq)(nil), // 6: TaskActiveListReq + (*TaskActiveListResp)(nil), // 7: TaskActiveListResp + (*TaskActiveReceiveReq)(nil), // 8: TaskActiveReceiveReq + (*TaskActiveReceiveResp)(nil), // 9: TaskActiveReceiveResp + (*TaskFinishedPush)(nil), // 10: TaskFinishedPush + (*TaskActiveReceivePush)(nil), // 11: TaskActiveReceivePush + (*TaskData)(nil), // 12: TaskData + (*ActivityData)(nil), // 13: ActivityData } var file_task_task_msg_proto_depIdxs = []int32{ - 14, // 0: TaskGetrecordResp.record:type_name -> DBRtaskRecord - 15, // 1: TaskListResp.list:type_name -> TaskData - 16, // 2: TaskActiveListResp.list:type_name -> ActivityData - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name + 12, // 0: TaskListResp.list:type_name -> TaskData + 13, // 1: TaskActiveListResp.list:type_name -> ActivityData + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_task_task_msg_proto_init() } @@ -830,30 +736,6 @@ func file_task_task_msg_proto_init() { file_task_task_db_proto_init() if !protoimpl.UnsafeEnabled { file_task_task_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskGetrecordReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_task_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskGetrecordResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_task_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskSendReq); i { case 0: return &v.state @@ -865,7 +747,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskSendResp); i { case 0: return &v.state @@ -877,7 +759,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskReceiveReq); i { case 0: return &v.state @@ -889,7 +771,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskReceiveResp); i { case 0: return &v.state @@ -901,7 +783,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskListReq); i { case 0: return &v.state @@ -913,7 +795,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskListResp); i { case 0: return &v.state @@ -925,7 +807,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskActiveListReq); i { case 0: return &v.state @@ -937,7 +819,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskActiveListResp); i { case 0: return &v.state @@ -949,7 +831,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskActiveReceiveReq); i { case 0: return &v.state @@ -961,7 +843,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskActiveReceiveResp); i { case 0: return &v.state @@ -973,7 +855,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskFinishedPush); i { case 0: return &v.state @@ -985,7 +867,7 @@ func file_task_task_msg_proto_init() { return nil } } - file_task_task_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_task_task_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskActiveReceivePush); i { case 0: return &v.state @@ -1004,7 +886,7 @@ func file_task_task_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_task_task_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 12, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go index cb6e024f6..1d36b91cb 100644 --- a/pb/worldtask_msg.pb.go +++ b/pb/worldtask_msg.pb.go @@ -939,6 +939,149 @@ func (x *WorldtaskChapterrewardResp) GetGroupId() int32 { return 0 } +// 测试使用 +type WorldtaskTestReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RtaskType int32 `protobuf:"varint,1,opt,name=rtaskType,proto3" json:"rtaskType"` //任务类型 + Params []int32 `protobuf:"varint,2,rep,packed,name=params,proto3" json:"params"` //参数 + CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` //条件ID + GroupId int32 `protobuf:"varint,4,opt,name=groupId,proto3" json:"groupId"` //分组编号 + RtaskIds string `protobuf:"bytes,5,opt,name=rtaskIds,proto3" json:"rtaskIds"` //已完成的任务ids +} + +func (x *WorldtaskTestReq) Reset() { + *x = WorldtaskTestReq{} + if protoimpl.UnsafeEnabled { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WorldtaskTestReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WorldtaskTestReq) ProtoMessage() {} + +func (x *WorldtaskTestReq) ProtoReflect() protoreflect.Message { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[18] + 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 WorldtaskTestReq.ProtoReflect.Descriptor instead. +func (*WorldtaskTestReq) Descriptor() ([]byte, []int) { + return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{18} +} + +func (x *WorldtaskTestReq) GetRtaskType() int32 { + if x != nil { + return x.RtaskType + } + return 0 +} + +func (x *WorldtaskTestReq) GetParams() []int32 { + if x != nil { + return x.Params + } + return nil +} + +func (x *WorldtaskTestReq) GetCondiId() int32 { + if x != nil { + return x.CondiId + } + return 0 +} + +func (x *WorldtaskTestReq) GetGroupId() int32 { + if x != nil { + return x.GroupId + } + return 0 +} + +func (x *WorldtaskTestReq) GetRtaskIds() string { + if x != nil { + return x.RtaskIds + } + return "" +} + +type WorldtaskTestResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Flag bool `protobuf:"varint,1,opt,name=flag,proto3" json:"flag"` + RtaskIds []int32 `protobuf:"varint,2,rep,packed,name=rtaskIds,proto3" json:"rtaskIds"` + RtaskType int32 `protobuf:"varint,3,opt,name=rtaskType,proto3" json:"rtaskType"` +} + +func (x *WorldtaskTestResp) Reset() { + *x = WorldtaskTestResp{} + if protoimpl.UnsafeEnabled { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WorldtaskTestResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WorldtaskTestResp) ProtoMessage() {} + +func (x *WorldtaskTestResp) ProtoReflect() protoreflect.Message { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[19] + 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 WorldtaskTestResp.ProtoReflect.Descriptor instead. +func (*WorldtaskTestResp) Descriptor() ([]byte, []int) { + return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *WorldtaskTestResp) GetFlag() bool { + if x != nil { + return x.Flag + } + return false +} + +func (x *WorldtaskTestResp) GetRtaskIds() []int32 { + if x != nil { + return x.RtaskIds + } + return nil +} + +func (x *WorldtaskTestResp) GetRtaskType() int32 { + if x != nil { + return x.RtaskType + } + return 0 +} + var File_worldtask_worldtask_msg_proto protoreflect.FileDescriptor var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ @@ -1033,8 +1176,24 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ 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, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x98, + 0x01, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, + 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 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, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, + 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x61, 0x0a, 0x11, 0x57, 0x6f, 0x72, + 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, + 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, + 0x61, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x12, 0x1c, + 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1049,7 +1208,7 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte { return file_worldtask_worldtask_msg_proto_rawDescData } -var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp @@ -1069,26 +1228,28 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskFinishIdsPush)(nil), // 15: WorldtaskFinishIdsPush (*WorldtaskChapterrewardReq)(nil), // 16: WorldtaskChapterrewardReq (*WorldtaskChapterrewardResp)(nil), // 17: WorldtaskChapterrewardResp - nil, // 18: WorldtaskNexttaskPush.NextTaskEntry - (*DBWorldtask)(nil), // 19: DBWorldtask - (*ConIProgress)(nil), // 20: ConIProgress - (*BattleFormation)(nil), // 21: BattleFormation - (*BattleInfo)(nil), // 22: BattleInfo - (*BattleReport)(nil), // 23: BattleReport - (*Worldtask)(nil), // 24: Worldtask - (*Worldtasks)(nil), // 25: Worldtasks + (*WorldtaskTestReq)(nil), // 18: WorldtaskTestReq + (*WorldtaskTestResp)(nil), // 19: WorldtaskTestResp + nil, // 20: WorldtaskNexttaskPush.NextTaskEntry + (*DBWorldtask)(nil), // 21: DBWorldtask + (*ConIProgress)(nil), // 22: ConIProgress + (*BattleFormation)(nil), // 23: BattleFormation + (*BattleInfo)(nil), // 24: BattleInfo + (*BattleReport)(nil), // 25: BattleReport + (*Worldtask)(nil), // 26: Worldtask + (*Worldtasks)(nil), // 27: Worldtasks } var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ - 19, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask - 20, // 1: WorldtaskAcceptResp.conds:type_name -> ConIProgress + 21, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask + 22, // 1: WorldtaskAcceptResp.conds:type_name -> ConIProgress 5, // 2: WorldtaskCompletecondisPush.tasks:type_name -> CurrentTask - 20, // 3: CurrentTask.conds:type_name -> ConIProgress - 18, // 4: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry - 21, // 5: WorldtaskBattleStartReq.battle:type_name -> BattleFormation - 22, // 6: WorldtaskBattleStartResp.info:type_name -> BattleInfo - 23, // 7: WorldtaskBattleFinishReq.report:type_name -> BattleReport - 24, // 8: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask - 25, // 9: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtasks + 22, // 3: CurrentTask.conds:type_name -> ConIProgress + 20, // 4: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry + 23, // 5: WorldtaskBattleStartReq.battle:type_name -> BattleFormation + 24, // 6: WorldtaskBattleStartResp.info:type_name -> BattleInfo + 25, // 7: WorldtaskBattleFinishReq.report:type_name -> BattleReport + 26, // 8: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask + 27, // 9: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtasks 10, // [10:10] is the sub-list for method output_type 10, // [10:10] is the sub-list for method input_type 10, // [10:10] is the sub-list for extension type_name @@ -1321,6 +1482,30 @@ func file_worldtask_worldtask_msg_proto_init() { return nil } } + file_worldtask_worldtask_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WorldtaskTestReq); 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[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WorldtaskTestResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1328,7 +1513,7 @@ func file_worldtask_worldtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 19, + NumMessages: 21, NumExtensions: 0, NumServices: 0, },