diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go index 13cdc6dca..f1a94a970 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/ui/protocol.go @@ -15,7 +15,6 @@ import ( "go_dreamfactory/modules/library" "go_dreamfactory/modules/linestory" "go_dreamfactory/modules/mainline" - "go_dreamfactory/modules/rtask" "go_dreamfactory/modules/sociaty" "go_dreamfactory/modules/sys" "go_dreamfactory/modules/task" @@ -27,7 +26,6 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" - "github.com/spf13/cast" "google.golang.org/protobuf/proto" ) @@ -67,6 +65,7 @@ var ( ff(comm.ModuleTask, task.TaskSubTypeList): &formview.TaskListView{}, ff(comm.ModuleTask, task.TaskSubTypeActiveList): &formview.TaskActiveListView{}, ff(comm.ModuleTask, task.TaskSubTypeActiveReceive): &formview.TaskActiveReceiveView{}, + ff(comm.ModuleTask, task.TaskSubTypeGetrecord): &formview.RtaskRecordView{}, // hero ff(comm.ModuleHero, hero.HeroSubTypeList): &formview.HeroListView{}, ff(comm.ModuleHero, hero.StrengthenUplv): &formview.HeroStrengthenUplvView{}, @@ -102,9 +101,7 @@ var ( // pagoda ff(comm.ModulePagoda, "getlist"): &formview.PagodaListView{}, // rtask - ff(comm.ModuleRtask, rtask.RtaskSubTypeList): &formview.RtaskListView{}, - ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{}, + ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, // linestory ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, ff(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): &formview.FetterstoryView{}, @@ -192,6 +189,7 @@ var ( ff(comm.ModuleTask, task.TaskSubTypeList), ff(comm.ModuleTask, task.TaskSubTypeActiveList), ff(comm.ModuleTask, task.TaskSubTypeActiveReceive), + ff(comm.ModuleTask, task.TaskSubTypeGetrecord), }, "friend": { ff(comm.ModuleFriend, friend.FriendSubTypeList), @@ -221,8 +219,6 @@ var ( ff(comm.ModulePagoda, "getlist"), }, "rtask": { - ff(comm.ModuleRtask, rtask.RtaskSubTypeList), - ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord), ff(comm.ModuleRtask, "rtest"), }, "linestory": { @@ -455,6 +451,14 @@ var ( return formatStr.String() }, }, + ff(comm.ModuleTask, task.TaskSubTypeGetrecord): { + NavLabel: "任务数据", + Desc: "任务数据", + MainType: string(comm.ModuleTask), + SubType: task.TaskSubTypeGetrecord, + Enabled: true, + }, + ff(comm.ModuleTask, task.TaskSubTypeActiveList): { NavLabel: "活跃度列表", Desc: "用户活跃度列表", @@ -743,29 +747,6 @@ var ( MainType: string(comm.ModuleRtask), Enabled: true, }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeList): { - NavLabel: "任务列表", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeList, - Enabled: true, - Print: func(rsp proto.Message) string { - if in, ok := rsp.(*pb.UserMessage); ok { - out := &pb.RtasklistResp{} - if !comm.ProtoUnmarshal(in, out) { - return errors.New("unmarshal err").Error() - } - return strings.Join(cast.ToStringSlice(out.RtaskIds), ",") - } - return "" - }, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): { - NavLabel: "任务数据", - Desc: "任务数据", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeGetrecord, - Enabled: true, - }, ff(comm.ModuleRtask, "rtest"): { NavLabel: "测试条件", Desc: "测试任务触发", diff --git a/cmd/v2/ui/views/rtask_list.go b/cmd/v2/ui/views/rtask_list.go deleted file mode 100644 index 271e7eb41..000000000 --- a/cmd/v2/ui/views/rtask_list.go +++ /dev/null @@ -1,109 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/cmd/v2/service/observer" - "go_dreamfactory/comm" - "go_dreamfactory/modules/rtask" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/theme" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskListView struct { - ListBaseView - flag bool -} - -func (this *RtaskListView) CreateView(t *model.TestCase) fyne.CanvasObject { - // init required - this.initItemList() - - // create friend list view - this.createItemList() - - input := widget.NewEntry() - input.PlaceHolder = "分组编号" - this.form.AppendItem(widget.NewFormItem("", input)) - - res := widget.NewEntry() - res.PlaceHolder = "已完成任务列表 ,号分隔" - this.form.AppendItem(widget.NewFormItem("", res)) - - // task list button - taskListBtn := widget.NewButtonWithIcon("任务列表", theme.ConfirmIcon(), func() { - if input.Text == "" { - dialog.ShowError(errors.New("请填写分组编号"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtasklistReq{ - GroupId: cast.ToInt32(input.Text), - }); err != nil { - logrus.Error(err) - } - }) - - modiResBtn := widget.NewButtonWithIcon("修改任务", theme.ConfirmIcon(), func() { - if res.Text != "" { - if err := service.GetPttService().SendToClient( - t.MainType, - "rtest", - &pb.RtaskTestReq{ - RtaskIds: res.Text, - GroupId: cast.ToInt32(input.Text), - }, - ); err != nil { - logrus.Error(err) - return - } - } - }) - - // layout - split := container.NewHSplit(this.dataListWidget, container.NewVBox(this.form, taskListBtn, modiResBtn)) - split.Offset = 0.7 - - //data listener for - this.dataListener() - - return split -} - -func (this *RtaskListView) dataListener() { - if this.flag { - return - } - 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) && - data.SubType == rtask.RtaskSubTypeList) { - return - } - - rsp := &pb.RtasklistResp{} - if !comm.ProtoUnmarshal(data, rsp) { - logrus.Error("unmarshal err") - } - - this.itemListData = model.NewItemModelList() - for _, v := range rsp.RtaskIds { - fm := &model.ItemModel{ - Id: cast.ToString(v), - Label: cast.ToString(v), - } - this.itemListData.DataList = append(this.itemListData.DataList, fm) - } - this.reloadListData() - }, - }) - this.flag = true -} diff --git a/cmd/v2/ui/views/rtask_record.go b/cmd/v2/ui/views/rtask_record.go index 22ee30aa3..4b0fb03f4 100644 --- a/cmd/v2/ui/views/rtask_record.go +++ b/cmd/v2/ui/views/rtask_record.go @@ -16,7 +16,7 @@ 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.RtaskGetrecordReq{}); err != nil { + if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.TaskGetrecordReq{}); err != nil { logrus.Error(err) } } diff --git a/cmd/v2/ui/views/rtask_testview.go b/cmd/v2/ui/views/rtask_testview.go index 70d006947..d209b7080 100644 --- a/cmd/v2/ui/views/rtask_testview.go +++ b/cmd/v2/ui/views/rtask_testview.go @@ -25,8 +25,6 @@ func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { condiInput := widget.NewEntry() condiInput.PlaceHolder = "条件ID为空时走触发逻辑否则走校验逻辑" - - input := widget.NewEntry() input.PlaceHolder = "分组编号" @@ -35,7 +33,6 @@ func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { this.form.AppendItem(widget.NewFormItem("条件ID", condiInput)) this.form.AppendItem(widget.NewFormItem("分组编号", input)) - this.form.OnSubmit = func() { // if rtaskTypeInput.Text == "" { diff --git a/modules/rtask/api_getrecord.go b/modules/rtask/api_getrecord.go deleted file mode 100644 index 7ca93abaa..000000000 --- a/modules/rtask/api_getrecord.go +++ /dev/null @@ -1,27 +0,0 @@ -package rtask - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" -) - -func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.RtaskGetrecordReq) (code pb.ErrorCode) { - return -} - -// 获取玩家任务条件记录 -// 客户端会在登录时拉取此数据 -func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.RtaskGetrecordReq) (code pb.ErrorCode, data proto.Message) { - rsp := &pb.RtaskGetrecordResp{} - record := this.moduleRtask.modelRtaskRecord.getRecord(session.GetUserId()) - if record.Uid != "" && record.Vals != nil { - rsp.Record = record - } - - if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeGetrecord, rsp); err != nil { - code = pb.ErrorCode_SystemError - } - return -} diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 0ea8e434b..a552443ba 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -425,7 +425,7 @@ func (this *ModuleRtask) ChangeCondi(uid string, data map[int32]*pb.RtaskData) e return nil } -//接收区服worker发起的秘境事件 +// 接收区服worker发起的秘境事件 func (this *ModuleRtask) Rpc_ModuleRtaskSendTask(ctx context.Context, args *pb.RPCRTaskReq, reply *pb.EmptyResp) (err error) { this.Debug("Rpc_ModuleRtaskSendTask", log.Field{Key: "args", Value: args.String()}, diff --git a/modules/rtask/updateHandle.go b/modules/rtask/updateHandle.go index 8a6aa4cd0..9bf58867d 100644 --- a/modules/rtask/updateHandle.go +++ b/modules/rtask/updateHandle.go @@ -2,9 +2,8 @@ package rtask import ( - "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" - "go_dreamfactory/modules/task" + "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" @@ -117,20 +116,5 @@ func (this *ModelRtaskRecord) addUpdate(uid string, cfg *cfg.GameRdtaskCondiData log.Field{Key: "updated", Value: record.Vals[cfg.Id]}, ) - // this.listenTask(uid, cfg.Id) return } - -func (this *ModelRtaskRecord) listenTask(uid string, cfgId int32) { - //日/周/成就任务监听触发 - tl := new(task.TaskListen) - tl.Uid = uid - tl.TaskType = comm.TaskType(cfgId) - if im, err := this.service.GetModule(comm.ModuleTask); err == nil { - if mt, ok := im.(*task.ModuleTask); ok { - mt.GetEventApp().Dispatch(comm.EventTaskChanged, tl) - } - } else { - this.moduleRtask.Printf("get ModuleTask err: %v", err) - } -} diff --git a/modules/task/api.go b/modules/task/api.go index f4e9be0e1..1c66639f4 100644 --- a/modules/task/api.go +++ b/modules/task/api.go @@ -12,6 +12,7 @@ const ( TaskSubTypeActiveReceive = "activereceive" //活跃度领取 TaskSubTypeStrategy = "strategy" //卡牌攻略 TaskSubTypeFinishedPush = "taskfinishedpush" //推送 + TaskSubTypeGetrecord = "getrecord" //任务数据 ) type apiComp struct { @@ -20,7 +21,7 @@ type apiComp struct { moduleTask *ModuleTask } -//组件初始化接口 +// 组件初始化接口 func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompGate.Init(service, module, comp, options) this.moduleTask = module.(*ModuleTask) diff --git a/modules/task/api_getrecord.go b/modules/task/api_getrecord.go new file mode 100644 index 000000000..9910fdb20 --- /dev/null +++ b/modules/task/api_getrecord.go @@ -0,0 +1,30 @@ +package task + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode) { + return +} + +// 获取玩家任务条件记录 +// 客户端会在登录时拉取此数据 +func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode, data proto.Message) { + rsp := &pb.TaskGetrecordResp{} + if imodule, err := this.service.GetModule(comm.ModuleRtask); err == nil { + if itask, ok := imodule.(comm.IRtask); ok { + record := itask.GetCondiData(session.GetUserId()) + if record.Uid != "" && record.Vals != nil { + rsp.Record = record + } + } + } + if err := session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeGetrecord, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/modules/task/module.go b/modules/task/module.go index 67d36385d..5b99c4045 100644 --- a/modules/task/module.go +++ b/modules/task/module.go @@ -50,14 +50,14 @@ func (this *ModuleTask) OnInstallComp() { this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } -//模块启动接口 +// 模块启动接口 func (this *ModuleTask) Start() (err error) { err = this.ModuleBase.Start() event.RegisterGO(comm.EventUserOffline, this.CleanTask) return } -//初始化日常、周常、成就 +// 初始化日常、周常、成就 func (this *ModuleTask) InitTaskAll(uid string) { t := configure.Now() defer func() { @@ -122,7 +122,7 @@ func (this *ModuleTask) GetTaskById(uid string, taskTag, taskId int32) *pb.TaskD return nil } -//重置任务 +// 重置任务 func (this *ModuleTask) ResetTask(uid string, taskTag comm.TaskTag) { this.resetActive(uid, taskTag) this.modelTask.clearTask(uid, taskTag) @@ -135,7 +135,7 @@ func (this *ModuleTask) CleanData(uid string) { this.modelTaskActive.clearTask(uid) } -//任务处理器注册 +// 任务处理器注册 type taskHandle func(uid string, taskId int32, tp *pb.TaskParam) *pb.DBTask // 获取每日任务列表 diff --git a/pb/rtask_db.pb.go b/pb/rtask_db.pb.go deleted file mode 100644 index 9fa2be7d3..000000000 --- a/pb/rtask_db.pb.go +++ /dev/null @@ -1,421 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.0 -// protoc v3.20.0 -// source: rtask/rtask_db.proto - -package pb - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -type FrtaskIds struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskIds []int32 `protobuf:"varint,1,rep,packed,name=rtaskIds,proto3" json:"rtaskIds"` -} - -func (x *FrtaskIds) Reset() { - *x = FrtaskIds{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_db_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *FrtaskIds) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*FrtaskIds) ProtoMessage() {} - -func (x *FrtaskIds) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_db_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 FrtaskIds.ProtoReflect.Descriptor instead. -func (*FrtaskIds) Descriptor() ([]byte, []int) { - return file_rtask_rtask_db_proto_rawDescGZIP(), []int{0} -} - -func (x *FrtaskIds) GetRtaskIds() []int32 { - if x != nil { - return x.RtaskIds - } - return nil -} - -// 玩家任务状态 -type DBRtask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - FrtaskIds map[int32]*FrtaskIds `protobuf:"bytes,3,rep,name=frtaskIds,proto3" json:"frtaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"frtaskIds"` //已完成的任务Id - IsReward bool `protobuf:"varint,5,opt,name=isReward,proto3" json:"isReward" bson:"isReward"` //接收奖励 -} - -func (x *DBRtask) Reset() { - *x = DBRtask{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_db_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBRtask) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBRtask) ProtoMessage() {} - -func (x *DBRtask) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_db_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DBRtask.ProtoReflect.Descriptor instead. -func (*DBRtask) Descriptor() ([]byte, []int) { - return file_rtask_rtask_db_proto_rawDescGZIP(), []int{1} -} - -func (x *DBRtask) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBRtask) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *DBRtask) GetFrtaskIds() map[int32]*FrtaskIds { - if x != nil { - return x.FrtaskIds - } - return nil -} - -func (x *DBRtask) GetIsReward() bool { - if x != nil { - return x.IsReward - } - return false -} - -type RtaskData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Data map[int32]int32 `protobuf:"bytes,1,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"data"` // 当前任务值 - Rtype int32 `protobuf:"varint,2,opt,name=rtype,proto3" json:"rtype" bson:"rtype"` // 任务类型 - Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp"` //@go_tasg(`bson:"timestamp"`) 时间戳 -} - -func (x *RtaskData) Reset() { - *x = RtaskData{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_db_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskData) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskData) ProtoMessage() {} - -func (x *RtaskData) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_db_proto_msgTypes[2] - 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 RtaskData.ProtoReflect.Descriptor instead. -func (*RtaskData) Descriptor() ([]byte, []int) { - return file_rtask_rtask_db_proto_rawDescGZIP(), []int{2} -} - -func (x *RtaskData) GetData() map[int32]int32 { - if x != nil { - return x.Data - } - return nil -} - -func (x *RtaskData) GetRtype() int32 { - if x != nil { - return x.Rtype - } - return 0 -} - -func (x *RtaskData) GetTimestamp() int64 { - if x != nil { - return x.Timestamp - } - return 0 -} - -// 玩家任务记录 -type DBRtaskRecord struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Vals map[int32]*RtaskData `protobuf:"bytes,3,rep,name=vals,proto3" json:"vals" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"vals"` //任务记录值 -} - -func (x *DBRtaskRecord) Reset() { - *x = DBRtaskRecord{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_db_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBRtaskRecord) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBRtaskRecord) ProtoMessage() {} - -func (x *DBRtaskRecord) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_db_proto_msgTypes[3] - 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 DBRtaskRecord.ProtoReflect.Descriptor instead. -func (*DBRtaskRecord) Descriptor() ([]byte, []int) { - return file_rtask_rtask_db_proto_rawDescGZIP(), []int{3} -} - -func (x *DBRtaskRecord) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBRtaskRecord) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *DBRtaskRecord) GetVals() map[int32]*RtaskData { - if x != nil { - return x.Vals - } - return nil -} - -var File_rtask_rtask_db_proto protoreflect.FileDescriptor - -var file_rtask_rtask_db_proto_rawDesc = []byte{ - 0x0a, 0x14, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x73, 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, 0x22, - 0xc8, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x35, 0x0a, - 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x17, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x46, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, - 0x1a, 0x48, 0x0a, 0x0e, 0x46, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x09, 0x72, - 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, - 0x74, 0x61, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, - 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, - 0xa4, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x76, 0x61, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x2e, 0x56, 0x61, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x76, 0x61, 0x6c, - 0x73, 0x1a, 0x43, 0x0a, 0x09, 0x56, 0x61, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0a, 0x2e, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_rtask_rtask_db_proto_rawDescOnce sync.Once - file_rtask_rtask_db_proto_rawDescData = file_rtask_rtask_db_proto_rawDesc -) - -func file_rtask_rtask_db_proto_rawDescGZIP() []byte { - file_rtask_rtask_db_proto_rawDescOnce.Do(func() { - file_rtask_rtask_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_rtask_rtask_db_proto_rawDescData) - }) - return file_rtask_rtask_db_proto_rawDescData -} - -var file_rtask_rtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_rtask_rtask_db_proto_goTypes = []interface{}{ - (*FrtaskIds)(nil), // 0: frtaskIds - (*DBRtask)(nil), // 1: DBRtask - (*RtaskData)(nil), // 2: rtaskData - (*DBRtaskRecord)(nil), // 3: DBRtaskRecord - nil, // 4: DBRtask.FrtaskIdsEntry - nil, // 5: rtaskData.DataEntry - nil, // 6: DBRtaskRecord.ValsEntry -} -var file_rtask_rtask_db_proto_depIdxs = []int32{ - 4, // 0: DBRtask.frtaskIds:type_name -> DBRtask.FrtaskIdsEntry - 5, // 1: rtaskData.data:type_name -> rtaskData.DataEntry - 6, // 2: DBRtaskRecord.vals:type_name -> DBRtaskRecord.ValsEntry - 0, // 3: DBRtask.FrtaskIdsEntry.value:type_name -> frtaskIds - 2, // 4: DBRtaskRecord.ValsEntry.value:type_name -> rtaskData - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name -} - -func init() { file_rtask_rtask_db_proto_init() } -func file_rtask_rtask_db_proto_init() { - if File_rtask_rtask_db_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_rtask_rtask_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FrtaskIds); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBRtask); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBRtaskRecord); 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{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_rtask_rtask_db_proto_rawDesc, - NumEnums: 0, - NumMessages: 7, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_rtask_rtask_db_proto_goTypes, - DependencyIndexes: file_rtask_rtask_db_proto_depIdxs, - MessageInfos: file_rtask_rtask_db_proto_msgTypes, - }.Build() - File_rtask_rtask_db_proto = out.File - file_rtask_rtask_db_proto_rawDesc = nil - file_rtask_rtask_db_proto_goTypes = nil - file_rtask_rtask_db_proto_depIdxs = nil -} diff --git a/pb/rtask_msg.pb.go b/pb/rtask_msg.pb.go index 12e3b7d1f..c171aea5c 100644 --- a/pb/rtask_msg.pb.go +++ b/pb/rtask_msg.pb.go @@ -20,402 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// 任务列表 -type RtasklistReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //分组ID -} - -func (x *RtasklistReq) Reset() { - *x = RtasklistReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtasklistReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtasklistReq) ProtoMessage() {} - -func (x *RtasklistReq) 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 RtasklistReq.ProtoReflect.Descriptor instead. -func (*RtasklistReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} -} - -func (x *RtasklistReq) GetGroupId() int32 { - if x != nil { - return x.GroupId - } - return 0 -} - -type RtasklistResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskIds []int32 `protobuf:"varint,1,rep,packed,name=rtaskIds,proto3" json:"rtaskIds"` - GroupId int32 `protobuf:"varint,2,opt,name=groupId,proto3" json:"groupId"` -} - -func (x *RtasklistResp) Reset() { - *x = RtasklistResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtasklistResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtasklistResp) ProtoMessage() {} - -func (x *RtasklistResp) 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 RtasklistResp.ProtoReflect.Descriptor instead. -func (*RtasklistResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *RtasklistResp) GetRtaskIds() []int32 { - if x != nil { - return x.RtaskIds - } - return nil -} - -func (x *RtasklistResp) GetGroupId() int32 { - if x != nil { - return x.GroupId - } - return 0 -} - -// 任务完成推送 -type RtaskFinishPush struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` -} - -func (x *RtaskFinishPush) Reset() { - *x = RtaskFinishPush{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskFinishPush) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskFinishPush) ProtoMessage() {} - -func (x *RtaskFinishPush) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[2] - 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 RtaskFinishPush.ProtoReflect.Descriptor instead. -func (*RtaskFinishPush) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{2} -} - -func (x *RtaskFinishPush) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -// 当前完成的任务列表推送 -type RtaskFinishIdsPush struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId []int32 `protobuf:"varint,1,rep,packed,name=rtaskId,proto3" json:"rtaskId"` - GroupId int32 `protobuf:"varint,2,opt,name=groupId,proto3" json:"groupId"` -} - -func (x *RtaskFinishIdsPush) Reset() { - *x = RtaskFinishIdsPush{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskFinishIdsPush) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskFinishIdsPush) ProtoMessage() {} - -func (x *RtaskFinishIdsPush) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[3] - 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 RtaskFinishIdsPush.ProtoReflect.Descriptor instead. -func (*RtaskFinishIdsPush) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{3} -} - -func (x *RtaskFinishIdsPush) GetRtaskId() []int32 { - if x != nil { - return x.RtaskId - } - return nil -} - -func (x *RtaskFinishIdsPush) GetGroupId() int32 { - if x != nil { - return x.GroupId - } - return 0 -} - -//获取玩家任务记录 -type RtaskGetrecordReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *RtaskGetrecordReq) Reset() { - *x = RtaskGetrecordReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskGetrecordReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskGetrecordReq) ProtoMessage() {} - -func (x *RtaskGetrecordReq) 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 RtaskGetrecordReq.ProtoReflect.Descriptor instead. -func (*RtaskGetrecordReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{4} -} - -type RtaskGetrecordResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Record *DBRtaskRecord `protobuf:"bytes,1,opt,name=record,proto3" json:"record"` -} - -func (x *RtaskGetrecordResp) Reset() { - *x = RtaskGetrecordResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskGetrecordResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskGetrecordResp) ProtoMessage() {} - -func (x *RtaskGetrecordResp) 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 RtaskGetrecordResp.ProtoReflect.Descriptor instead. -func (*RtaskGetrecordResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{5} -} - -func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord { - if x != nil { - return x.Record - } - 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 @@ -432,7 +36,7 @@ type RtaskTestReq struct { func (x *RtaskTestReq) Reset() { *x = RtaskTestReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[8] + mi := &file_rtask_rtask_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -445,7 +49,7 @@ func (x *RtaskTestReq) String() string { func (*RtaskTestReq) ProtoMessage() {} func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[8] + mi := &file_rtask_rtask_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -458,7 +62,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{8} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} } func (x *RtaskTestReq) GetRtaskType() int32 { @@ -508,7 +112,7 @@ type RtaskTestResp struct { func (x *RtaskTestResp) Reset() { *x = RtaskTestResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] + mi := &file_rtask_rtask_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -521,7 +125,7 @@ func (x *RtaskTestResp) String() string { func (*RtaskTestResp) ProtoMessage() {} func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] + mi := &file_rtask_rtask_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -534,7 +138,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{9} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} } func (x *RtaskTestResp) GetFlag() bool { @@ -555,49 +159,21 @@ var File_rtask_rtask_msg_proto protoreflect.FileDescriptor var file_rtask_rtask_msg_proto_rawDesc = []byte{ 0x0a, 0x15, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 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, 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, 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, + 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 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 ( @@ -612,27 +188,17 @@ 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, 10) +var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_rtask_rtask_msg_proto_goTypes = []interface{}{ - (*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 + (*RtaskTestReq)(nil), // 0: RtaskTestReq + (*RtaskTestResp)(nil), // 1: RtaskTestResp } var file_rtask_rtask_msg_proto_depIdxs = []int32{ - 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 + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name } func init() { file_rtask_rtask_msg_proto_init() } @@ -640,105 +206,8 @@ func file_rtask_rtask_msg_proto_init() { if File_rtask_rtask_msg_proto != nil { return } - 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.(*RtasklistReq); 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.(*RtasklistResp); 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.(*RtaskFinishPush); 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[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskFinishIdsPush); 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[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskGetrecordReq); 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.(*RtaskGetrecordResp); 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{} { - 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 @@ -750,7 +219,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskTestResp); i { case 0: return &v.state @@ -769,7 +238,7 @@ func file_rtask_rtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_rtask_rtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/task_db.pb.go b/pb/task_db.pb.go index 76f8f9c72..dac7f55dd 100644 --- a/pb/task_db.pb.go +++ b/pb/task_db.pb.go @@ -328,6 +328,252 @@ func (x *ActivityData) GetReceived() int32 { return 0 } +type FrtaskIds struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RtaskIds []int32 `protobuf:"varint,1,rep,packed,name=rtaskIds,proto3" json:"rtaskIds"` +} + +func (x *FrtaskIds) Reset() { + *x = FrtaskIds{} + if protoimpl.UnsafeEnabled { + mi := &file_task_task_db_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FrtaskIds) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FrtaskIds) ProtoMessage() {} + +func (x *FrtaskIds) ProtoReflect() protoreflect.Message { + mi := &file_task_task_db_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 FrtaskIds.ProtoReflect.Descriptor instead. +func (*FrtaskIds) Descriptor() ([]byte, []int) { + return file_task_task_db_proto_rawDescGZIP(), []int{4} +} + +func (x *FrtaskIds) GetRtaskIds() []int32 { + if x != nil { + return x.RtaskIds + } + return nil +} + +// 玩家任务状态 +type DBRtask struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + FrtaskIds map[int32]*FrtaskIds `protobuf:"bytes,3,rep,name=frtaskIds,proto3" json:"frtaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"frtaskIds"` //已完成的任务Id + IsReward bool `protobuf:"varint,5,opt,name=isReward,proto3" json:"isReward" bson:"isReward"` //接收奖励 +} + +func (x *DBRtask) Reset() { + *x = DBRtask{} + if protoimpl.UnsafeEnabled { + mi := &file_task_task_db_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBRtask) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBRtask) ProtoMessage() {} + +func (x *DBRtask) ProtoReflect() protoreflect.Message { + mi := &file_task_task_db_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 DBRtask.ProtoReflect.Descriptor instead. +func (*DBRtask) Descriptor() ([]byte, []int) { + return file_task_task_db_proto_rawDescGZIP(), []int{5} +} + +func (x *DBRtask) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBRtask) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBRtask) GetFrtaskIds() map[int32]*FrtaskIds { + if x != nil { + return x.FrtaskIds + } + return nil +} + +func (x *DBRtask) GetIsReward() bool { + if x != nil { + return x.IsReward + } + return false +} + +type RtaskData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data map[int32]int32 `protobuf:"bytes,1,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"data"` // 当前任务值 + Rtype int32 `protobuf:"varint,2,opt,name=rtype,proto3" json:"rtype" bson:"rtype"` // 任务类型 + Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp"` //@go_tasg(`bson:"timestamp"`) 时间戳 +} + +func (x *RtaskData) Reset() { + *x = RtaskData{} + if protoimpl.UnsafeEnabled { + mi := &file_task_task_db_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskData) ProtoMessage() {} + +func (x *RtaskData) ProtoReflect() protoreflect.Message { + mi := &file_task_task_db_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 RtaskData.ProtoReflect.Descriptor instead. +func (*RtaskData) Descriptor() ([]byte, []int) { + return file_task_task_db_proto_rawDescGZIP(), []int{6} +} + +func (x *RtaskData) GetData() map[int32]int32 { + if x != nil { + return x.Data + } + return nil +} + +func (x *RtaskData) GetRtype() int32 { + if x != nil { + return x.Rtype + } + return 0 +} + +func (x *RtaskData) GetTimestamp() int64 { + if x != nil { + return x.Timestamp + } + return 0 +} + +// 玩家任务记录 +type DBRtaskRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Vals map[int32]*RtaskData `protobuf:"bytes,3,rep,name=vals,proto3" json:"vals" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"vals"` //任务记录值 +} + +func (x *DBRtaskRecord) Reset() { + *x = DBRtaskRecord{} + if protoimpl.UnsafeEnabled { + mi := &file_task_task_db_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBRtaskRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBRtaskRecord) ProtoMessage() {} + +func (x *DBRtaskRecord) ProtoReflect() protoreflect.Message { + mi := &file_task_task_db_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 DBRtaskRecord.ProtoReflect.Descriptor instead. +func (*DBRtaskRecord) Descriptor() ([]byte, []int) { + return file_task_task_db_proto_rawDescGZIP(), []int{7} +} + +func (x *DBRtaskRecord) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBRtaskRecord) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBRtaskRecord) GetVals() map[int32]*RtaskData { + if x != nil { + return x.Vals + } + return nil +} + var File_task_task_db_proto protoreflect.FileDescriptor var file_task_task_db_proto_rawDesc = []byte{ @@ -366,7 +612,43 @@ var file_task_task_db_proto_rawDesc = []byte{ 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x42, 0x06, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0x27, + 0x0a, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 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, 0x22, 0xc8, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x52, 0x74, + 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, + 0x73, 0x6b, 0x2e, 0x46, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, + 0x69, 0x73, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, + 0x69, 0x73, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x48, 0x0a, 0x0e, 0x46, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x66, 0x72, + 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, + 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x1a, 0x37, + 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa4, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x52, 0x74, + 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x76, + 0x61, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x52, 0x74, + 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x56, 0x61, 0x6c, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x04, 0x76, 0x61, 0x6c, 0x73, 0x1a, 0x43, 0x0a, 0x09, 0x56, 0x61, 0x6c, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x44, + 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -382,23 +664,35 @@ func file_task_task_db_proto_rawDescGZIP() []byte { return file_task_task_db_proto_rawDescData } -var file_task_task_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_task_task_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_task_task_db_proto_goTypes = []interface{}{ - (*DBTask)(nil), // 0: DBTask - (*TaskData)(nil), // 1: TaskData - (*DBActivity)(nil), // 2: DBActivity - (*ActivityData)(nil), // 3: ActivityData + (*DBTask)(nil), // 0: DBTask + (*TaskData)(nil), // 1: TaskData + (*DBActivity)(nil), // 2: DBActivity + (*ActivityData)(nil), // 3: ActivityData + (*FrtaskIds)(nil), // 4: frtaskIds + (*DBRtask)(nil), // 5: DBRtask + (*RtaskData)(nil), // 6: rtaskData + (*DBRtaskRecord)(nil), // 7: DBRtaskRecord + nil, // 8: DBRtask.FrtaskIdsEntry + nil, // 9: rtaskData.DataEntry + nil, // 10: DBRtaskRecord.ValsEntry } var file_task_task_db_proto_depIdxs = []int32{ - 1, // 0: DBTask.dayList:type_name -> TaskData - 1, // 1: DBTask.weekList:type_name -> TaskData - 1, // 2: DBTask.achieveList:type_name -> TaskData - 3, // 3: DBActivity.activityList:type_name -> ActivityData - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 1, // 0: DBTask.dayList:type_name -> TaskData + 1, // 1: DBTask.weekList:type_name -> TaskData + 1, // 2: DBTask.achieveList:type_name -> TaskData + 3, // 3: DBActivity.activityList:type_name -> ActivityData + 8, // 4: DBRtask.frtaskIds:type_name -> DBRtask.FrtaskIdsEntry + 9, // 5: rtaskData.data:type_name -> rtaskData.DataEntry + 10, // 6: DBRtaskRecord.vals:type_name -> DBRtaskRecord.ValsEntry + 4, // 7: DBRtask.FrtaskIdsEntry.value:type_name -> frtaskIds + 6, // 8: DBRtaskRecord.ValsEntry.value:type_name -> rtaskData + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_task_task_db_proto_init() } @@ -455,6 +749,54 @@ func file_task_task_db_proto_init() { return nil } } + file_task_task_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FrtaskIds); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_task_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBRtask); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_task_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_task_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBRtaskRecord); 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{ @@ -462,7 +804,7 @@ func file_task_task_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_task_task_db_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/task_msg.pb.go b/pb/task_msg.pb.go index a34d8d381..20a50aa86 100644 --- a/pb/task_msg.pb.go +++ b/pb/task_msg.pb.go @@ -20,6 +20,194 @@ 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 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_task_task_msg_proto_msgTypes[2] + 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_task_task_msg_proto_msgTypes[2] + 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_task_task_msg_proto_rawDescGZIP(), []int{2} +} + +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_task_task_msg_proto_msgTypes[3] + 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_task_task_msg_proto_msgTypes[3] + 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_task_task_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *RtaskSendResp) GetIsSucc() bool { + if x != nil { + return x.IsSucc + } + return false +} + //领取 type TaskReceiveReq struct { state protoimpl.MessageState @@ -33,7 +221,7 @@ type TaskReceiveReq struct { func (x *TaskReceiveReq) Reset() { *x = TaskReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[0] + mi := &file_task_task_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -46,7 +234,7 @@ func (x *TaskReceiveReq) String() string { func (*TaskReceiveReq) ProtoMessage() {} func (x *TaskReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[0] + mi := &file_task_task_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -59,7 +247,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{0} + return file_task_task_msg_proto_rawDescGZIP(), []int{4} } func (x *TaskReceiveReq) GetTaskTag() int32 { @@ -87,7 +275,7 @@ type TaskReceiveResp struct { func (x *TaskReceiveResp) Reset() { *x = TaskReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[1] + mi := &file_task_task_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -100,7 +288,7 @@ func (x *TaskReceiveResp) String() string { func (*TaskReceiveResp) ProtoMessage() {} func (x *TaskReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[1] + mi := &file_task_task_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -113,7 +301,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{1} + return file_task_task_msg_proto_rawDescGZIP(), []int{5} } func (x *TaskReceiveResp) GetTaskId() int32 { @@ -135,7 +323,7 @@ type TaskListReq struct { func (x *TaskListReq) Reset() { *x = TaskListReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[2] + mi := &file_task_task_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -148,7 +336,7 @@ func (x *TaskListReq) String() string { func (*TaskListReq) ProtoMessage() {} func (x *TaskListReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[2] + mi := &file_task_task_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -161,7 +349,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{2} + return file_task_task_msg_proto_rawDescGZIP(), []int{6} } func (x *TaskListReq) GetTaskTag() int32 { @@ -182,7 +370,7 @@ type TaskListResp struct { func (x *TaskListResp) Reset() { *x = TaskListResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[3] + mi := &file_task_task_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -195,7 +383,7 @@ func (x *TaskListResp) String() string { func (*TaskListResp) ProtoMessage() {} func (x *TaskListResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[3] + mi := &file_task_task_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -208,7 +396,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{3} + return file_task_task_msg_proto_rawDescGZIP(), []int{7} } func (x *TaskListResp) GetList() []*TaskData { @@ -230,7 +418,7 @@ type TaskActiveListReq struct { func (x *TaskActiveListReq) Reset() { *x = TaskActiveListReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[4] + mi := &file_task_task_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -243,7 +431,7 @@ func (x *TaskActiveListReq) String() string { func (*TaskActiveListReq) ProtoMessage() {} func (x *TaskActiveListReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[4] + mi := &file_task_task_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -256,7 +444,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{4} + return file_task_task_msg_proto_rawDescGZIP(), []int{8} } func (x *TaskActiveListReq) GetTaskTag() int32 { @@ -278,7 +466,7 @@ type TaskActiveListResp struct { func (x *TaskActiveListResp) Reset() { *x = TaskActiveListResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[5] + mi := &file_task_task_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -291,7 +479,7 @@ func (x *TaskActiveListResp) String() string { func (*TaskActiveListResp) ProtoMessage() {} func (x *TaskActiveListResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[5] + mi := &file_task_task_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -304,7 +492,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{5} + return file_task_task_msg_proto_rawDescGZIP(), []int{9} } func (x *TaskActiveListResp) GetList() []*ActivityData { @@ -334,7 +522,7 @@ type TaskActiveReceiveReq struct { func (x *TaskActiveReceiveReq) Reset() { *x = TaskActiveReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[6] + mi := &file_task_task_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -347,7 +535,7 @@ func (x *TaskActiveReceiveReq) String() string { func (*TaskActiveReceiveReq) ProtoMessage() {} func (x *TaskActiveReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[6] + mi := &file_task_task_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -360,7 +548,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{6} + return file_task_task_msg_proto_rawDescGZIP(), []int{10} } func (x *TaskActiveReceiveReq) GetTaskTag() int32 { @@ -389,7 +577,7 @@ type TaskActiveReceiveResp struct { func (x *TaskActiveReceiveResp) Reset() { *x = TaskActiveReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[7] + mi := &file_task_task_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -402,7 +590,7 @@ func (x *TaskActiveReceiveResp) String() string { func (*TaskActiveReceiveResp) ProtoMessage() {} func (x *TaskActiveReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[7] + mi := &file_task_task_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -415,7 +603,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{7} + return file_task_task_msg_proto_rawDescGZIP(), []int{11} } func (x *TaskActiveReceiveResp) GetTaskTag() int32 { @@ -444,7 +632,7 @@ type TaskFinishedPush struct { func (x *TaskFinishedPush) Reset() { *x = TaskFinishedPush{} if protoimpl.UnsafeEnabled { - mi := &file_task_task_msg_proto_msgTypes[8] + mi := &file_task_task_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -457,7 +645,7 @@ func (x *TaskFinishedPush) String() string { func (*TaskFinishedPush) ProtoMessage() {} func (x *TaskFinishedPush) ProtoReflect() protoreflect.Message { - mi := &file_task_task_msg_proto_msgTypes[8] + mi := &file_task_task_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -470,7 +658,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{8} + return file_task_task_msg_proto_rawDescGZIP(), []int{12} } func (x *TaskFinishedPush) GetTaskId() int32 { @@ -485,39 +673,51 @@ 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, 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, + 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, 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, 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -532,28 +732,34 @@ 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, 9) +var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_task_task_msg_proto_goTypes = []interface{}{ - (*TaskReceiveReq)(nil), // 0: TaskReceiveReq - (*TaskReceiveResp)(nil), // 1: TaskReceiveResp - (*TaskListReq)(nil), // 2: TaskListReq - (*TaskListResp)(nil), // 3: TaskListResp - (*TaskActiveListReq)(nil), // 4: TaskActiveListReq - (*TaskActiveListResp)(nil), // 5: TaskActiveListResp - (*TaskActiveReceiveReq)(nil), // 6: TaskActiveReceiveReq - (*TaskActiveReceiveResp)(nil), // 7: TaskActiveReceiveResp - (*TaskFinishedPush)(nil), // 8: TaskFinishedPush - (*TaskData)(nil), // 9: TaskData - (*ActivityData)(nil), // 10: ActivityData + (*TaskGetrecordReq)(nil), // 0: TaskGetrecordReq + (*TaskGetrecordResp)(nil), // 1: TaskGetrecordResp + (*RtaskSendReq)(nil), // 2: RtaskSendReq + (*RtaskSendResp)(nil), // 3: RtaskSendResp + (*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 + (*DBRtaskRecord)(nil), // 13: DBRtaskRecord + (*TaskData)(nil), // 14: TaskData + (*ActivityData)(nil), // 15: ActivityData } var file_task_task_msg_proto_depIdxs = []int32{ - 9, // 0: TaskListResp.list:type_name -> TaskData - 10, // 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 + 13, // 0: TaskGetrecordResp.record:type_name -> DBRtaskRecord + 14, // 1: TaskListResp.list:type_name -> TaskData + 15, // 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 } func init() { file_task_task_msg_proto_init() } @@ -564,7 +770,7 @@ 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.(*TaskReceiveReq); i { + switch v := v.(*TaskGetrecordReq); i { case 0: return &v.state case 1: @@ -576,7 +782,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskReceiveResp); i { + switch v := v.(*TaskGetrecordResp); i { case 0: return &v.state case 1: @@ -588,7 +794,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskListReq); i { + switch v := v.(*RtaskSendReq); i { case 0: return &v.state case 1: @@ -600,7 +806,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskListResp); i { + switch v := v.(*RtaskSendResp); i { case 0: return &v.state case 1: @@ -612,7 +818,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskActiveListReq); i { + switch v := v.(*TaskReceiveReq); i { case 0: return &v.state case 1: @@ -624,7 +830,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskActiveListResp); i { + switch v := v.(*TaskReceiveResp); i { case 0: return &v.state case 1: @@ -636,7 +842,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskActiveReceiveReq); i { + switch v := v.(*TaskListReq); i { case 0: return &v.state case 1: @@ -648,7 +854,7 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskActiveReceiveResp); i { + switch v := v.(*TaskListResp); i { case 0: return &v.state case 1: @@ -660,6 +866,54 @@ func file_task_task_msg_proto_init() { } } file_task_task_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskActiveListReq); 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[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskActiveListResp); 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[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskActiveReceiveReq); 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[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskActiveReceiveResp); 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[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskFinishedPush); i { case 0: return &v.state @@ -678,7 +932,7 @@ func file_task_task_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_task_task_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 13, NumExtensions: 0, NumServices: 0, },