From cdd3db85b2a7b48fc013b2e1af7260a75b8c264b Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Thu, 2 Feb 2023 10:42:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E4=BB=BB=E5=8A=A1=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/v2/ui/protocol.go | 52 +- cmd/v2/ui/views/rtask_apply.go | 44 -- cmd/v2/ui/views/rtask_battlefinish.go | 33 - cmd/v2/ui/views/rtask_battlestart.go | 43 - cmd/v2/ui/views/rtask_choose.go | 52 -- cmd/v2/ui/views/rtask_reward.go | 37 - modules/rtask/api.go | 10 +- modules/rtask/api_send.go | 29 + pb/rtask_msg.pb.go | 1048 +++++-------------------- pb/userexpand.pb.go | 2 +- 10 files changed, 250 insertions(+), 1100 deletions(-) delete mode 100644 cmd/v2/ui/views/rtask_apply.go delete mode 100644 cmd/v2/ui/views/rtask_battlefinish.go delete mode 100644 cmd/v2/ui/views/rtask_battlestart.go delete mode 100644 cmd/v2/ui/views/rtask_choose.go delete mode 100644 cmd/v2/ui/views/rtask_reward.go create mode 100644 modules/rtask/api_send.go diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go index 4ffc79776..13cdc6dca 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/ui/protocol.go @@ -102,14 +102,9 @@ var ( // pagoda ff(comm.ModulePagoda, "getlist"): &formview.PagodaListView{}, // rtask - ff(comm.ModuleRtask, rtask.RtaskSubTypeList): &formview.RtaskListView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeApply): &formview.RtaskDoitView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose): &formview.RtaskChooseView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeReward): &formview.RtaskRewardView{}, - ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): &formview.RtaskBattlestartView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): &formview.RtaskBattleFinishView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{}, + ff(comm.ModuleRtask, rtask.RtaskSubTypeList): &formview.RtaskListView{}, + ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, + ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{}, // linestory ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, ff(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): &formview.FetterstoryView{}, @@ -227,12 +222,6 @@ var ( }, "rtask": { ff(comm.ModuleRtask, rtask.RtaskSubTypeList), - ff(comm.ModuleRtask, rtask.RtaskSubTypeApply), - ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose), - ff(comm.ModuleRtask, rtask.RtaskSubTypeReward), - - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart), - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish), ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord), ff(comm.ModuleRtask, "rtest"), }, @@ -770,41 +759,6 @@ var ( return "" }, }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeApply): { - NavLabel: "做任务", - Desc: "执行随机任务", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeApply, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose): { - NavLabel: "情景对答", - Desc: "情景对答", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeChoose, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeReward): { - NavLabel: "领奖", - Desc: "领奖", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeReward, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): { - NavLabel: "战斗开始", - Desc: "战斗开始", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeBattleStart, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): { - NavLabel: "战斗结束", - Desc: "战斗结束", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeBattleFinish, - Enabled: true, - }, ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): { NavLabel: "任务数据", Desc: "任务数据", diff --git a/cmd/v2/ui/views/rtask_apply.go b/cmd/v2/ui/views/rtask_apply.go deleted file mode 100644 index eff997d7f..000000000 --- a/cmd/v2/ui/views/rtask_apply.go +++ /dev/null @@ -1,44 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskDoitView struct { - BaseformView -} - -func (this *RtaskDoitView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - taskId.PlaceHolder = "任务ID" - - subTaskId := widget.NewEntry() - subTaskId.PlaceHolder = "支线任务ID" - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - this.form.AppendItem(widget.NewFormItem("支线任务ID", subTaskId)) - - this.form.OnSubmit = func() { - if taskId.Text == "" { - dialog.ShowError(errors.New("请填写任务ID"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskApplyReq{ - RtaskId: cast.ToInt32(taskId.Text), - RtaskSubId: cast.ToInt32(subTaskId.Text), - }); err != nil { - logrus.Error(err) - } - } - - return this.form -} diff --git a/cmd/v2/ui/views/rtask_battlefinish.go b/cmd/v2/ui/views/rtask_battlefinish.go deleted file mode 100644 index 581af854f..000000000 --- a/cmd/v2/ui/views/rtask_battlefinish.go +++ /dev/null @@ -1,33 +0,0 @@ -package formview - -import ( - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskBattleFinishView struct { - BaseformView -} - -func (this *RtaskBattleFinishView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - - this.form.OnSubmit = func() { - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, - &pb.RtaskBattleFinishReq{ - RtaskId: cast.ToInt32(taskId.Text), - }); err != nil { - logrus.Error(err) - } - } - - return this.form -} diff --git a/cmd/v2/ui/views/rtask_battlestart.go b/cmd/v2/ui/views/rtask_battlestart.go deleted file mode 100644 index 09715e014..000000000 --- a/cmd/v2/ui/views/rtask_battlestart.go +++ /dev/null @@ -1,43 +0,0 @@ -package formview - -import ( - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - "strings" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskBattlestartView struct { - BaseformView -} - -func (this *RtaskBattlestartView) CreateView(t *model.TestCase) fyne.CanvasObject { - confId := widget.NewEntry() - - leadpos := widget.NewEntry() - - teamIds := widget.NewEntry() - teamIds.PlaceHolder = ",号分隔" - - this.form.AppendItem(widget.NewFormItem("关卡ID", confId)) - this.form.AppendItem(widget.NewFormItem("队长位置", leadpos)) - this.form.AppendItem(widget.NewFormItem("阵容信息", teamIds)) - - this.form.OnSubmit = func() { - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, - - &pb.RtaskBattleStartReq{ - BattleConfId: cast.ToInt32(confId.Text), - Leadpos: cast.ToInt32(leadpos.Text), - Teamids: strings.Split(teamIds.Text, ","), - }); err != nil { - logrus.Error(err) - } - } - return this.form -} diff --git a/cmd/v2/ui/views/rtask_choose.go b/cmd/v2/ui/views/rtask_choose.go deleted file mode 100644 index b78cb690e..000000000 --- a/cmd/v2/ui/views/rtask_choose.go +++ /dev/null @@ -1,52 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskChooseView struct { - BaseformView -} - -func (this *RtaskChooseView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - taskId.PlaceHolder = "任务ID" - - subTaskId := widget.NewEntry() - subTaskId.PlaceHolder = "支线任务ID" - - chooseId := widget.NewEntry() - chooseId.PlaceHolder = "选项ID" - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - this.form.AppendItem(widget.NewFormItem("支线任务ID", subTaskId)) - this.form.AppendItem(widget.NewFormItem("选项ID", chooseId)) - - this.form.OnSubmit = func() { - if taskId.Text == "" { - dialog.ShowError(errors.New("请填写任务ID"), this.w) - return - } - if chooseId.Text == "" { - dialog.ShowError(errors.New("请填写选项ID"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskChooseReq{ - RtaskId: cast.ToInt32(taskId.Text), - RtaskSubId: cast.ToInt32(subTaskId.Text), - ChooseId: cast.ToInt32(chooseId.Text), - }); err != nil { - logrus.Error(err) - } - } - return this.form -} diff --git a/cmd/v2/ui/views/rtask_reward.go b/cmd/v2/ui/views/rtask_reward.go deleted file mode 100644 index 16b4cb0fc..000000000 --- a/cmd/v2/ui/views/rtask_reward.go +++ /dev/null @@ -1,37 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskRewardView struct { - BaseformView -} - -func (this *RtaskRewardView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - taskId.PlaceHolder = "任务ID" - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - this.form.OnSubmit = func() { - if taskId.Text == "" { - dialog.ShowError(errors.New("请填写任务ID"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskGetRewardReq{ - RtaskId: cast.ToInt32(taskId.Text), - }); err != nil { - logrus.Error(err) - } - } - return this.form -} diff --git a/modules/rtask/api.go b/modules/rtask/api.go index 861698558..7e0350733 100644 --- a/modules/rtask/api.go +++ b/modules/rtask/api.go @@ -6,13 +6,9 @@ import ( ) const ( - RtaskSubTypeChoose = "choose" //选择 - RtaskSubTypeList = "list" //随机任务列表 - RtaskSubTypeApply = "apply" //做任务 - RtaskSubTypeReward = "getreward" //奖励 - RtaskSubTypeBattleStart = "battlestart" //战斗开始 - RtaskSubTypeBattleFinish = "battlefinish" //战斗完成 - RtaskSubTypeGetrecord = "getrecord" //任务数据 + RtaskSubTypeList = "list" //随机任务列表 + RtaskSubTypeGetrecord = "getrecord" //任务数据 + RtaskSubTypeSend = "send" //触发任务 ) type apiComp struct { diff --git a/modules/rtask/api_send.go b/modules/rtask/api_send.go new file mode 100644 index 000000000..c0d5ffef8 --- /dev/null +++ b/modules/rtask/api_send.go @@ -0,0 +1,29 @@ +package rtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.RtaskSendReq) (code pb.ErrorCode) { + if len(req.Params) == 0 || req.TaskType == 0 { + code = pb.ErrorCode_ReqParameterError + } + return +} + +func (this *apiComp) Send(session comm.IUserSession, req *pb.RtaskSendReq) (code pb.ErrorCode, data proto.Message) { + if code = this.moduleRtask.SendToRtask(session, comm.TaskType(req.TaskType), req.Params...); code != pb.ErrorCode_Success { + return + } + + rsp := &pb.RtaskSendResp{ + IsSucc: true, + } + if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeSend, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/pb/rtask_msg.pb.go b/pb/rtask_msg.pb.go index b6250b6da..245389389 100644 --- a/pb/rtask_msg.pb.go +++ b/pb/rtask_msg.pb.go @@ -20,109 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// 申请做任务 -type RtaskApplyReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskApplyReq) Reset() { - *x = RtaskApplyReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskApplyReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskApplyReq) ProtoMessage() {} - -func (x *RtaskApplyReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_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 RtaskApplyReq.ProtoReflect.Descriptor instead. -func (*RtaskApplyReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} -} - -func (x *RtaskApplyReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskApplyReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -type RtaskApplyResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` -} - -func (x *RtaskApplyResp) Reset() { - *x = RtaskApplyResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskApplyResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskApplyResp) ProtoMessage() {} - -func (x *RtaskApplyResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_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 RtaskApplyResp.ProtoReflect.Descriptor instead. -func (*RtaskApplyResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *RtaskApplyResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - // 任务列表 type RtasklistReq struct { state protoimpl.MessageState @@ -135,7 +32,7 @@ type RtasklistReq struct { func (x *RtasklistReq) Reset() { *x = RtasklistReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[2] + mi := &file_rtask_rtask_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -148,7 +45,7 @@ func (x *RtasklistReq) String() string { func (*RtasklistReq) ProtoMessage() {} func (x *RtasklistReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[2] + mi := &file_rtask_rtask_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -161,7 +58,7 @@ func (x *RtasklistReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtasklistReq.ProtoReflect.Descriptor instead. func (*RtasklistReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{2} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} } func (x *RtasklistReq) GetGroupId() int32 { @@ -183,7 +80,7 @@ type RtasklistResp struct { func (x *RtasklistResp) Reset() { *x = RtasklistResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[3] + mi := &file_rtask_rtask_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -196,7 +93,7 @@ func (x *RtasklistResp) String() string { func (*RtasklistResp) ProtoMessage() {} func (x *RtasklistResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[3] + mi := &file_rtask_rtask_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -209,7 +106,7 @@ func (x *RtasklistResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtasklistResp.ProtoReflect.Descriptor instead. func (*RtasklistResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{3} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} } func (x *RtasklistResp) GetRtaskIds() []int32 { @@ -226,133 +123,6 @@ func (x *RtasklistResp) GetGroupId() int32 { return 0 } -// 对话选项 -type RtaskChooseReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - ChooseId int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID - RtaskSubId int32 `protobuf:"varint,3,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskChooseReq) Reset() { - *x = RtaskChooseReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskChooseReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskChooseReq) ProtoMessage() {} - -func (x *RtaskChooseReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[4] - 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 RtaskChooseReq.ProtoReflect.Descriptor instead. -func (*RtaskChooseReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{4} -} - -func (x *RtaskChooseReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskChooseReq) GetChooseId() int32 { - if x != nil { - return x.ChooseId - } - return 0 -} - -func (x *RtaskChooseReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -type RtaskChooseResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - ChooseId int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID - RtaskSubId int32 `protobuf:"varint,3,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskChooseResp) Reset() { - *x = RtaskChooseResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskChooseResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskChooseResp) ProtoMessage() {} - -func (x *RtaskChooseResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RtaskChooseResp.ProtoReflect.Descriptor instead. -func (*RtaskChooseResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{5} -} - -func (x *RtaskChooseResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskChooseResp) GetChooseId() int32 { - if x != nil { - return x.ChooseId - } - return 0 -} - -func (x *RtaskChooseResp) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - // 任务完成推送 type RtaskFinishPush struct { state protoimpl.MessageState @@ -365,7 +135,7 @@ type RtaskFinishPush struct { func (x *RtaskFinishPush) Reset() { *x = RtaskFinishPush{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[6] + mi := &file_rtask_rtask_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -378,7 +148,7 @@ func (x *RtaskFinishPush) String() string { func (*RtaskFinishPush) ProtoMessage() {} func (x *RtaskFinishPush) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[6] + mi := &file_rtask_rtask_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -391,7 +161,7 @@ func (x *RtaskFinishPush) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskFinishPush.ProtoReflect.Descriptor instead. func (*RtaskFinishPush) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{6} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{2} } func (x *RtaskFinishPush) GetRtaskId() int32 { @@ -414,7 +184,7 @@ type RtaskFinishIdsPush struct { func (x *RtaskFinishIdsPush) Reset() { *x = RtaskFinishIdsPush{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[7] + mi := &file_rtask_rtask_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -427,7 +197,7 @@ func (x *RtaskFinishIdsPush) String() string { func (*RtaskFinishIdsPush) ProtoMessage() {} func (x *RtaskFinishIdsPush) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[7] + mi := &file_rtask_rtask_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -440,7 +210,7 @@ func (x *RtaskFinishIdsPush) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskFinishIdsPush.ProtoReflect.Descriptor instead. func (*RtaskFinishIdsPush) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{7} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{3} } func (x *RtaskFinishIdsPush) GetRtaskId() []int32 { @@ -457,347 +227,6 @@ func (x *RtaskFinishIdsPush) GetGroupId() int32 { return 0 } -// 领奖 -type RtaskGetRewardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskGetRewardReq) Reset() { - *x = RtaskGetRewardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskGetRewardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskGetRewardReq) ProtoMessage() {} - -func (x *RtaskGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[8] - 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 RtaskGetRewardReq.ProtoReflect.Descriptor instead. -func (*RtaskGetRewardReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{8} -} - -func (x *RtaskGetRewardReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskGetRewardReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -type RtaskGetRewardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskGetRewardResp) Reset() { - *x = RtaskGetRewardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskGetRewardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskGetRewardResp) ProtoMessage() {} - -func (x *RtaskGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] - 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 RtaskGetRewardResp.ProtoReflect.Descriptor instead. -func (*RtaskGetRewardResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9} -} - -func (x *RtaskGetRewardResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskGetRewardResp) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -// 开始战斗 -type RtaskBattleStartReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID - Leadpos int32 `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 - Teamids []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"` //阵容信息 -} - -func (x *RtaskBattleStartReq) Reset() { - *x = RtaskBattleStartReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleStartReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleStartReq) ProtoMessage() {} - -func (x *RtaskBattleStartReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[10] - 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 RtaskBattleStartReq.ProtoReflect.Descriptor instead. -func (*RtaskBattleStartReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10} -} - -func (x *RtaskBattleStartReq) GetBattleConfId() int32 { - if x != nil { - return x.BattleConfId - } - return 0 -} - -func (x *RtaskBattleStartReq) GetLeadpos() int32 { - if x != nil { - return x.Leadpos - } - return 0 -} - -func (x *RtaskBattleStartReq) GetTeamids() []string { - if x != nil { - return x.Teamids - } - return nil -} - -type RtaskBattleStartResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息 -} - -func (x *RtaskBattleStartResp) Reset() { - *x = RtaskBattleStartResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleStartResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleStartResp) ProtoMessage() {} - -func (x *RtaskBattleStartResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[11] - 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 RtaskBattleStartResp.ProtoReflect.Descriptor instead. -func (*RtaskBattleStartResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11} -} - -func (x *RtaskBattleStartResp) GetInfo() *BattleInfo { - if x != nil { - return x.Info - } - return nil -} - -// 战斗完成 -type RtaskBattleFinishReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID - ChooseId int32 `protobuf:"varint,3,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID -} - -func (x *RtaskBattleFinishReq) Reset() { - *x = RtaskBattleFinishReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleFinishReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleFinishReq) ProtoMessage() {} - -func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[12] - 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 RtaskBattleFinishReq.ProtoReflect.Descriptor instead. -func (*RtaskBattleFinishReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12} -} - -func (x *RtaskBattleFinishReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskBattleFinishReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -func (x *RtaskBattleFinishReq) GetChooseId() int32 { - if x != nil { - return x.ChooseId - } - return 0 -} - -type RtaskBattleFinishResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskBattleFinishResp) Reset() { - *x = RtaskBattleFinishResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleFinishResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleFinishResp) ProtoMessage() {} - -func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[13] - 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 RtaskBattleFinishResp.ProtoReflect.Descriptor instead. -func (*RtaskBattleFinishResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13} -} - -func (x *RtaskBattleFinishResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskBattleFinishResp) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - //获取玩家任务记录 type RtaskGetrecordReq struct { state protoimpl.MessageState @@ -808,7 +237,7 @@ type RtaskGetrecordReq struct { func (x *RtaskGetrecordReq) Reset() { *x = RtaskGetrecordReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[14] + mi := &file_rtask_rtask_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -821,7 +250,7 @@ func (x *RtaskGetrecordReq) String() string { func (*RtaskGetrecordReq) ProtoMessage() {} func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[14] + mi := &file_rtask_rtask_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -834,7 +263,7 @@ func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskGetrecordReq.ProtoReflect.Descriptor instead. func (*RtaskGetrecordReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{4} } type RtaskGetrecordResp struct { @@ -848,7 +277,7 @@ type RtaskGetrecordResp struct { func (x *RtaskGetrecordResp) Reset() { *x = RtaskGetrecordResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[15] + mi := &file_rtask_rtask_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -861,7 +290,7 @@ func (x *RtaskGetrecordResp) String() string { func (*RtaskGetrecordResp) ProtoMessage() {} func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[15] + mi := &file_rtask_rtask_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -874,7 +303,7 @@ func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskGetrecordResp.ProtoReflect.Descriptor instead. func (*RtaskGetrecordResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{15} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{5} } func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord { @@ -884,6 +313,109 @@ func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord { return nil } +//任务触发 +type RtaskSendReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskType int32 `protobuf:"varint,1,opt,name=taskType,proto3" json:"taskType"` //任务类型 + Params []int32 `protobuf:"varint,2,rep,packed,name=params,proto3" json:"params"` //任务参数 +} + +func (x *RtaskSendReq) Reset() { + *x = RtaskSendReq{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskSendReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskSendReq) ProtoMessage() {} + +func (x *RtaskSendReq) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[6] + 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 RtaskSendReq.ProtoReflect.Descriptor instead. +func (*RtaskSendReq) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *RtaskSendReq) GetTaskType() int32 { + if x != nil { + return x.TaskType + } + return 0 +} + +func (x *RtaskSendReq) GetParams() []int32 { + if x != nil { + return x.Params + } + return nil +} + +type RtaskSendResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + IsSucc bool `protobuf:"varint,1,opt,name=isSucc,proto3" json:"isSucc"` +} + +func (x *RtaskSendResp) Reset() { + *x = RtaskSendResp{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskSendResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskSendResp) ProtoMessage() {} + +func (x *RtaskSendResp) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[7] + 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 RtaskSendResp.ProtoReflect.Descriptor instead. +func (*RtaskSendResp) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *RtaskSendResp) GetIsSucc() bool { + if x != nil { + return x.IsSucc + } + return false +} + // 测试使用 type RtaskTestReq struct { state protoimpl.MessageState @@ -900,7 +432,7 @@ type RtaskTestReq struct { func (x *RtaskTestReq) Reset() { *x = RtaskTestReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[16] + mi := &file_rtask_rtask_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -913,7 +445,7 @@ func (x *RtaskTestReq) String() string { func (*RtaskTestReq) ProtoMessage() {} func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[16] + mi := &file_rtask_rtask_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -926,7 +458,7 @@ func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskTestReq.ProtoReflect.Descriptor instead. func (*RtaskTestReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{16} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{8} } func (x *RtaskTestReq) GetRtaskType() int32 { @@ -976,7 +508,7 @@ type RtaskTestResp struct { func (x *RtaskTestResp) Reset() { *x = RtaskTestResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[17] + mi := &file_rtask_rtask_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -989,7 +521,7 @@ func (x *RtaskTestResp) String() string { func (*RtaskTestResp) ProtoMessage() {} func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[17] + mi := &file_rtask_rtask_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1002,7 +534,7 @@ func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskTestResp.ProtoReflect.Descriptor instead. func (*RtaskTestResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{17} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9} } func (x *RtaskTestResp) GetFlag() bool { @@ -1026,94 +558,48 @@ var file_rtask_rtask_msg_proto_rawDesc = []byte{ 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, - 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, - 0x64, 0x22, 0x2a, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x28, 0x0a, - 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 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, 0x45, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, - 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x66, - 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, - 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, - 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, - 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, - 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, - 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, - 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, - 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, - 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, - 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, - 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, - 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, - 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, - 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, - 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, - 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, - 0x6d, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6c, 0x0a, - 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x52, - 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, - 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x13, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, + 0x69, 0x73, 0x74, 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, 0x45, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, + 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 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, 0x94, 0x01, 0x0a, 0x0c, 0x52, 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, 0x3f, 0x0a, 0x0d, 0x52, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x22, 0x42, 0x0a, 0x0c, 0x52, 0x74, 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, 0x27, 0x0a, 0x0d, 0x52, 0x74, 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, 0x94, + 0x01, 0x0a, 0x0c, 0x52, 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, 0x3f, 0x0a, 0x0d, 0x52, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1128,37 +614,27 @@ func file_rtask_rtask_msg_proto_rawDescGZIP() []byte { return file_rtask_rtask_msg_proto_rawDescData } -var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18) +var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_rtask_rtask_msg_proto_goTypes = []interface{}{ - (*RtaskApplyReq)(nil), // 0: RtaskApplyReq - (*RtaskApplyResp)(nil), // 1: RtaskApplyResp - (*RtasklistReq)(nil), // 2: RtasklistReq - (*RtasklistResp)(nil), // 3: RtasklistResp - (*RtaskChooseReq)(nil), // 4: RtaskChooseReq - (*RtaskChooseResp)(nil), // 5: RtaskChooseResp - (*RtaskFinishPush)(nil), // 6: RtaskFinishPush - (*RtaskFinishIdsPush)(nil), // 7: RtaskFinishIdsPush - (*RtaskGetRewardReq)(nil), // 8: RtaskGetRewardReq - (*RtaskGetRewardResp)(nil), // 9: RtaskGetRewardResp - (*RtaskBattleStartReq)(nil), // 10: RtaskBattleStartReq - (*RtaskBattleStartResp)(nil), // 11: RtaskBattleStartResp - (*RtaskBattleFinishReq)(nil), // 12: RtaskBattleFinishReq - (*RtaskBattleFinishResp)(nil), // 13: RtaskBattleFinishResp - (*RtaskGetrecordReq)(nil), // 14: RtaskGetrecordReq - (*RtaskGetrecordResp)(nil), // 15: RtaskGetrecordResp - (*RtaskTestReq)(nil), // 16: RtaskTestReq - (*RtaskTestResp)(nil), // 17: RtaskTestResp - (*BattleInfo)(nil), // 18: BattleInfo - (*DBRtaskRecord)(nil), // 19: DBRtaskRecord + (*RtasklistReq)(nil), // 0: RtasklistReq + (*RtasklistResp)(nil), // 1: RtasklistResp + (*RtaskFinishPush)(nil), // 2: RtaskFinishPush + (*RtaskFinishIdsPush)(nil), // 3: RtaskFinishIdsPush + (*RtaskGetrecordReq)(nil), // 4: RtaskGetrecordReq + (*RtaskGetrecordResp)(nil), // 5: RtaskGetrecordResp + (*RtaskSendReq)(nil), // 6: RtaskSendReq + (*RtaskSendResp)(nil), // 7: RtaskSendResp + (*RtaskTestReq)(nil), // 8: RtaskTestReq + (*RtaskTestResp)(nil), // 9: RtaskTestResp + (*DBRtaskRecord)(nil), // 10: DBRtaskRecord } var file_rtask_rtask_msg_proto_depIdxs = []int32{ - 18, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo - 19, // 1: RtaskGetrecordResp.record:type_name -> DBRtaskRecord - 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 + 10, // 0: RtaskGetrecordResp.record:type_name -> DBRtaskRecord + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_rtask_rtask_msg_proto_init() } @@ -1170,30 +646,6 @@ func file_rtask_rtask_msg_proto_init() { file_rtask_rtask_db_proto_init() if !protoimpl.UnsafeEnabled { file_rtask_rtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskApplyReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskApplyResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtasklistReq); i { case 0: return &v.state @@ -1205,7 +657,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtasklistResp); i { case 0: return &v.state @@ -1217,31 +669,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskChooseReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskChooseResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskFinishPush); i { case 0: return &v.state @@ -1253,7 +681,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskFinishIdsPush); i { case 0: return &v.state @@ -1265,79 +693,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskGetRewardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskGetRewardResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleStartReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleStartResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleFinishReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleFinishResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskGetrecordReq); i { case 0: return &v.state @@ -1349,7 +705,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskGetrecordResp); i { case 0: return &v.state @@ -1361,7 +717,31 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskSendReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskSendResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskTestReq); i { case 0: return &v.state @@ -1373,7 +753,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskTestResp); i { case 0: return &v.state @@ -1392,7 +772,7 @@ func file_rtask_rtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_rtask_rtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 18, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 9203c6dac..aad7c7259 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -55,7 +55,7 @@ type DBUserExpand struct { Recovertimeunifiedticket int64 `protobuf:"varint,31,opt,name=recovertimeunifiedticket,proto3" json:"recovertimeunifiedticket"` //@go_tags(`bson:"recovertimeunifiedticket"`)同意门票恢复时间 SociatyTicketBuyNum int32 `protobuf:"varint,32,opt,name=sociatyTicketBuyNum,proto3" json:"sociatyTicketBuyNum" bson:"sociatyTicketBuyNum"` //公会boss挑战券购买次数 SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 - Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 + Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID } func (x *DBUserExpand) Reset() {