From dd9e3345eeab60811a87c45da3ab5d946518d757 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 24 Feb 2023 10:48:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E9=A6=86=E5=9B=BE=E9=89=B4=E6=BF=80?= =?UTF-8?q?=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/atlas/api_atlasactivate.go | 24 ++++- modules/atlas/api_getatlas.go | 14 ++- modules/atlas/comp_configure.go | 58 +++++++++++- modules/atlas/model_atlas.go | 5 +- modules/atlas/module.go | 6 +- pb/atlas_db.pb.go | 72 ++++++++------- pb/atlas_msg.pb.go | 142 ++--------------------------- 7 files changed, 143 insertions(+), 178 deletions(-) diff --git a/modules/atlas/api_atlasactivate.go b/modules/atlas/api_atlasactivate.go index 49e6c943c..41cd11c95 100644 --- a/modules/atlas/api_atlasactivate.go +++ b/modules/atlas/api_atlasactivate.go @@ -17,7 +17,29 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv // 激活图鉴信息 func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data proto.Message) { + if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success { + return + } - session.SendMsg(string(this.module.GetType()), "activate", &pb.AtlasActivateResp{}) + atlasConf := this.module.configure.GetPandoAtlasConf(req.Id) + if atlasConf == nil { + code = pb.ErrorCode_ReqParameterError + return + } + list, _ := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) + if v, ok := list.Collect[req.Id]; ok { + if !v.Activate { + update := make(map[string]interface{}) + v.Activate = true // 找到图鉴积分 并更新积分 + list.Score += atlasConf.AtlasScore + update["collect"] = list.Collect + update["score"] = list.Score + this.module.modelPandaAtlas.modifyPandaAtlasList(session.GetUserId(), update) + session.SendMsg(string(this.module.GetType()), "activate", &pb.AtlasActivateResp{}) + } else { + code = pb.ErrorCode_SmithyNoActivateAtlas + } + } + code = pb.ErrorCode_SmithyNoFoundAtlas return } diff --git a/modules/atlas/api_getatlas.go b/modules/atlas/api_getatlas.go index aa27b6856..6de7b788f 100644 --- a/modules/atlas/api_getatlas.go +++ b/modules/atlas/api_getatlas.go @@ -8,19 +8,25 @@ import ( ) //参数校验 -func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode) { +func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode) { return } // 获取铁匠铺图鉴信息 -func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data proto.Message) { code = this.AtlasListCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - - session.SendMsg(string(this.module.GetType()), "atlaslist", &pb.SmithyAtlasListResp{}) + list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + session.SendMsg(string(this.module.GetType()), "getlist", &pb.AtlasGetListResp{ + Data: list, + }) return } diff --git a/modules/atlas/comp_configure.go b/modules/atlas/comp_configure.go index 2814420ea..0554a373f 100644 --- a/modules/atlas/comp_configure.go +++ b/modules/atlas/comp_configure.go @@ -1,27 +1,40 @@ package atlas import ( + "fmt" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/sys/configure" - "sync" + cfg "go_dreamfactory/sys/configure/structs" ) -const () +const ( + pandaJx = "game_pandamasjx.json" // 武馆教习 + pandaAtlas = "game_pandamastj.json" // 武馆图鉴 + pandaAtlasAward = "game_pandamastjjl.json" // 武馆图鉴奖励 +) // /配置管理基础组件 type configureComp struct { modules.MCompConfigure module *PandaAtlas - hlock sync.RWMutex } // 组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*PandaAtlas) + err = this.LoadMultiConfigure(map[string]interface{}{ + pandaJx: cfg.NewGamePandamasJx, + pandaAtlas: cfg.NewGamePandamasTj, + pandaAtlasAward: cfg.NewGamePandamasTjjl, + }) + _d := this.GetPandoAtlasConf("10110") + _d1 := this.GetPandoJxConf("10001") + _d2 := this.GetPandoAtlasAwardConf(1) + this.module.Debugf("%v,%v,%v", _d, _d1, _d2) return } @@ -41,3 +54,42 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { return configure.GetConfigure(name) } + +// 获取教习数据 +func (this *configureComp) GetPandoJxConf(id string) (conf *cfg.GamePandamasJxData) { + + if v, err := this.GetConfigure(pandaJx); err == nil { + if configure, ok := v.(*cfg.GamePandamasJx); ok { + return configure.Get(id) + } + } else { + err = fmt.Errorf("%T no is *cfg.GamePandamasJxData", v) + } + return +} + +// 获取武馆图鉴数据 +func (this *configureComp) GetPandoAtlasConf(id string) (conf *cfg.GamePandamasTjData) { + + if v, err := this.GetConfigure(pandaAtlas); err == nil { + if configure, ok := v.(*cfg.GamePandamasTj); ok { + return configure.Get(id) + } + } else { + err = fmt.Errorf("%T no is *cfg.GamePandamasTjData", v) + } + return +} + +// 获取图鉴奖励 +func (this *configureComp) GetPandoAtlasAwardConf(lv int32) (conf *cfg.GamePandamasTjjlData) { + + if v, err := this.GetConfigure(pandaAtlasAward); err == nil { + if configure, ok := v.(*cfg.GamePandamasTjjl); ok { + return configure.Get(lv) + } + } else { + err = fmt.Errorf("%T no is *cfg.GamePandamasTjData", v) + } + return +} diff --git a/modules/atlas/model_atlas.go b/modules/atlas/model_atlas.go index 3464c0d75..55761e85e 100644 --- a/modules/atlas/model_atlas.go +++ b/modules/atlas/model_atlas.go @@ -29,14 +29,13 @@ func (this *modelPandaAtlas) Init(service core.IService, module core.IModule, co func (this *modelPandaAtlas) getPandaAtlasList(uid string) (result *pb.DBPandaAtlas, err error) { result = &pb.DBPandaAtlas{ - Collect: map[string]*pb.Collect{}, + Collect: map[string]*pb.CollectInfo{}, } if err = this.Get(uid, result); err != nil { if mongo.ErrNoDocuments == err { result.Id = primitive.NewObjectID().Hex() result.Uid = uid - - result.Collect = make(map[string]*pb.Collect, 0) + result.Collect = make(map[string]*pb.CollectInfo, 0) result.Award = 1 // 初始1级 this.Add(uid, result) err = nil diff --git a/modules/atlas/module.go b/modules/atlas/module.go index 6c850c228..a257cba86 100644 --- a/modules/atlas/module.go +++ b/modules/atlas/module.go @@ -15,7 +15,9 @@ import ( type PandaAtlas struct { modules.ModuleBase api *apiComp + configure *configureComp modelPandaAtlas *modelPandaAtlas + service core.IService } func NewModule() core.IModule { @@ -28,14 +30,14 @@ func (this *PandaAtlas) GetType() core.M_Modules { func (this *PandaAtlas) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) - + this.service = service return } func (this *PandaAtlas) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - + this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.modelPandaAtlas = this.RegisterComp(new(modelPandaAtlas)).(*modelPandaAtlas) } diff --git a/pb/atlas_db.pb.go b/pb/atlas_db.pb.go index 1d0d47fdf..0e0b50840 100644 --- a/pb/atlas_db.pb.go +++ b/pb/atlas_db.pb.go @@ -25,11 +25,11 @@ type DBPandaAtlas struct { 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 - Collect map[string]*Collect `protobuf:"bytes,3,rep,name=collect,proto3" json:"collect" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 收藏品图鉴信息 - Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分 - Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度 + 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 + Collect map[string]*CollectInfo `protobuf:"bytes,3,rep,name=collect,proto3" json:"collect" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 收藏品图鉴信息 + Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分 + Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度 } func (x *DBPandaAtlas) Reset() { @@ -78,7 +78,7 @@ func (x *DBPandaAtlas) GetUid() string { return "" } -func (x *DBPandaAtlas) GetCollect() map[string]*Collect { +func (x *DBPandaAtlas) GetCollect() map[string]*CollectInfo { if x != nil { return x.Collect } @@ -99,17 +99,18 @@ func (x *DBPandaAtlas) GetAward() int32 { return 0 } -type Collect struct { +type CollectInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Score int32 `protobuf:"varint,1,opt,name=score,proto3" json:"score"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` // 获得时间 + Score int32 `protobuf:"varint,1,opt,name=score,proto3" json:"score"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` // 获得时间 + Activate bool `protobuf:"varint,3,opt,name=activate,proto3" json:"activate"` // 是否激活 } -func (x *Collect) Reset() { - *x = Collect{} +func (x *CollectInfo) Reset() { + *x = CollectInfo{} if protoimpl.UnsafeEnabled { mi := &file_atlas_atlas_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -117,13 +118,13 @@ func (x *Collect) Reset() { } } -func (x *Collect) String() string { +func (x *CollectInfo) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Collect) ProtoMessage() {} +func (*CollectInfo) ProtoMessage() {} -func (x *Collect) ProtoReflect() protoreflect.Message { +func (x *CollectInfo) ProtoReflect() protoreflect.Message { mi := &file_atlas_atlas_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -135,30 +136,37 @@ func (x *Collect) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Collect.ProtoReflect.Descriptor instead. -func (*Collect) Descriptor() ([]byte, []int) { +// Deprecated: Use CollectInfo.ProtoReflect.Descriptor instead. +func (*CollectInfo) Descriptor() ([]byte, []int) { return file_atlas_atlas_db_proto_rawDescGZIP(), []int{1} } -func (x *Collect) GetScore() int32 { +func (x *CollectInfo) GetScore() int32 { if x != nil { return x.Score } return 0 } -func (x *Collect) GetTime() int64 { +func (x *CollectInfo) GetTime() int64 { if x != nil { return x.Time } return 0 } +func (x *CollectInfo) GetActivate() bool { + if x != nil { + return x.Activate + } + return false +} + var File_atlas_atlas_db_proto protoreflect.FileDescriptor var file_atlas_atlas_db_proto_rawDesc = []byte{ 0x0a, 0x14, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x2f, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x6e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdc, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, 0x6c, 0x61, 0x73, 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, 0x34, 0x0a, 0x07, 0x63, 0x6f, 0x6c, @@ -167,16 +175,18 @@ var file_atlas_atlas_db_proto_rawDesc = []byte{ 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x44, 0x0a, 0x0c, 0x43, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, - 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x33, 0x0a, 0x07, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, - 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, - 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x43, + 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x53, 0x0a, 0x0b, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -194,12 +204,12 @@ func file_atlas_atlas_db_proto_rawDescGZIP() []byte { var file_atlas_atlas_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_atlas_atlas_db_proto_goTypes = []interface{}{ (*DBPandaAtlas)(nil), // 0: DBPandaAtlas - (*Collect)(nil), // 1: Collect + (*CollectInfo)(nil), // 1: CollectInfo nil, // 2: DBPandaAtlas.CollectEntry } var file_atlas_atlas_db_proto_depIdxs = []int32{ 2, // 0: DBPandaAtlas.collect:type_name -> DBPandaAtlas.CollectEntry - 1, // 1: DBPandaAtlas.CollectEntry.value:type_name -> Collect + 1, // 1: DBPandaAtlas.CollectEntry.value:type_name -> CollectInfo 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 @@ -226,7 +236,7 @@ func file_atlas_atlas_db_proto_init() { } } file_atlas_atlas_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Collect); i { + switch v := v.(*CollectInfo); i { case 0: return &v.state case 1: diff --git a/pb/atlas_msg.pb.go b/pb/atlas_msg.pb.go index 77ef09a65..0edb1cad7 100644 --- a/pb/atlas_msg.pb.go +++ b/pb/atlas_msg.pb.go @@ -287,101 +287,6 @@ func (x *AtlasAwardResp) GetData() *DBPandaAtlas { return nil } -//图鉴任务奖励领取 -type TaskAwardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` -} - -func (x *TaskAwardReq) Reset() { - *x = TaskAwardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_atlas_atlas_msg_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TaskAwardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TaskAwardReq) ProtoMessage() {} - -func (x *TaskAwardReq) ProtoReflect() protoreflect.Message { - mi := &file_atlas_atlas_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 TaskAwardReq.ProtoReflect.Descriptor instead. -func (*TaskAwardReq) Descriptor() ([]byte, []int) { - return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{6} -} - -func (x *TaskAwardReq) GetTaskId() int32 { - if x != nil { - return x.TaskId - } - return 0 -} - -type TaskAwardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` -} - -func (x *TaskAwardResp) Reset() { - *x = TaskAwardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_atlas_atlas_msg_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TaskAwardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TaskAwardResp) ProtoMessage() {} - -func (x *TaskAwardResp) ProtoReflect() protoreflect.Message { - mi := &file_atlas_atlas_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 TaskAwardResp.ProtoReflect.Descriptor instead. -func (*TaskAwardResp) Descriptor() ([]byte, []int) { - return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{7} -} - -func (x *TaskAwardResp) GetTaskId() int32 { - if x != nil { - return x.TaskId - } - return 0 -} - var File_atlas_atlas_msg_proto protoreflect.FileDescriptor var file_atlas_atlas_msg_proto_rawDesc = []byte{ @@ -402,13 +307,8 @@ var file_atlas_atlas_msg_proto_rawDesc = []byte{ 0x64, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x0e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, - 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x0c, 0x54, 0x61, 0x73, - 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 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, 0x0d, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -423,7 +323,7 @@ func file_atlas_atlas_msg_proto_rawDescGZIP() []byte { return file_atlas_atlas_msg_proto_rawDescData } -var file_atlas_atlas_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_atlas_atlas_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_atlas_atlas_msg_proto_goTypes = []interface{}{ (*AtlasGetListReq)(nil), // 0: AtlasGetListReq (*AtlasGetListResp)(nil), // 1: AtlasGetListResp @@ -431,14 +331,12 @@ var file_atlas_atlas_msg_proto_goTypes = []interface{}{ (*AtlasActivateResp)(nil), // 3: AtlasActivateResp (*AtlasAwardReq)(nil), // 4: AtlasAwardReq (*AtlasAwardResp)(nil), // 5: AtlasAwardResp - (*TaskAwardReq)(nil), // 6: TaskAwardReq - (*TaskAwardResp)(nil), // 7: TaskAwardResp - (*DBPandaAtlas)(nil), // 8: DBPandaAtlas + (*DBPandaAtlas)(nil), // 6: DBPandaAtlas } var file_atlas_atlas_msg_proto_depIdxs = []int32{ - 8, // 0: AtlasGetListResp.data:type_name -> DBPandaAtlas - 8, // 1: AtlasActivateResp.data:type_name -> DBPandaAtlas - 8, // 2: AtlasAwardResp.data:type_name -> DBPandaAtlas + 6, // 0: AtlasGetListResp.data:type_name -> DBPandaAtlas + 6, // 1: AtlasActivateResp.data:type_name -> DBPandaAtlas + 6, // 2: AtlasAwardResp.data:type_name -> DBPandaAtlas 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 @@ -525,30 +423,6 @@ func file_atlas_atlas_msg_proto_init() { return nil } } - file_atlas_atlas_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskAwardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_atlas_atlas_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskAwardResp); 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{ @@ -556,7 +430,7 @@ func file_atlas_atlas_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_atlas_atlas_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 6, NumExtensions: 0, NumServices: 0, },