From 9089ab23442c066791b59633aba470b298cc8fbb Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 28 Jun 2022 17:14:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcheck=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_equip.go | 10 +++++----- modules/equipment/api_getlist.go | 2 +- modules/equipment/api_upgrade.go | 16 ++++++++-------- modules/equipment/module.go | 10 +++++----- modules/friend/model_friend.go | 2 +- modules/game/api.go | 12 ++++++------ modules/game/configure_comp.go | 6 +++--- modules/gateway/configure_comp.go | 8 ++++---- modules/items/api_useItem.go | 2 +- modules/mail/model_mail.go | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 7ad3d8300..65ca6864b 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) Equip_Check(session comm.IUserSession, req *pb.Equipment_Equip_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.Equipment_Equip_Req) (result map[string]interface{}, code comm.ErrorCode) { var ( err error errorCode pb.ErrorCode @@ -20,7 +20,7 @@ func (this *apiComp) Equip_Check(session comm.IUserSession, req *pb.Equipment_Eq equipments = make([]*pb.DB_Equipment, len(req.EquipmentId)) for i, v := range req.EquipmentId { if v != "" { - if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipments[i], err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Equip_Check err:%v", err) code.Code = pb.ErrorCode_EquipmentOnFoundEquipment return @@ -64,7 +64,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ for i, v := range hero.EquipID { if v != "" { if equipments[i] != nil && v != equipments[i].Id { - if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) code = pb.ErrorCode_SystemError return @@ -73,7 +73,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ equipments[i].HeroId = hero.Id updatequipment = append(updatequipment, equipment, equipments[i]) } else if equipments[i] == nil { - if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) code = pb.ErrorCode_SystemError return @@ -96,7 +96,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ } } if code = this.module.hero.UpdateEquipment(hero, equipments); code == pb.ErrorCode_Success { - if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { + if err = this.module.modelequipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { log.Errorf("Equip err%v", err) code = pb.ErrorCode_SystemError return diff --git a/modules/equipment/api_getlist.go b/modules/equipment/api_getlist.go index 85fee866b..9395d0d8f 100644 --- a/modules/equipment/api_getlist.go +++ b/modules/equipment/api_getlist.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) Getlist_Check(session comm.IUserSession, req *pb.Equipment_GetList_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.Equipment_GetList_Req) (result map[string]interface{}, code comm.ErrorCode) { return } diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index db3f0710b..2bdc13b9e 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -12,7 +12,7 @@ import ( ) //参数校验 -func (this *apiComp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment_Upgrade_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.Equipment_Upgrade_Req) (result map[string]interface{}, code comm.ErrorCode) { var ( err error conf *cfg.Game_equipData @@ -24,7 +24,7 @@ func (this *apiComp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment_ code.Code = pb.ErrorCode_ReqParameterError return } - if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { + if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { log.Errorf("Equip_Check err:%v", err) code.Code = pb.ErrorCode_EquipmentOnFoundEquipment return @@ -85,7 +85,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac //叠加装备 拆分处理 if equipment.IsInitialState && equipment.OverlayNum > 1 { equipment.OverlayNum-- - if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ + if err = this.module.modelequipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ "overlayNum": equipment.OverlayNum, "heroId": "", }); err != nil { @@ -97,24 +97,24 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac equipment.Id = primitive.NewObjectID().Hex() equipment.IsInitialState = false equipment.OverlayNum = 1 - if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { + if err = this.module.modelequipment.upgradeEquipment(equipment, conf, intensify); err != nil { code = pb.ErrorCode_SystemError log.Errorf("Upgrade err:%v", err) return } - if err = this.module.modelEquipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { + if err = this.module.modelequipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { log.Errorf("Upgrade err:%v", err) code = pb.ErrorCode_SystemError return } } else { equipment.IsInitialState = false - if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { + if err = this.module.modelequipment.upgradeEquipment(equipment, conf, intensify); err != nil { code = pb.ErrorCode_SystemError log.Errorf("Upgrade err:%v", err) return } - if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ + if err = this.module.modelequipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ "lv": equipment.Lv, "mainEntry": equipment.MainEntry, "adverbEntry": equipment.AdverbEntry, @@ -136,7 +136,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac for i, v := range hero.EquipID { if v != "" { if v != equipment.Id { - if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipments[i], err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Upgrade err:%v", err) code = pb.ErrorCode_EquipmentOnFoundEquipment return diff --git a/modules/equipment/module.go b/modules/equipment/module.go index d17fed2cb..b4b7b663d 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -25,7 +25,7 @@ type Equipment struct { service core.IService api *apiComp configure *configureComp - modelEquipment *modelEquipmentComp + modelequipment *modelEquipmentComp hero comm.IHero } @@ -57,7 +57,7 @@ func (this *Equipment) Start() (err error) { func (this *Equipment) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - this.modelEquipment = this.RegisterComp(new(modelEquipmentComp)).(*modelEquipmentComp) + this.modelequipment = this.RegisterComp(new(modelEquipmentComp)).(*modelEquipmentComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } @@ -65,7 +65,7 @@ func (this *Equipment) OnInstallComp() { //查询武器信息 func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, Id string) (equipment *pb.DB_Equipment, code pb.ErrorCode) { var err error - if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, Id); err != nil { + if equipment, err = this.modelequipment.QueryUserEquipmentsById(uid, Id); err != nil { if err == redis.Nil { code = pb.ErrorCode_EquipmentOnFoundEquipment } else { @@ -77,14 +77,14 @@ func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, //查询卡片数量 func (this *Equipment) QueryEquipmentAmount(source *comm.ModuleCallSource, uid string, equipmentId int32) (amount uint32) { - amount = this.modelEquipment.QueryEquipmentAmount(uid, equipmentId) + amount = this.modelequipment.QueryEquipmentAmount(uid, equipmentId) return } //添加武器 func (this *Equipment) AddNewEquipments(source *comm.ModuleCallSource, uid string, cIds map[int32]uint32) (code pb.ErrorCode) { var err error - if err = this.modelEquipment.AddEquipments(uid, cIds); err != nil { + if err = this.modelequipment.AddEquipments(uid, cIds); err != nil { log.Errorf("err%v", err) code = pb.ErrorCode_SystemError } diff --git a/modules/friend/model_friend.go b/modules/friend/model_friend.go index be5a7c057..e9044472d 100644 --- a/modules/friend/model_friend.go +++ b/modules/friend/model_friend.go @@ -19,7 +19,7 @@ type ModelFriend struct { } func (this *ModelFriend) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - err = this.Model_Comp.Init(service, module, comp, options) + err = this.MCompModel.Init(service, module, comp, options) this.TableName = string(TableFriend) return } diff --git a/modules/game/api.go b/modules/game/api.go index a929fda55..e756a5ec1 100644 --- a/modules/game/api.go +++ b/modules/game/api.go @@ -9,21 +9,21 @@ import ( /* API */ -type Api_Comp struct { - modules.MComp_GateComp +type ApiComp struct { + modules.MCompGate service core.IService module *Game } //组件初始化接口 -func (this *Api_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.MComp_GateComp.Init(service, module, comp, options) +func (this *ApiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.MCompGate.Init(service, module, comp, options) this.module = module.(*Game) this.service = service return } -func (this *Api_Comp) Start() (err error) { - err = this.MComp_GateComp.Start() +func (this *ApiComp) Start() (err error) { + err = this.MCompGate.Start() return } diff --git a/modules/game/configure_comp.go b/modules/game/configure_comp.go index ffe336450..5f633ce36 100644 --- a/modules/game/configure_comp.go +++ b/modules/game/configure_comp.go @@ -11,12 +11,12 @@ const ( ) ///配置管理组件 -type Configure_Comp struct { - modules.MComp_Configure +type ConfigureComp struct { + modules.MCompConfigure } //组件初始化接口 -func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { +func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.ModuleCompBase.Init(service, module, comp, options) return diff --git a/modules/gateway/configure_comp.go b/modules/gateway/configure_comp.go index bd31932f8..921cd6820 100644 --- a/modules/gateway/configure_comp.go +++ b/modules/gateway/configure_comp.go @@ -12,19 +12,19 @@ const ( ) ///背包配置管理组件 -type Configure_Comp struct { - modules.MComp_Configure +type ConfigureComp struct { + modules.MCompConfigure } //组件初始化接口 -func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { +func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.ModuleCompBase.Init(service, module, comp, options) this.LoadConfigure(game_msgdistrib, cfg.NewGame_msgDistrib) return } //获取消息分发规则读取配置表 -func (this *Configure_Comp) GetMsgDistribRule(mtype, stype string) (rule string, ok bool) { +func (this *ConfigureComp) GetMsgDistribRule(mtype, stype string) (rule string, ok bool) { var ( err error v interface{} diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 828bf9d41..c9849564b 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) Useitem_Check(session comm.IUserSession, req *pb.Items_UseItem_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.Items_UseItem_Req) (result map[string]interface{}, code comm.ErrorCode) { return } diff --git a/modules/mail/model_mail.go b/modules/mail/model_mail.go index 301c91a47..60557a700 100644 --- a/modules/mail/model_mail.go +++ b/modules/mail/model_mail.go @@ -19,11 +19,11 @@ const ( ) type ModelMail struct { - modules.Model_Comp + modules.MCompModel } func (this *ModelMail) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.Model_Comp.Init(service, module, comp, options) + this.MCompModel.Init(service, module, comp, options) this.TableName = "mail" //创建uid索引 this.DB.CreateIndex(core.SqlTable(DB_MailTable), mongo.IndexModel{ From 4d961c8b15c01bebc5d48e95fd5143142afd026b Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 28 Jun 2022 17:25:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=AD=A6=E5=99=A8api?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=98=E9=87=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_equip.go | 8 ++++---- modules/equipment/api_upgrade.go | 14 +++++++------- modules/equipment/module.go | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 65ca6864b..633b82523 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -20,7 +20,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.Equipment_Equ equipments = make([]*pb.DB_Equipment, len(req.EquipmentId)) for i, v := range req.EquipmentId { if v != "" { - if equipments[i], err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Equip_Check err:%v", err) code.Code = pb.ErrorCode_EquipmentOnFoundEquipment return @@ -64,7 +64,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ for i, v := range hero.EquipID { if v != "" { if equipments[i] != nil && v != equipments[i].Id { - if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) code = pb.ErrorCode_SystemError return @@ -73,7 +73,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ equipments[i].HeroId = hero.Id updatequipment = append(updatequipment, equipment, equipments[i]) } else if equipments[i] == nil { - if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) code = pb.ErrorCode_SystemError return @@ -96,7 +96,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ } } if code = this.module.hero.UpdateEquipment(hero, equipments); code == pb.ErrorCode_Success { - if err = this.module.modelequipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { + if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { log.Errorf("Equip err%v", err) code = pb.ErrorCode_SystemError return diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 2bdc13b9e..8eb8c37c0 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -24,7 +24,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.Equipment_U code.Code = pb.ErrorCode_ReqParameterError return } - if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { + if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { log.Errorf("Equip_Check err:%v", err) code.Code = pb.ErrorCode_EquipmentOnFoundEquipment return @@ -85,7 +85,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac //叠加装备 拆分处理 if equipment.IsInitialState && equipment.OverlayNum > 1 { equipment.OverlayNum-- - if err = this.module.modelequipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ + if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ "overlayNum": equipment.OverlayNum, "heroId": "", }); err != nil { @@ -97,24 +97,24 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac equipment.Id = primitive.NewObjectID().Hex() equipment.IsInitialState = false equipment.OverlayNum = 1 - if err = this.module.modelequipment.upgradeEquipment(equipment, conf, intensify); err != nil { + if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { code = pb.ErrorCode_SystemError log.Errorf("Upgrade err:%v", err) return } - if err = this.module.modelequipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { + if err = this.module.modelEquipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { log.Errorf("Upgrade err:%v", err) code = pb.ErrorCode_SystemError return } } else { equipment.IsInitialState = false - if err = this.module.modelequipment.upgradeEquipment(equipment, conf, intensify); err != nil { + if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { code = pb.ErrorCode_SystemError log.Errorf("Upgrade err:%v", err) return } - if err = this.module.modelequipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ + if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ "lv": equipment.Lv, "mainEntry": equipment.MainEntry, "adverbEntry": equipment.AdverbEntry, @@ -136,7 +136,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac for i, v := range hero.EquipID { if v != "" { if v != equipment.Id { - if equipments[i], err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { + if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { log.Errorf("Upgrade err:%v", err) code = pb.ErrorCode_EquipmentOnFoundEquipment return diff --git a/modules/equipment/module.go b/modules/equipment/module.go index b4b7b663d..d17fed2cb 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -25,7 +25,7 @@ type Equipment struct { service core.IService api *apiComp configure *configureComp - modelequipment *modelEquipmentComp + modelEquipment *modelEquipmentComp hero comm.IHero } @@ -57,7 +57,7 @@ func (this *Equipment) Start() (err error) { func (this *Equipment) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - this.modelequipment = this.RegisterComp(new(modelEquipmentComp)).(*modelEquipmentComp) + this.modelEquipment = this.RegisterComp(new(modelEquipmentComp)).(*modelEquipmentComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } @@ -65,7 +65,7 @@ func (this *Equipment) OnInstallComp() { //查询武器信息 func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, Id string) (equipment *pb.DB_Equipment, code pb.ErrorCode) { var err error - if equipment, err = this.modelequipment.QueryUserEquipmentsById(uid, Id); err != nil { + if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, Id); err != nil { if err == redis.Nil { code = pb.ErrorCode_EquipmentOnFoundEquipment } else { @@ -77,14 +77,14 @@ func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, //查询卡片数量 func (this *Equipment) QueryEquipmentAmount(source *comm.ModuleCallSource, uid string, equipmentId int32) (amount uint32) { - amount = this.modelequipment.QueryEquipmentAmount(uid, equipmentId) + amount = this.modelEquipment.QueryEquipmentAmount(uid, equipmentId) return } //添加武器 func (this *Equipment) AddNewEquipments(source *comm.ModuleCallSource, uid string, cIds map[int32]uint32) (code pb.ErrorCode) { var err error - if err = this.modelequipment.AddEquipments(uid, cIds); err != nil { + if err = this.modelEquipment.AddEquipments(uid, cIds); err != nil { log.Errorf("err%v", err) code = pb.ErrorCode_SystemError } From d152ec4cd43c86a35128a73e76bc388afd58561a Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 28 Jun 2022 17:46:04 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96worker=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/gateway/agentmgr_comp.go | 3 +- pb/comm.pb.go | 30 ++++-- pb/hero_msg.pb.go | 176 +++++++++++++++++-------------- pb/proto/comm.proto | 2 +- services/comp_gateroute.go | 25 +++-- 5 files changed, 136 insertions(+), 100 deletions(-) diff --git a/modules/gateway/agentmgr_comp.go b/modules/gateway/agentmgr_comp.go index 8ac746d99..c21b3002a 100644 --- a/modules/gateway/agentmgr_comp.go +++ b/modules/gateway/agentmgr_comp.go @@ -40,7 +40,8 @@ func (this *AgentMgrComp) DisConnect(a IAgent) { if a.UserId() != "" { //登录用户 通知业务服务处理玩家离线相关 reply := &pb.RPCMessageReply{} if _, err := this.service.RpcGo(context.Background(), fmt.Sprintf("%s/%s", comm.Service_Worker, a.WorkerId()), string(comm.Rpc_NoticeUserClose), &pb.NoticeUserCloseReq{ - UserId: a.UserId(), + UserSessionId: a.SessionId(), + UserId: a.UserId(), }, reply); err != nil { log.Errorf(" uId:%s Rpc_NoticeUserClose err:%v", a.UserId(), err) } diff --git a/pb/comm.pb.go b/pb/comm.pb.go index a21273297..2466829b2 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -692,7 +692,8 @@ type NoticeUserCloseReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId"` + UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId"` + UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId"` } func (x *NoticeUserCloseReq) Reset() { @@ -727,6 +728,13 @@ func (*NoticeUserCloseReq) Descriptor() ([]byte, []int) { return file_comm_proto_rawDescGZIP(), []int{9} } +func (x *NoticeUserCloseReq) GetUserSessionId() string { + if x != nil { + return x.UserSessionId + } + return "" +} + func (x *NoticeUserCloseReq) GetUserId() string { if x != nil { return x.UserId @@ -814,15 +822,17 @@ var file_comm_proto_rawDesc = []byte{ 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, - 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, - 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x2a, - 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, - 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, - 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, - 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x22, 0x52, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, + 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, + 0x73, 0x65, 0x72, 0x49, 0x64, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, + 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, + 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, + 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 82e092408..7a52ec9e1 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -430,7 +430,8 @@ type Hero_StrengthenUpStar_Req struct { unknownFields protoimpl.UnknownFields HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - Items []*CostCardData `protobuf:"bytes,2,rep,name=items,proto3" json:"items"` // 消耗卡牌对象ID + Hero []*CostCardData `protobuf:"bytes,2,rep,name=hero,proto3" json:"hero"` // 消耗卡牌对象ID + HeroRace []*CostCardData `protobuf:"bytes,3,rep,name=heroRace,proto3" json:"heroRace"` // 消耗种族卡牌对象ID } func (x *Hero_StrengthenUpStar_Req) Reset() { @@ -472,9 +473,16 @@ func (x *Hero_StrengthenUpStar_Req) GetHeroObjID() string { return "" } -func (x *Hero_StrengthenUpStar_Req) GetItems() []*CostCardData { +func (x *Hero_StrengthenUpStar_Req) GetHero() []*CostCardData { if x != nil { - return x.Items + return x.Hero + } + return nil +} + +func (x *Hero_StrengthenUpStar_Req) GetHeroRace() []*CostCardData { + if x != nil { + return x.HeroRace } return nil } @@ -1111,74 +1119,77 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x61, 0x0a, 0x19, 0x48, 0x65, 0x72, - 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, - 0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, - 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, - 0x62, 0x6a, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, + 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8d, 0x01, 0x0a, 0x19, 0x48, 0x65, + 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, + 0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, - 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x41, 0x0a, 0x1a, - 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, - 0x70, 0x53, 0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, - 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, - 0x82, 0x01, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, - 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, - 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, - 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, - 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, - 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, - 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65, - 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, + 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2c, 0x0a, 0x08, 0x68, + 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, + 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x41, 0x0a, 0x1a, 0x48, 0x65, 0x72, + 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, + 0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, + 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x82, 0x01, 0x0a, + 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6b, 0x69, + 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, + 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, + 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a, - 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36, - 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, - 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, - 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72, - 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, - 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, - 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, - 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, - 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, - 0x70, 0x65, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, - 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, - 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, + 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, - 0x49, 0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, - 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, - 0x74, 0x6d, 0x65, 0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, - 0x78, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, - 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, - 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, + 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x5f, + 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, + 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, + 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a, 0x0a, 0x75, 0x70, + 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, + 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36, 0x0a, 0x16, 0x48, + 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, + 0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, + 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, + 0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, + 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, + 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72, 0x0a, 0x1a, 0x48, + 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, + 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, + 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, + 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, + 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, + 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, + 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, + 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x74, + 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, 0x65, + 0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, 0x69, 0x6e, + 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, + 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1221,21 +1232,22 @@ var file_hero_hero_msg_proto_depIdxs = []int32{ 20, // 0: pb.Hero_Info_Rsp.base:type_name -> pb.DB_HeroData 20, // 1: pb.Hero_List_Rsp.list:type_name -> pb.DB_HeroData 20, // 2: pb.Hero_StrengthenUplv_Resp.hero:type_name -> pb.DB_HeroData - 7, // 3: pb.Hero_StrengthenUpStar_Req.items:type_name -> pb.CostCardData - 20, // 4: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData - 7, // 5: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData - 20, // 6: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData - 20, // 7: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData - 20, // 8: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData - 20, // 9: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData - 20, // 10: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData - 4, // 11: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData - 20, // 12: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 7, // 3: pb.Hero_StrengthenUpStar_Req.hero:type_name -> pb.CostCardData + 7, // 4: pb.Hero_StrengthenUpStar_Req.heroRace:type_name -> pb.CostCardData + 20, // 5: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData + 7, // 6: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData + 20, // 7: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData + 20, // 8: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData + 20, // 9: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData + 20, // 10: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData + 20, // 11: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData + 4, // 12: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData + 20, // 13: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } diff --git a/pb/proto/comm.proto b/pb/proto/comm.proto index 69696ae52..41e4797e2 100644 --- a/pb/proto/comm.proto +++ b/pb/proto/comm.proto @@ -67,7 +67,7 @@ message BroadCastMessageReq { message AgentCloseeReq { string UserSessionId = 1; } //通知用户离线 -message NoticeUserCloseReq { string UserId = 1; } +message NoticeUserCloseReq {string UserSessionId = 1; string UserId = 2; } //英雄属性类型 enum HeroAttributesType{ diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index 170e64012..4d92f5495 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -42,9 +42,11 @@ type msghandle struct { //服务网关组件 type SCompGateRoute struct { cbase.ServiceCompBase - service base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口 - mrlock sync.RWMutex //msghandles 对象的锁 - msghandles map[string]*msghandle //处理函数的管理对象 + service base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口 + mrlock sync.RWMutex //msghandles 对象的锁 + msghandles map[string]*msghandle //处理函数的管理对象 + sessionslock sync.RWMutex //msghandles 对象的锁 + sessions map[string]comm.IUserSession //用户会话管理 避免频繁创建 } //设置服务组件名称 方便业务模块中获取此组件对象 @@ -106,8 +108,17 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag msghandle, ok := this.msghandles[method] this.mrlock.RUnlock() if ok { - //封装用户会话 - session := comm.NewUserSession(this.service, args.Ip, args.UserSessionId, args.GatewayServiceId, args.UserId) + //读取会话对象 + this.sessionslock.RLock() + session, ok := this.sessions[args.UserSessionId] + this.sessionslock.RUnlock() + if !ok { //没有 创建会话 + //封装用户会话 + session = comm.NewUserSession(this.service, args.Ip, args.UserSessionId, args.GatewayServiceId, args.UserId) + this.sessionslock.Lock() + this.sessions[args.UserSessionId] = session + this.sessionslock.Unlock() + } //序列化用户消息对象 msg := reflect.New(msghandle.msgType.Elem()).Interface() if err := ptypes.UnmarshalAny(args.Message, msg.(proto.Message)); err != nil { @@ -155,6 +166,8 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag //RPC_NoticeUserClose 接收用户离线通知 func (this *SCompGateRoute) NoticeUserClose(ctx context.Context, args *pb.NoticeUserCloseReq, reply *pb.RPCMessageReply) error { event.TriggerEvent(comm.Event_UserOffline, args.UserId) - + this.sessionslock.Lock() + delete(this.sessions, args.UserSessionId) + this.sessionslock.Unlock() return nil } From 1d602288dd038fb23431e1ab12e1addbd89b9e70 Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 28 Jun 2022 17:25:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/robot.go | 1 - cmd/robot/user.go | 4 ++-- modules/hero/model_hero.go | 12 +----------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go index e04222031..9117b0384 100644 --- a/cmd/robot/robot.go +++ b/cmd/robot/robot.go @@ -103,7 +103,6 @@ func (r *Robot) handleReq() { //执行响应 func (r *Robot) handleRsp(msg *pb.UserMessage) { - for i, b := range r.builders { if b.enabled && (msg.MainType == b.mainType && msg.SubType == b.subType) { diff --git a/cmd/robot/user.go b/cmd/robot/user.go index 18445ca19..eb3bd3165 100644 --- a/cmd/robot/user.go +++ b/cmd/robot/user.go @@ -15,8 +15,8 @@ var user_builders = []*builder{ req: &pb.UserCreateReq{ //设置请求参数 NickName: "乐谷6281", }, - rsp: &pb.UserCreateRsp{}, - enabled: true, + rsp: &pb.UserCreateRsp{}, + // enabled: true, }, } diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 46cddc4d0..f76f7d1a0 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -5,7 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" - "go_dreamfactory/lego/sys/redis" "go_dreamfactory/modules" "go_dreamfactory/pb" "math" @@ -99,17 +98,8 @@ func (this *Hero) ModifyHero(heroId *pb.DB_HeroData) (*pb.DB_HeroData, pb.ErrorC //获取玩家的英雄列表 func (this *ModelHero) getHeroList(uid string) ([]*pb.DB_HeroData, error) { - herokeys := make(map[string]string) - err := this.Get(uid, herokeys) - if err != nil { - if err == redis.RedisNil { - return make([]*pb.DB_HeroData, 0), nil - } - return nil, err - } - heroes := make([]*pb.DB_HeroData, 0) - err = this.GetList(uid, &heroes) + err := this.GetList(uid, &heroes) if err != nil { return nil, err } From 55c684430185787b3e380dee6c7c46e86f3a6ea6 Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 28 Jun 2022 17:50:09 +0800 Subject: [PATCH 5/8] =?UTF-8?q?pb=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/friend.go | 58 +-- cmd/robot/hero.go | 8 +- modules/friend/api.go | 18 +- modules/friend/api_addblack.go | 18 +- modules/friend/api_agree.go | 18 +- modules/friend/api_apply.go | 20 +- modules/friend/api_applylist.go | 16 +- modules/friend/api_blacklist.go | 16 +- modules/friend/api_del.go | 4 +- modules/friend/api_delblack.go | 16 +- modules/friend/api_list.go | 16 +- modules/friend/api_refuse.go | 16 +- modules/friend/api_search.go | 10 +- modules/hero/api.go | 6 +- modules/hero/api_info.go | 2 +- modules/hero/api_list.go | 2 +- pb/friend_db.pb.go | 47 +- pb/friend_msg.pb.go | 747 +++++++++++++++---------------- pb/hero_msg.pb.go | 176 ++++---- pb/proto/friend/friend_db.proto | 2 +- pb/proto/friend/friend_msg.proto | 52 +-- 21 files changed, 639 insertions(+), 629 deletions(-) diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go index 81935515a..f55119e8b 100644 --- a/cmd/robot/friend.go +++ b/cmd/robot/friend.go @@ -8,73 +8,73 @@ import ( var ( //friend - friend_builders = []*builder{ + friendBuilders = []*builder{ { //list mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_List, - req: &pb.Friend_List_Req{}, - rsp: &pb.Friend_List_Rsp{}, + subType: friend.FriendSubTypeList, + req: &pb.FriendListReq{}, + rsp: &pb.FriendListRsp{}, enabled: true, }, { //blacklist mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_Blacklist, - req: &pb.Friend_BlackList_Req{}, - rsp: &pb.Friend_BlackList_Rsp{}, + subType: friend.FriendSubTypeBlacklist, + req: &pb.FriendBlackListReq{}, + rsp: &pb.FriendBlackListRsp{}, }, { //search mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_Search, - req: &pb.Friend_Search_Req{ + subType: friend.FriendSubTypeSearch, + req: &pb.FriendSearchReq{ NickName: "", //设置测试参数 }, - rsp: &pb.Friend_Search_Rsp{}, + rsp: &pb.FriendSearchRsp{}, }, { //apply mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_Apply, - req: &pb.Friend_Apply_Req{}, - rsp: &pb.Friend_Apply_Rsp{}, + subType: friend.FriendSubTypeApply, + req: &pb.FriendApplyReq{}, + rsp: &pb.FriendApplyRsp{}, enabled: true, }, { //applylist mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_ApplyList, - req: &pb.Friend_ApplyList_Req{}, - rsp: &pb.Friend_ApplyList_Rsp{}, + subType: friend.FriendSubTypeApplyList, + req: &pb.FriendApplyListReq{}, + rsp: &pb.FriendApplyListRsp{}, }, { //agree mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_Agree, - req: &pb.Friend_Agree_Req{}, - rsp: &pb.Friend_Agree_Rsp{}, + subType: friend.FriendSubTypeAgree, + req: &pb.FriendAgreeReq{}, + rsp: &pb.FriendAgreeRsp{}, }, { //refuse mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_Refuse, - req: &pb.Friend_Agree_Req{}, - rsp: &pb.Friend_Agree_Rsp{}, + subType: friend.FriendSubTypeRefuse, + req: &pb.FriendAgreeReq{}, + rsp: &pb.FriendAgreeRsp{}, }, { //addblack mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_AddBlack, - req: &pb.Friend_BlackAdd_Req{ + subType: friend.FriendSubTypeAddBlack, + req: &pb.FriendBlackAddReq{ FriendId: "", }, - rsp: &pb.Friend_BlackAdd_Rsp{}, + rsp: &pb.FriendBlackAddRsp{}, }, { //delblack mainType: string(comm.SM_FriendModule), - subType: friend.Friend_SubType_DelBlack, - req: &pb.Friend_DelBlack_Req{}, - rsp: &pb.Friend_DelBlack_Rsp{}, + subType: friend.FriendSubTypeDelBlack, + req: &pb.FriendDelBlackReq{}, + rsp: &pb.FriendDelBlackRsp{}, }, } ) //声明加入到构建器并发起请求 func (r *Robot) RunFriend() { - r.addBuilders(friend_builders) + r.addBuilders(friendBuilders) r.handleReq() } diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index a8c8fc147..4d21147c0 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -8,19 +8,21 @@ import ( var ( //hero - hero_builders = []*builder{ + heroBuilders = []*builder{ { mainType: string(comm.SM_HeroModule), - subType: hero.Hero_SubType_List, + subType: hero.HeroSubTypeList, req: &pb.Hero_List_Req{}, rsp: &pb.Hero_List_Rsp{}, enabled: true, + }, { + mainType: string(comm.SM_HeroModule), }, } ) //声明加入到构建器并发起请求 func (r *Robot) RunHero() { - r.addBuilders(hero_builders) + r.addBuilders(heroBuilders) r.handleReq() } diff --git a/modules/friend/api.go b/modules/friend/api.go index b9e8176f6..e5c19fb69 100644 --- a/modules/friend/api.go +++ b/modules/friend/api.go @@ -6,15 +6,15 @@ import ( ) const ( - Friend_SubType_List = "list" - Friend_SubType_Apply = "apply" - Friend_SubType_ApplyList = "applylist" - Friend_SubType_AddBlack = "addblack" - Friend_SubType_DelBlack = "delblack" - Friend_SubType_Blacklist = "blacklist" - Friend_SubType_Agree = "agree" - Friend_SubType_Refuse = "refuse" - Friend_SubType_Search = "search" + FriendSubTypeList = "list" + FriendSubTypeApply = "apply" + FriendSubTypeApplyList = "applylist" + FriendSubTypeAddBlack = "addblack" + FriendSubTypeDelBlack = "delblack" + FriendSubTypeBlacklist = "blacklist" + FriendSubTypeAgree = "agree" + FriendSubTypeRefuse = "refuse" + FriendSubTypeSearch = "search" ) type apiComp struct { diff --git a/modules/friend/api_addblack.go b/modules/friend/api_addblack.go index 0d20edf6c..0eccd3039 100644 --- a/modules/friend/api_addblack.go +++ b/modules/friend/api_addblack.go @@ -6,14 +6,14 @@ import ( "go_dreamfactory/utils" ) -func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.Friend_BlackAdd_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendBlackAddReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) var ( err error blackNumMax = 50 //TODO 从配置中读取 ) - self := &pb.DB_FriendData{UId: session.GetUserId()} - target := &pb.DB_FriendData{UId: req.FriendId} + self := &pb.DBFriend{UId: session.GetUserId()} + target := &pb.DBFriend{UId: req.FriendId} err = this.module.modelFriend.Get(session.GetUserId(), self) if self == nil || err != nil { @@ -58,22 +58,22 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.Friend_Bla } //加入黑名单 -func (this *apiComp) Addblack(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_BlackAdd_Req) (code pb.ErrorCode) { +func (this *apiComp) Addblack(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendBlackAddReq) (code pb.ErrorCode) { var ( - self *pb.DB_FriendData - rsp *pb.Friend_BlackAdd_Rsp + self *pb.DBFriend + rsp *pb.FriendBlackAddRsp ) defer func() { - rsp = &pb.Friend_BlackAdd_Rsp{ + rsp = &pb.FriendBlackAddRsp{ FriendId: req.FriendId, UserId: session.GetUserId(), } - session.SendMsg(string(this.module.GetType()), Friend_SubType_AddBlack, rsp) + session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, rsp) }() if v, ok := chk["self"]; ok { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) //将目标加入黑名单 self.BlackIds = append(self.BlackIds, req.FriendId) diff --git a/modules/friend/api_agree.go b/modules/friend/api_agree.go index 0fda04344..af036ec68 100644 --- a/modules/friend/api_agree.go +++ b/modules/friend/api_agree.go @@ -6,10 +6,10 @@ import ( "go_dreamfactory/utils" ) -func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.Friend_Agree_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) var err error - self := &pb.DB_FriendData{UId: session.GetUserId()} + self := &pb.DBFriend{UId: session.GetUserId()} //获取玩家自己好友数据 err = this.module.modelFriend.Get(session.GetUserId(), self) @@ -34,18 +34,18 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.Friend_Agree_ } //单个/批量同意 -func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Agree_Req) (code pb.ErrorCode) { +func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendAgreeReq) (code pb.ErrorCode) { var ( - self *pb.DB_FriendData - rsp *pb.Friend_Agree_Rsp + self *pb.DBFriend + rsp *pb.FriendAgreeRsp optNum int32 ) defer func() { - rsp = &pb.Friend_Agree_Rsp{ + rsp = &pb.FriendAgreeRsp{ Num: optNum, } - err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Agree, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, rsp) if err != nil { code = pb.ErrorCode_SystemError return @@ -56,7 +56,7 @@ func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{} code = pb.ErrorCode_FriendTargetNoData return } else { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) } if agreeIds, ok := chk["agreeIds"]; ok { @@ -70,7 +70,7 @@ func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{} } //双向添加：将自己加入到申请人的好友列表中 - target := &pb.DB_FriendData{} + target := &pb.DBFriend{} err := this.module.modelFriend.Get(userId, target) if target == nil || err != nil { code = pb.ErrorCode_FriendTargetNoData diff --git a/modules/friend/api_apply.go b/modules/friend/api_apply.go index fa2b6765f..bedbea659 100644 --- a/modules/friend/api_apply.go +++ b/modules/friend/api_apply.go @@ -7,11 +7,11 @@ import ( "go_dreamfactory/utils" ) -func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.Friend_Apply_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) var err error - self := &pb.DB_FriendData{UId: session.GetUserId()} - target := &pb.DB_FriendData{UId: req.FriendId} + self := &pb.DBFriend{UId: session.GetUserId()} + target := &pb.DBFriend{UId: req.FriendId} //获取玩家自己好友数据 err = this.module.modelFriend.Get(session.GetUserId(), self) @@ -79,24 +79,24 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.Friend_Apply_ } //好友申请 -func (this *apiComp) Apply(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Apply_Req) (code pb.ErrorCode) { +func (this *apiComp) Apply(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendApplyReq) (code pb.ErrorCode) { var ( - target *pb.DB_FriendData - rsp *pb.Friend_Apply_Rsp + target *pb.DBFriend + rsp *pb.FriendApplyRsp ) defer func() { - utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), Friend_SubType_Apply, req, rsp) + utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, rsp) }() defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.Friend_Apply_Rsp{ + rsp = &pb.FriendApplyRsp{ UserId: session.GetUserId(), FriendId: req.FriendId, } } - err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Apply, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, rsp) if err != nil { code = pb.ErrorCode_SystemError return @@ -107,7 +107,7 @@ func (this *apiComp) Apply(session comm.IUserSession, chk map[string]interface{} code = pb.ErrorCode_FriendTargetNoData return } else { - target = v.(*pb.DB_FriendData) + target = v.(*pb.DBFriend) } //将自己加入到目标用户的申请列表中 diff --git a/modules/friend/api_applylist.go b/modules/friend/api_applylist.go index abb91678b..2c3f8cc93 100644 --- a/modules/friend/api_applylist.go +++ b/modules/friend/api_applylist.go @@ -5,9 +5,9 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.Friend_ApplyList_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApplyListReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) - self := &pb.DB_FriendData{UId: session.GetUserId()} + self := &pb.DBFriend{UId: session.GetUserId()} err := this.module.modelFriend.Get(session.GetUserId(), self) if self == nil || err != nil { code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData} @@ -18,24 +18,24 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.Friend_Ap } //申请列表 -func (this *apiComp) ApplyList(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_ApplyList_Req) (code pb.ErrorCode) { +func (this *apiComp) ApplyList(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendApplyListReq) (code pb.ErrorCode) { var ( - self *pb.DB_FriendData - rsp *pb.Friend_ApplyList_Rsp + self *pb.DBFriend + rsp *pb.FriendApplyListRsp list []*pb.FriendBase ) defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.Friend_ApplyList_Rsp{ + rsp = &pb.FriendApplyListRsp{ List: list, } } - session.SendMsg(string(this.module.GetType()), Friend_SubType_ApplyList, rsp) + session.SendMsg(string(this.module.GetType()), FriendSubTypeApplyList, rsp) }() if v, ok := chk["self"]; ok { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) for _, userId := range self.ApplyIds { //TODO 组装FriendBase明细数据 list = append(list, &pb.FriendBase{ diff --git a/modules/friend/api_blacklist.go b/modules/friend/api_blacklist.go index 7f19c1464..a98850c5a 100644 --- a/modules/friend/api_blacklist.go +++ b/modules/friend/api_blacklist.go @@ -5,9 +5,9 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.Friend_BlackList_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) - self := &pb.DB_FriendData{UId: session.GetUserId()} + self := &pb.DBFriend{UId: session.GetUserId()} err := this.module.modelFriend.Get(session.GetUserId(), self) if self == nil || err != nil { code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData} @@ -18,19 +18,19 @@ func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.Friend_Bl } //黑名单 -func (this *apiComp) Blacklist(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_BlackList_Req) (code pb.ErrorCode) { +func (this *apiComp) Blacklist(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendBlackListReq) (code pb.ErrorCode) { var ( - self *pb.DB_FriendData - rsp *pb.Friend_BlackList_Rsp + self *pb.DBFriend + rsp *pb.FriendBlackListRsp list []*pb.FriendBase ) defer func() { - rsp = &pb.Friend_BlackList_Rsp{ + rsp = &pb.FriendBlackListRsp{ Friends: list, } - err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Blacklist, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, rsp) if err != nil { code = pb.ErrorCode_SystemError return @@ -38,7 +38,7 @@ func (this *apiComp) Blacklist(session comm.IUserSession, chk map[string]interfa }() if v, ok := chk["self"]; ok { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) for _, userId := range self.BlackIds { //TODO 完善FriendBase信息 list = append(list, &pb.FriendBase{ diff --git a/modules/friend/api_del.go b/modules/friend/api_del.go index cfed5b67b..5b51be879 100644 --- a/modules/friend/api_del.go +++ b/modules/friend/api_del.go @@ -5,11 +5,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.Friend_Del_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (chk map[string]interface{}, code comm.ErrorCode) { return } //删除好友 -func (this *apiComp) Del(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Del_Req) error { +func (this *apiComp) Del(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendDelReq) error { return nil } diff --git a/modules/friend/api_delblack.go b/modules/friend/api_delblack.go index c74d01d32..9995b4057 100644 --- a/modules/friend/api_delblack.go +++ b/modules/friend/api_delblack.go @@ -6,9 +6,9 @@ import ( "go_dreamfactory/utils" ) -func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.Friend_DelBlack_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) - self := &pb.DB_FriendData{UId: session.GetUserId()} + self := &pb.DBFriend{UId: session.GetUserId()} err := this.module.modelFriend.Get(session.GetUserId(), self) if self == nil || err != nil { code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData} @@ -19,19 +19,19 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.Friend_Del } //删除黑名单 -func (this *apiComp) Delblack(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_DelBlack_Req) (code pb.ErrorCode) { +func (this *apiComp) Delblack(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendDelBlackReq) (code pb.ErrorCode) { var ( - self *pb.DB_FriendData - rsp *pb.Friend_DelBlack_Rsp + self *pb.DBFriend + rsp *pb.FriendDelBlackRsp ) defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.Friend_DelBlack_Rsp{ + rsp = &pb.FriendDelBlackRsp{ FriendId: req.FriendId, UserId: session.GetUserId(), } } - err := session.SendMsg(string(this.module.GetType()), Friend_SubType_DelBlack, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, rsp) if err != nil { code = pb.ErrorCode_SystemError return @@ -39,7 +39,7 @@ func (this *apiComp) Delblack(session comm.IUserSession, chk map[string]interfac }() if v, ok := chk["self"]; ok { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) //从黑名单列表中删除目标 self.BlackIds = utils.DeleteString(self.BlackIds, req.FriendId) //更新黑名单 diff --git a/modules/friend/api_list.go b/modules/friend/api_list.go index 183ec2fa2..f1fa0b250 100644 --- a/modules/friend/api_list.go +++ b/modules/friend/api_list.go @@ -5,9 +5,9 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.Friend_List_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) - self := &pb.DB_FriendData{UId: session.GetUserId()} + self := &pb.DBFriend{UId: session.GetUserId()} err := this.module.modelFriend.Get(session.GetUserId(), self) if self == nil || err != nil { code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData} @@ -18,18 +18,18 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.Friend_List_Re } //好友列表 -func (this *apiComp) List(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_List_Req) (code pb.ErrorCode) { +func (this *apiComp) List(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendListReq) (code pb.ErrorCode) { var ( - self *pb.DB_FriendData - rsp *pb.Friend_List_Rsp + self *pb.DBFriend + rsp *pb.FriendListRsp list []*pb.FriendBase ) defer func() { - rsp = &pb.Friend_List_Rsp{ + rsp = &pb.FriendListRsp{ List: list, } - err := session.SendMsg(string(this.module.GetType()), Friend_SubType_List, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, rsp) if err != nil { code = pb.ErrorCode_SystemError return @@ -37,7 +37,7 @@ func (this *apiComp) List(session comm.IUserSession, chk map[string]interface{}, }() if v, ok := chk["self"]; ok { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) for _, userId := range self.FriendIds { list = append(list, &pb.FriendBase{ UserId: userId, diff --git a/modules/friend/api_refuse.go b/modules/friend/api_refuse.go index 4e465f234..a72b106b2 100644 --- a/modules/friend/api_refuse.go +++ b/modules/friend/api_refuse.go @@ -6,10 +6,10 @@ import ( "go_dreamfactory/utils" ) -func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.Friend_Refuse_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuseReq) (chk map[string]interface{}, code comm.ErrorCode) { chk = make(map[string]interface{}) var err error - self := &pb.DB_FriendData{UId: session.GetUserId()} + self := &pb.DBFriend{UId: session.GetUserId()} //获取玩家自己好友数据 err = this.module.modelFriend.Get(session.GetUserId(), self) @@ -33,19 +33,19 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.Friend_Refus } //单个/批量拒绝 -func (this *apiComp) Refuse(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Refuse_Req) (code pb.ErrorCode) { +func (this *apiComp) Refuse(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendRefuseReq) (code pb.ErrorCode) { //将申请人从申请列表中删除 var ( - self *pb.DB_FriendData - rsp *pb.Friend_Refuse_Rsp + self *pb.DBFriend + rsp *pb.FriendRefuseRsp optNum int32 ) defer func() { - rsp = &pb.Friend_Refuse_Rsp{ + rsp = &pb.FriendRefuseRsp{ Num: optNum, } - err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Refuse, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, rsp) if err != nil { code = pb.ErrorCode_SystemError return @@ -56,7 +56,7 @@ func (this *apiComp) Refuse(session comm.IUserSession, chk map[string]interface{ code = pb.ErrorCode_FriendTargetNoData return } else { - self = v.(*pb.DB_FriendData) + self = v.(*pb.DBFriend) if v, ok := chk["refuseIds"]; ok { //将申请人从申请列表中删除 diff --git a/modules/friend/api_search.go b/modules/friend/api_search.go index 9af50a42a..ae5c0a02e 100644 --- a/modules/friend/api_search.go +++ b/modules/friend/api_search.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.Friend_Search_Req) (chk map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (chk map[string]interface{}, code comm.ErrorCode) { if req.NickName == "" { code = comm.ErrorCode{Code: pb.ErrorCode_FriendSearchNameEmpty} return @@ -14,18 +14,18 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.Friend_Searc } //搜索 -func (this *apiComp) Search(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Search_Req) (code pb.ErrorCode) { +func (this *apiComp) Search(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendSearchReq) (code pb.ErrorCode) { var ( - rsp *pb.Friend_Search_Rsp + rsp *pb.FriendSearchRsp friend *pb.FriendBase ) defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.Friend_Search_Rsp{ + rsp = &pb.FriendSearchRsp{ Friend: friend, } } - session.SendMsg(string(this.module.GetType()), Friend_SubType_Search, rsp) + session.SendMsg(string(this.module.GetType()), FriendSubTypeSearch, rsp) }() user := this.module.modelFriend.Frined_FindCond(req.NickName) diff --git a/modules/hero/api.go b/modules/hero/api.go index 7e25a8e85..6083321cb 100644 --- a/modules/hero/api.go +++ b/modules/hero/api.go @@ -14,9 +14,9 @@ type apiComp struct { } const ( //消息回复的头名称 - StrengthenUplv = "strengthenherolv" - Hero_SubType_Info = "info" //英雄卡片信息 - Hero_SubType_List = "list" //英雄列表 + StrengthenUplv = "strengthenherolv" + HeroSubTypeInfo = "info" //英雄卡片信息 + HeroSubTypeList = "list" //英雄列表 ) //组件初始化接口 diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go index dc1028543..5005dc24b 100644 --- a/modules/hero/api_info.go +++ b/modules/hero/api_info.go @@ -19,7 +19,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.Hero_Info_Req) func (this *apiComp) Info(session comm.IUserSession, result map[string]interface{}, req *pb.Hero_Info_Req) (code pb.ErrorCode) { rsp := &pb.Hero_Info_Rsp{} defer func() { - err := session.SendMsg(string(this.moduleHero.GetType()), Hero_SubType_Info, rsp) + err := session.SendMsg(string(this.moduleHero.GetType()), HeroSubTypeInfo, rsp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go index ee2e47b63..a6cc3e0f9 100644 --- a/modules/hero/api_list.go +++ b/modules/hero/api_list.go @@ -14,7 +14,7 @@ func (this *apiComp) List(session comm.IUserSession, result map[string]interface rsp := &pb.Hero_List_Rsp{} defer func() { - err := session.SendMsg(this.moduleHero.api.service.GetType(), Hero_SubType_List, rsp) + err := session.SendMsg(string(this.moduleHero.GetType()), HeroSubTypeList, rsp) if err != nil { code = pb.ErrorCode_SystemError } diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go index 963204a92..7c020dc96 100644 --- a/pb/friend_db.pb.go +++ b/pb/friend_db.pb.go @@ -20,7 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type DB_FriendData struct { +type DBFriend struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -31,8 +31,8 @@ type DB_FriendData struct { BlackIds []string `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds" bson:"blackIds"` //黑名单ID } -func (x *DB_FriendData) Reset() { - *x = DB_FriendData{} +func (x *DBFriend) Reset() { + *x = DBFriend{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -40,13 +40,13 @@ func (x *DB_FriendData) Reset() { } } -func (x *DB_FriendData) String() string { +func (x *DBFriend) String() string { return protoimpl.X.MessageStringOf(x) } -func (*DB_FriendData) ProtoMessage() {} +func (*DBFriend) ProtoMessage() {} -func (x *DB_FriendData) ProtoReflect() protoreflect.Message { +func (x *DBFriend) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -58,33 +58,33 @@ func (x *DB_FriendData) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use DB_FriendData.ProtoReflect.Descriptor instead. -func (*DB_FriendData) Descriptor() ([]byte, []int) { +// Deprecated: Use DBFriend.ProtoReflect.Descriptor instead. +func (*DBFriend) Descriptor() ([]byte, []int) { return file_friend_friend_db_proto_rawDescGZIP(), []int{0} } -func (x *DB_FriendData) GetUId() string { +func (x *DBFriend) GetUId() string { if x != nil { return x.UId } return "" } -func (x *DB_FriendData) GetFriendIds() []string { +func (x *DBFriend) GetFriendIds() []string { if x != nil { return x.FriendIds } return nil } -func (x *DB_FriendData) GetApplyIds() []string { +func (x *DBFriend) GetApplyIds() []string { if x != nil { return x.ApplyIds } return nil } -func (x *DB_FriendData) GetBlackIds() []string { +func (x *DBFriend) GetBlackIds() []string { if x != nil { return x.BlackIds } @@ -95,16 +95,15 @@ var File_friend_friend_db_proto protoreflect.FileDescriptor var file_friend_friend_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, - 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x77, 0x0a, 0x0d, 0x44, 0x42, 0x5f, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, - 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x70, 0x70, - 0x6c, 0x79, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x61, 0x70, 0x70, - 0x6c, 0x79, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64, - 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64, - 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x72, 0x0a, 0x08, 0x44, 0x42, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x49, 0x64, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x49, 0x64, 0x73, + 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -121,7 +120,7 @@ func file_friend_friend_db_proto_rawDescGZIP() []byte { var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_friend_friend_db_proto_goTypes = []interface{}{ - (*DB_FriendData)(nil), // 0: DB_FriendData + (*DBFriend)(nil), // 0: DBFriend } var file_friend_friend_db_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type @@ -138,7 +137,7 @@ func file_friend_friend_db_proto_init() { } if !protoimpl.UnsafeEnabled { file_friend_friend_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DB_FriendData); i { + switch v := v.(*DBFriend); i { case 0: return &v.state case 1: diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index 0564d382d..2c393abc6 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -116,14 +116,14 @@ func (x *FriendBase) GetOfflineTime() int64 { } //好友列表 -type Friend_List_Req struct { +type FriendListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *Friend_List_Req) Reset() { - *x = Friend_List_Req{} +func (x *FriendListReq) Reset() { + *x = FriendListReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -131,13 +131,13 @@ func (x *Friend_List_Req) Reset() { } } -func (x *Friend_List_Req) String() string { +func (x *FriendListReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_List_Req) ProtoMessage() {} +func (*FriendListReq) ProtoMessage() {} -func (x *Friend_List_Req) ProtoReflect() protoreflect.Message { +func (x *FriendListReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -149,12 +149,12 @@ func (x *Friend_List_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_List_Req.ProtoReflect.Descriptor instead. -func (*Friend_List_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendListReq.ProtoReflect.Descriptor instead. +func (*FriendListReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{1} } -type Friend_List_Rsp struct { +type FriendListRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -162,8 +162,8 @@ type Friend_List_Rsp struct { List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } -func (x *Friend_List_Rsp) Reset() { - *x = Friend_List_Rsp{} +func (x *FriendListRsp) Reset() { + *x = FriendListRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -171,13 +171,13 @@ func (x *Friend_List_Rsp) Reset() { } } -func (x *Friend_List_Rsp) String() string { +func (x *FriendListRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_List_Rsp) ProtoMessage() {} +func (*FriendListRsp) ProtoMessage() {} -func (x *Friend_List_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendListRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -189,12 +189,12 @@ func (x *Friend_List_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_List_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_List_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendListRsp.ProtoReflect.Descriptor instead. +func (*FriendListRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{2} } -func (x *Friend_List_Rsp) GetList() []*FriendBase { +func (x *FriendListRsp) GetList() []*FriendBase { if x != nil { return x.List } @@ -202,7 +202,7 @@ func (x *Friend_List_Rsp) GetList() []*FriendBase { } //申请好友 -type Friend_Apply_Req struct { +type FriendApplyReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -210,8 +210,8 @@ type Friend_Apply_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID } -func (x *Friend_Apply_Req) Reset() { - *x = Friend_Apply_Req{} +func (x *FriendApplyReq) Reset() { + *x = FriendApplyReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -219,13 +219,13 @@ func (x *Friend_Apply_Req) Reset() { } } -func (x *Friend_Apply_Req) String() string { +func (x *FriendApplyReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Apply_Req) ProtoMessage() {} +func (*FriendApplyReq) ProtoMessage() {} -func (x *Friend_Apply_Req) ProtoReflect() protoreflect.Message { +func (x *FriendApplyReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -237,19 +237,19 @@ func (x *Friend_Apply_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Apply_Req.ProtoReflect.Descriptor instead. -func (*Friend_Apply_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendApplyReq.ProtoReflect.Descriptor instead. +func (*FriendApplyReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{3} } -func (x *Friend_Apply_Req) GetFriendId() string { +func (x *FriendApplyReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_Apply_Rsp struct { +type FriendApplyRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -258,8 +258,8 @@ type Friend_Apply_Rsp struct { FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID } -func (x *Friend_Apply_Rsp) Reset() { - *x = Friend_Apply_Rsp{} +func (x *FriendApplyRsp) Reset() { + *x = FriendApplyRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -267,13 +267,13 @@ func (x *Friend_Apply_Rsp) Reset() { } } -func (x *Friend_Apply_Rsp) String() string { +func (x *FriendApplyRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Apply_Rsp) ProtoMessage() {} +func (*FriendApplyRsp) ProtoMessage() {} -func (x *Friend_Apply_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendApplyRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -285,19 +285,19 @@ func (x *Friend_Apply_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Apply_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Apply_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendApplyRsp.ProtoReflect.Descriptor instead. +func (*FriendApplyRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{4} } -func (x *Friend_Apply_Rsp) GetUserId() string { +func (x *FriendApplyRsp) GetUserId() string { if x != nil { return x.UserId } return "" } -func (x *Friend_Apply_Rsp) GetFriendId() string { +func (x *FriendApplyRsp) GetFriendId() string { if x != nil { return x.FriendId } @@ -305,7 +305,7 @@ func (x *Friend_Apply_Rsp) GetFriendId() string { } //删除好友 -type Friend_Del_Req struct { +type FriendDelReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -313,8 +313,8 @@ type Friend_Del_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID } -func (x *Friend_Del_Req) Reset() { - *x = Friend_Del_Req{} +func (x *FriendDelReq) Reset() { + *x = FriendDelReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -322,13 +322,13 @@ func (x *Friend_Del_Req) Reset() { } } -func (x *Friend_Del_Req) String() string { +func (x *FriendDelReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Del_Req) ProtoMessage() {} +func (*FriendDelReq) ProtoMessage() {} -func (x *Friend_Del_Req) ProtoReflect() protoreflect.Message { +func (x *FriendDelReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -340,19 +340,19 @@ func (x *Friend_Del_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Del_Req.ProtoReflect.Descriptor instead. -func (*Friend_Del_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendDelReq.ProtoReflect.Descriptor instead. +func (*FriendDelReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{5} } -func (x *Friend_Del_Req) GetFriendId() string { +func (x *FriendDelReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_Del_Rsp struct { +type FriendDelRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -361,8 +361,8 @@ type Friend_Del_Rsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` //用户ID } -func (x *Friend_Del_Rsp) Reset() { - *x = Friend_Del_Rsp{} +func (x *FriendDelRsp) Reset() { + *x = FriendDelRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -370,13 +370,13 @@ func (x *Friend_Del_Rsp) Reset() { } } -func (x *Friend_Del_Rsp) String() string { +func (x *FriendDelRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Del_Rsp) ProtoMessage() {} +func (*FriendDelRsp) ProtoMessage() {} -func (x *Friend_Del_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendDelRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -388,19 +388,19 @@ func (x *Friend_Del_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Del_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Del_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendDelRsp.ProtoReflect.Descriptor instead. +func (*FriendDelRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{6} } -func (x *Friend_Del_Rsp) GetFriendId() string { +func (x *FriendDelRsp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *Friend_Del_Rsp) GetUserId() string { +func (x *FriendDelRsp) GetUserId() string { if x != nil { return x.UserId } @@ -408,7 +408,7 @@ func (x *Friend_Del_Rsp) GetUserId() string { } //同意 -type Friend_Agree_Req struct { +type FriendAgreeReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -416,8 +416,8 @@ type Friend_Agree_Req struct { FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds"` //被同意的用户 } -func (x *Friend_Agree_Req) Reset() { - *x = Friend_Agree_Req{} +func (x *FriendAgreeReq) Reset() { + *x = FriendAgreeReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -425,13 +425,13 @@ func (x *Friend_Agree_Req) Reset() { } } -func (x *Friend_Agree_Req) String() string { +func (x *FriendAgreeReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Agree_Req) ProtoMessage() {} +func (*FriendAgreeReq) ProtoMessage() {} -func (x *Friend_Agree_Req) ProtoReflect() protoreflect.Message { +func (x *FriendAgreeReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -443,19 +443,19 @@ func (x *Friend_Agree_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Agree_Req.ProtoReflect.Descriptor instead. -func (*Friend_Agree_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendAgreeReq.ProtoReflect.Descriptor instead. +func (*FriendAgreeReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{7} } -func (x *Friend_Agree_Req) GetFriendIds() []string { +func (x *FriendAgreeReq) GetFriendIds() []string { if x != nil { return x.FriendIds } return nil } -type Friend_Agree_Rsp struct { +type FriendAgreeRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -463,8 +463,8 @@ type Friend_Agree_Rsp struct { Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量 } -func (x *Friend_Agree_Rsp) Reset() { - *x = Friend_Agree_Rsp{} +func (x *FriendAgreeRsp) Reset() { + *x = FriendAgreeRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -472,13 +472,13 @@ func (x *Friend_Agree_Rsp) Reset() { } } -func (x *Friend_Agree_Rsp) String() string { +func (x *FriendAgreeRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Agree_Rsp) ProtoMessage() {} +func (*FriendAgreeRsp) ProtoMessage() {} -func (x *Friend_Agree_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendAgreeRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -490,12 +490,12 @@ func (x *Friend_Agree_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Agree_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Agree_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendAgreeRsp.ProtoReflect.Descriptor instead. +func (*FriendAgreeRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{8} } -func (x *Friend_Agree_Rsp) GetNum() int32 { +func (x *FriendAgreeRsp) GetNum() int32 { if x != nil { return x.Num } @@ -503,7 +503,7 @@ func (x *Friend_Agree_Rsp) GetNum() int32 { } //拒绝 -type Friend_Refuse_Req struct { +type FriendRefuseReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -511,8 +511,8 @@ type Friend_Refuse_Req struct { FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds"` //被拒绝的用户 } -func (x *Friend_Refuse_Req) Reset() { - *x = Friend_Refuse_Req{} +func (x *FriendRefuseReq) Reset() { + *x = FriendRefuseReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -520,13 +520,13 @@ func (x *Friend_Refuse_Req) Reset() { } } -func (x *Friend_Refuse_Req) String() string { +func (x *FriendRefuseReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Refuse_Req) ProtoMessage() {} +func (*FriendRefuseReq) ProtoMessage() {} -func (x *Friend_Refuse_Req) ProtoReflect() protoreflect.Message { +func (x *FriendRefuseReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -538,19 +538,19 @@ func (x *Friend_Refuse_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Refuse_Req.ProtoReflect.Descriptor instead. -func (*Friend_Refuse_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendRefuseReq.ProtoReflect.Descriptor instead. +func (*FriendRefuseReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{9} } -func (x *Friend_Refuse_Req) GetFriendIds() []string { +func (x *FriendRefuseReq) GetFriendIds() []string { if x != nil { return x.FriendIds } return nil } -type Friend_Refuse_Rsp struct { +type FriendRefuseRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -558,8 +558,8 @@ type Friend_Refuse_Rsp struct { Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量 } -func (x *Friend_Refuse_Rsp) Reset() { - *x = Friend_Refuse_Rsp{} +func (x *FriendRefuseRsp) Reset() { + *x = FriendRefuseRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -567,13 +567,13 @@ func (x *Friend_Refuse_Rsp) Reset() { } } -func (x *Friend_Refuse_Rsp) String() string { +func (x *FriendRefuseRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Refuse_Rsp) ProtoMessage() {} +func (*FriendRefuseRsp) ProtoMessage() {} -func (x *Friend_Refuse_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendRefuseRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -585,12 +585,12 @@ func (x *Friend_Refuse_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Refuse_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Refuse_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendRefuseRsp.ProtoReflect.Descriptor instead. +func (*FriendRefuseRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{10} } -func (x *Friend_Refuse_Rsp) GetNum() int32 { +func (x *FriendRefuseRsp) GetNum() int32 { if x != nil { return x.Num } @@ -598,14 +598,14 @@ func (x *Friend_Refuse_Rsp) GetNum() int32 { } //好友申请列表 -type Friend_ApplyList_Req struct { +type FriendApplyListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *Friend_ApplyList_Req) Reset() { - *x = Friend_ApplyList_Req{} +func (x *FriendApplyListReq) Reset() { + *x = FriendApplyListReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -613,13 +613,13 @@ func (x *Friend_ApplyList_Req) Reset() { } } -func (x *Friend_ApplyList_Req) String() string { +func (x *FriendApplyListReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_ApplyList_Req) ProtoMessage() {} +func (*FriendApplyListReq) ProtoMessage() {} -func (x *Friend_ApplyList_Req) ProtoReflect() protoreflect.Message { +func (x *FriendApplyListReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -631,12 +631,12 @@ func (x *Friend_ApplyList_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_ApplyList_Req.ProtoReflect.Descriptor instead. -func (*Friend_ApplyList_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendApplyListReq.ProtoReflect.Descriptor instead. +func (*FriendApplyListReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{11} } -type Friend_ApplyList_Rsp struct { +type FriendApplyListRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -644,8 +644,8 @@ type Friend_ApplyList_Rsp struct { List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } -func (x *Friend_ApplyList_Rsp) Reset() { - *x = Friend_ApplyList_Rsp{} +func (x *FriendApplyListRsp) Reset() { + *x = FriendApplyListRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -653,13 +653,13 @@ func (x *Friend_ApplyList_Rsp) Reset() { } } -func (x *Friend_ApplyList_Rsp) String() string { +func (x *FriendApplyListRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_ApplyList_Rsp) ProtoMessage() {} +func (*FriendApplyListRsp) ProtoMessage() {} -func (x *Friend_ApplyList_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -671,12 +671,12 @@ func (x *Friend_ApplyList_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_ApplyList_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_ApplyList_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendApplyListRsp.ProtoReflect.Descriptor instead. +func (*FriendApplyListRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{12} } -func (x *Friend_ApplyList_Rsp) GetList() []*FriendBase { +func (x *FriendApplyListRsp) GetList() []*FriendBase { if x != nil { return x.List } @@ -684,7 +684,7 @@ func (x *Friend_ApplyList_Rsp) GetList() []*FriendBase { } //好友搜索 -type Friend_Search_Req struct { +type FriendSearchReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -692,8 +692,8 @@ type Friend_Search_Req struct { NickName string `protobuf:"bytes,1,opt,name=nickName,proto3" json:"nickName"` //好友昵称 } -func (x *Friend_Search_Req) Reset() { - *x = Friend_Search_Req{} +func (x *FriendSearchReq) Reset() { + *x = FriendSearchReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -701,13 +701,13 @@ func (x *Friend_Search_Req) Reset() { } } -func (x *Friend_Search_Req) String() string { +func (x *FriendSearchReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Search_Req) ProtoMessage() {} +func (*FriendSearchReq) ProtoMessage() {} -func (x *Friend_Search_Req) ProtoReflect() protoreflect.Message { +func (x *FriendSearchReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -719,19 +719,19 @@ func (x *Friend_Search_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Search_Req.ProtoReflect.Descriptor instead. -func (*Friend_Search_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendSearchReq.ProtoReflect.Descriptor instead. +func (*FriendSearchReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{13} } -func (x *Friend_Search_Req) GetNickName() string { +func (x *FriendSearchReq) GetNickName() string { if x != nil { return x.NickName } return "" } -type Friend_Search_Rsp struct { +type FriendSearchRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -739,8 +739,8 @@ type Friend_Search_Rsp struct { Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"` } -func (x *Friend_Search_Rsp) Reset() { - *x = Friend_Search_Rsp{} +func (x *FriendSearchRsp) Reset() { + *x = FriendSearchRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -748,13 +748,13 @@ func (x *Friend_Search_Rsp) Reset() { } } -func (x *Friend_Search_Rsp) String() string { +func (x *FriendSearchRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Search_Rsp) ProtoMessage() {} +func (*FriendSearchRsp) ProtoMessage() {} -func (x *Friend_Search_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -766,12 +766,12 @@ func (x *Friend_Search_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Search_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Search_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendSearchRsp.ProtoReflect.Descriptor instead. +func (*FriendSearchRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{14} } -func (x *Friend_Search_Rsp) GetFriend() *FriendBase { +func (x *FriendSearchRsp) GetFriend() *FriendBase { if x != nil { return x.Friend } @@ -779,14 +779,14 @@ func (x *Friend_Search_Rsp) GetFriend() *FriendBase { } //黑名单 -type Friend_BlackList_Req struct { +type FriendBlackListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *Friend_BlackList_Req) Reset() { - *x = Friend_BlackList_Req{} +func (x *FriendBlackListReq) Reset() { + *x = FriendBlackListReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -794,13 +794,13 @@ func (x *Friend_BlackList_Req) Reset() { } } -func (x *Friend_BlackList_Req) String() string { +func (x *FriendBlackListReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_BlackList_Req) ProtoMessage() {} +func (*FriendBlackListReq) ProtoMessage() {} -func (x *Friend_BlackList_Req) ProtoReflect() protoreflect.Message { +func (x *FriendBlackListReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -812,12 +812,12 @@ func (x *Friend_BlackList_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_BlackList_Req.ProtoReflect.Descriptor instead. -func (*Friend_BlackList_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendBlackListReq.ProtoReflect.Descriptor instead. +func (*FriendBlackListReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{15} } -type Friend_BlackList_Rsp struct { +type FriendBlackListRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -825,8 +825,8 @@ type Friend_BlackList_Rsp struct { Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"` } -func (x *Friend_BlackList_Rsp) Reset() { - *x = Friend_BlackList_Rsp{} +func (x *FriendBlackListRsp) Reset() { + *x = FriendBlackListRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -834,13 +834,13 @@ func (x *Friend_BlackList_Rsp) Reset() { } } -func (x *Friend_BlackList_Rsp) String() string { +func (x *FriendBlackListRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_BlackList_Rsp) ProtoMessage() {} +func (*FriendBlackListRsp) ProtoMessage() {} -func (x *Friend_BlackList_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -852,12 +852,12 @@ func (x *Friend_BlackList_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_BlackList_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_BlackList_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendBlackListRsp.ProtoReflect.Descriptor instead. +func (*FriendBlackListRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{16} } -func (x *Friend_BlackList_Rsp) GetFriends() []*FriendBase { +func (x *FriendBlackListRsp) GetFriends() []*FriendBase { if x != nil { return x.Friends } @@ -865,7 +865,7 @@ func (x *Friend_BlackList_Rsp) GetFriends() []*FriendBase { } //添加黑名单 -type Friend_BlackAdd_Req struct { +type FriendBlackAddReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -873,8 +873,8 @@ type Friend_BlackAdd_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } -func (x *Friend_BlackAdd_Req) Reset() { - *x = Friend_BlackAdd_Req{} +func (x *FriendBlackAddReq) Reset() { + *x = FriendBlackAddReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -882,13 +882,13 @@ func (x *Friend_BlackAdd_Req) Reset() { } } -func (x *Friend_BlackAdd_Req) String() string { +func (x *FriendBlackAddReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_BlackAdd_Req) ProtoMessage() {} +func (*FriendBlackAddReq) ProtoMessage() {} -func (x *Friend_BlackAdd_Req) ProtoReflect() protoreflect.Message { +func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -900,19 +900,19 @@ func (x *Friend_BlackAdd_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_BlackAdd_Req.ProtoReflect.Descriptor instead. -func (*Friend_BlackAdd_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendBlackAddReq.ProtoReflect.Descriptor instead. +func (*FriendBlackAddReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{17} } -func (x *Friend_BlackAdd_Req) GetFriendId() string { +func (x *FriendBlackAddReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_BlackAdd_Rsp struct { +type FriendBlackAddRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -921,8 +921,8 @@ type Friend_BlackAdd_Rsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *Friend_BlackAdd_Rsp) Reset() { - *x = Friend_BlackAdd_Rsp{} +func (x *FriendBlackAddRsp) Reset() { + *x = FriendBlackAddRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -930,13 +930,13 @@ func (x *Friend_BlackAdd_Rsp) Reset() { } } -func (x *Friend_BlackAdd_Rsp) String() string { +func (x *FriendBlackAddRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_BlackAdd_Rsp) ProtoMessage() {} +func (*FriendBlackAddRsp) ProtoMessage() {} -func (x *Friend_BlackAdd_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -948,19 +948,19 @@ func (x *Friend_BlackAdd_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_BlackAdd_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_BlackAdd_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendBlackAddRsp.ProtoReflect.Descriptor instead. +func (*FriendBlackAddRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{18} } -func (x *Friend_BlackAdd_Rsp) GetFriendId() string { +func (x *FriendBlackAddRsp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *Friend_BlackAdd_Rsp) GetUserId() string { +func (x *FriendBlackAddRsp) GetUserId() string { if x != nil { return x.UserId } @@ -968,7 +968,7 @@ func (x *Friend_BlackAdd_Rsp) GetUserId() string { } //删除黑名单 -type Friend_DelBlack_Req struct { +type FriendDelBlackReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -976,8 +976,8 @@ type Friend_DelBlack_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } -func (x *Friend_DelBlack_Req) Reset() { - *x = Friend_DelBlack_Req{} +func (x *FriendDelBlackReq) Reset() { + *x = FriendDelBlackReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -985,13 +985,13 @@ func (x *Friend_DelBlack_Req) Reset() { } } -func (x *Friend_DelBlack_Req) String() string { +func (x *FriendDelBlackReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_DelBlack_Req) ProtoMessage() {} +func (*FriendDelBlackReq) ProtoMessage() {} -func (x *Friend_DelBlack_Req) ProtoReflect() protoreflect.Message { +func (x *FriendDelBlackReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1003,19 +1003,19 @@ func (x *Friend_DelBlack_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_DelBlack_Req.ProtoReflect.Descriptor instead. -func (*Friend_DelBlack_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendDelBlackReq.ProtoReflect.Descriptor instead. +func (*FriendDelBlackReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{19} } -func (x *Friend_DelBlack_Req) GetFriendId() string { +func (x *FriendDelBlackReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_DelBlack_Rsp struct { +type FriendDelBlackRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1024,8 +1024,8 @@ type Friend_DelBlack_Rsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *Friend_DelBlack_Rsp) Reset() { - *x = Friend_DelBlack_Rsp{} +func (x *FriendDelBlackRsp) Reset() { + *x = FriendDelBlackRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1033,13 +1033,13 @@ func (x *Friend_DelBlack_Rsp) Reset() { } } -func (x *Friend_DelBlack_Rsp) String() string { +func (x *FriendDelBlackRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_DelBlack_Rsp) ProtoMessage() {} +func (*FriendDelBlackRsp) ProtoMessage() {} -func (x *Friend_DelBlack_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendDelBlackRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1051,19 +1051,19 @@ func (x *Friend_DelBlack_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_DelBlack_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_DelBlack_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendDelBlackRsp.ProtoReflect.Descriptor instead. +func (*FriendDelBlackRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{20} } -func (x *Friend_DelBlack_Rsp) GetFriendId() string { +func (x *FriendDelBlackRsp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *Friend_DelBlack_Rsp) GetUserId() string { +func (x *FriendDelBlackRsp) GetUserId() string { if x != nil { return x.UserId } @@ -1071,7 +1071,7 @@ func (x *Friend_DelBlack_Rsp) GetUserId() string { } //接收 -type Friend_Receive_Req struct { +type FriendReceiveReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1079,8 +1079,8 @@ type Friend_Receive_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } -func (x *Friend_Receive_Req) Reset() { - *x = Friend_Receive_Req{} +func (x *FriendReceiveReq) Reset() { + *x = FriendReceiveReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1088,13 +1088,13 @@ func (x *Friend_Receive_Req) Reset() { } } -func (x *Friend_Receive_Req) String() string { +func (x *FriendReceiveReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Receive_Req) ProtoMessage() {} +func (*FriendReceiveReq) ProtoMessage() {} -func (x *Friend_Receive_Req) ProtoReflect() protoreflect.Message { +func (x *FriendReceiveReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1106,19 +1106,19 @@ func (x *Friend_Receive_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Receive_Req.ProtoReflect.Descriptor instead. -func (*Friend_Receive_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendReceiveReq.ProtoReflect.Descriptor instead. +func (*FriendReceiveReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{21} } -func (x *Friend_Receive_Req) GetFriendId() string { +func (x *FriendReceiveReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_Receive_Rsp struct { +type FriendReceiveRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1127,8 +1127,8 @@ type Friend_Receive_Rsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *Friend_Receive_Rsp) Reset() { - *x = Friend_Receive_Rsp{} +func (x *FriendReceiveRsp) Reset() { + *x = FriendReceiveRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1136,13 +1136,13 @@ func (x *Friend_Receive_Rsp) Reset() { } } -func (x *Friend_Receive_Rsp) String() string { +func (x *FriendReceiveRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Receive_Rsp) ProtoMessage() {} +func (*FriendReceiveRsp) ProtoMessage() {} -func (x *Friend_Receive_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendReceiveRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1154,19 +1154,19 @@ func (x *Friend_Receive_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Receive_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Receive_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendReceiveRsp.ProtoReflect.Descriptor instead. +func (*FriendReceiveRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{22} } -func (x *Friend_Receive_Rsp) GetFriendId() string { +func (x *FriendReceiveRsp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *Friend_Receive_Rsp) GetUserId() string { +func (x *FriendReceiveRsp) GetUserId() string { if x != nil { return x.UserId } @@ -1174,7 +1174,7 @@ func (x *Friend_Receive_Rsp) GetUserId() string { } //赠送 -type Friend_Give_Req struct { +type FriendGiveReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1182,8 +1182,8 @@ type Friend_Give_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } -func (x *Friend_Give_Req) Reset() { - *x = Friend_Give_Req{} +func (x *FriendGiveReq) Reset() { + *x = FriendGiveReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1191,13 +1191,13 @@ func (x *Friend_Give_Req) Reset() { } } -func (x *Friend_Give_Req) String() string { +func (x *FriendGiveReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Give_Req) ProtoMessage() {} +func (*FriendGiveReq) ProtoMessage() {} -func (x *Friend_Give_Req) ProtoReflect() protoreflect.Message { +func (x *FriendGiveReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1209,19 +1209,19 @@ func (x *Friend_Give_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Give_Req.ProtoReflect.Descriptor instead. -func (*Friend_Give_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendGiveReq.ProtoReflect.Descriptor instead. +func (*FriendGiveReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{23} } -func (x *Friend_Give_Req) GetFriendId() string { +func (x *FriendGiveReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_Give_Rsp struct { +type FriendGiveRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1230,8 +1230,8 @@ type Friend_Give_Rsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *Friend_Give_Rsp) Reset() { - *x = Friend_Give_Rsp{} +func (x *FriendGiveRsp) Reset() { + *x = FriendGiveRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1239,13 +1239,13 @@ func (x *Friend_Give_Rsp) Reset() { } } -func (x *Friend_Give_Rsp) String() string { +func (x *FriendGiveRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Give_Rsp) ProtoMessage() {} +func (*FriendGiveRsp) ProtoMessage() {} -func (x *Friend_Give_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendGiveRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1257,19 +1257,19 @@ func (x *Friend_Give_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Give_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Give_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendGiveRsp.ProtoReflect.Descriptor instead. +func (*FriendGiveRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{24} } -func (x *Friend_Give_Rsp) GetFriendId() string { +func (x *FriendGiveRsp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *Friend_Give_Rsp) GetUserId() string { +func (x *FriendGiveRsp) GetUserId() string { if x != nil { return x.UserId } @@ -1277,7 +1277,7 @@ func (x *Friend_Give_Rsp) GetUserId() string { } //好友数量 -type Friend_Total_Req struct { +type FriendTotalReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1285,8 +1285,8 @@ type Friend_Total_Req struct { FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } -func (x *Friend_Total_Req) Reset() { - *x = Friend_Total_Req{} +func (x *FriendTotalReq) Reset() { + *x = FriendTotalReq{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1294,13 +1294,13 @@ func (x *Friend_Total_Req) Reset() { } } -func (x *Friend_Total_Req) String() string { +func (x *FriendTotalReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Total_Req) ProtoMessage() {} +func (*FriendTotalReq) ProtoMessage() {} -func (x *Friend_Total_Req) ProtoReflect() protoreflect.Message { +func (x *FriendTotalReq) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1312,19 +1312,19 @@ func (x *Friend_Total_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Total_Req.ProtoReflect.Descriptor instead. -func (*Friend_Total_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendTotalReq.ProtoReflect.Descriptor instead. +func (*FriendTotalReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{25} } -func (x *Friend_Total_Req) GetFriendId() string { +func (x *FriendTotalReq) GetFriendId() string { if x != nil { return x.FriendId } return "" } -type Friend_Total_Rsp struct { +type FriendTotalRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1333,8 +1333,8 @@ type Friend_Total_Rsp struct { Total int32 `protobuf:"varint,2,opt,name=total,proto3" json:"total"` //好友数量 } -func (x *Friend_Total_Rsp) Reset() { - *x = Friend_Total_Rsp{} +func (x *FriendTotalRsp) Reset() { + *x = FriendTotalRsp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1342,13 +1342,13 @@ func (x *Friend_Total_Rsp) Reset() { } } -func (x *Friend_Total_Rsp) String() string { +func (x *FriendTotalRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Friend_Total_Rsp) ProtoMessage() {} +func (*FriendTotalRsp) ProtoMessage() {} -func (x *Friend_Total_Rsp) ProtoReflect() protoreflect.Message { +func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1360,19 +1360,19 @@ func (x *Friend_Total_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Friend_Total_Rsp.ProtoReflect.Descriptor instead. -func (*Friend_Total_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendTotalRsp.ProtoReflect.Descriptor instead. +func (*FriendTotalRsp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{26} } -func (x *Friend_Total_Rsp) GetFriendId() string { +func (x *FriendTotalRsp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *Friend_Total_Rsp) GetTotal() int32 { +func (x *FriendTotalRsp) GetTotal() int32 { if x != nil { return x.Total } @@ -1396,93 +1396,90 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, - 0x54, 0x69, 0x6d, 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x4c, - 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x5f, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, - 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x10, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, - 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x10, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x52, 0x73, 0x70, 0x12, - 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, - 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, - 0x64, 0x22, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x6c, 0x5f, - 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x5f, 0x41, 0x67, 0x72, 0x65, 0x65, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, - 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x67, 0x72, 0x65, 0x65, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, + 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, + 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, + 0x70, 0x70, 0x6c, 0x79, 0x52, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x0e, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, + 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, - 0x31, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, - 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, - 0x64, 0x73, 0x22, 0x25, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x66, - 0x75, 0x73, 0x65, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x16, 0x0a, 0x14, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, - 0x71, 0x22, 0x37, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, - 0x79, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, - 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x52, 0x65, 0x71, 0x12, - 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a, 0x11, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x52, 0x73, 0x70, - 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, - 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x22, 0x3d, 0x0a, - 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, + 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, + 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, + 0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, + 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, + 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x12, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, + 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, + 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, + 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, + 0x65, 0x22, 0x36, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, + 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, + 0x3b, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, - 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x31, 0x0a, 0x13, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x5f, - 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, - 0x49, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, - 0x64, 0x64, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x5f, 0x52, 0x65, + 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x49, 0x0a, - 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, - 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a, + 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, + 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, + 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, + 0x22, 0x46, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a, - 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x5f, 0x52, 0x73, 0x70, - 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, - 0x69, 0x76, 0x65, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, 0x69, - 0x76, 0x65, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, + 0x69, 0x76, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a, - 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x10, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, - 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1499,39 +1496,39 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte { var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_friend_friend_msg_proto_goTypes = []interface{}{ - (*FriendBase)(nil), // 0: FriendBase - (*Friend_List_Req)(nil), // 1: Friend_List_Req - (*Friend_List_Rsp)(nil), // 2: Friend_List_Rsp - (*Friend_Apply_Req)(nil), // 3: Friend_Apply_Req - (*Friend_Apply_Rsp)(nil), // 4: Friend_Apply_Rsp - (*Friend_Del_Req)(nil), // 5: Friend_Del_Req - (*Friend_Del_Rsp)(nil), // 6: Friend_Del_Rsp - (*Friend_Agree_Req)(nil), // 7: Friend_Agree_Req - (*Friend_Agree_Rsp)(nil), // 8: Friend_Agree_Rsp - (*Friend_Refuse_Req)(nil), // 9: Friend_Refuse_Req - (*Friend_Refuse_Rsp)(nil), // 10: Friend_Refuse_Rsp - (*Friend_ApplyList_Req)(nil), // 11: Friend_ApplyList_Req - (*Friend_ApplyList_Rsp)(nil), // 12: Friend_ApplyList_Rsp - (*Friend_Search_Req)(nil), // 13: Friend_Search_Req - (*Friend_Search_Rsp)(nil), // 14: Friend_Search_Rsp - (*Friend_BlackList_Req)(nil), // 15: Friend_BlackList_Req - (*Friend_BlackList_Rsp)(nil), // 16: Friend_BlackList_Rsp - (*Friend_BlackAdd_Req)(nil), // 17: Friend_BlackAdd_Req - (*Friend_BlackAdd_Rsp)(nil), // 18: Friend_BlackAdd_Rsp - (*Friend_DelBlack_Req)(nil), // 19: Friend_DelBlack_Req - (*Friend_DelBlack_Rsp)(nil), // 20: Friend_DelBlack_Rsp - (*Friend_Receive_Req)(nil), // 21: Friend_Receive_Req - (*Friend_Receive_Rsp)(nil), // 22: Friend_Receive_Rsp - (*Friend_Give_Req)(nil), // 23: Friend_Give_Req - (*Friend_Give_Rsp)(nil), // 24: Friend_Give_Rsp - (*Friend_Total_Req)(nil), // 25: Friend_Total_Req - (*Friend_Total_Rsp)(nil), // 26: Friend_Total_Rsp + (*FriendBase)(nil), // 0: FriendBase + (*FriendListReq)(nil), // 1: FriendListReq + (*FriendListRsp)(nil), // 2: FriendListRsp + (*FriendApplyReq)(nil), // 3: FriendApplyReq + (*FriendApplyRsp)(nil), // 4: FriendApplyRsp + (*FriendDelReq)(nil), // 5: FriendDelReq + (*FriendDelRsp)(nil), // 6: FriendDelRsp + (*FriendAgreeReq)(nil), // 7: FriendAgreeReq + (*FriendAgreeRsp)(nil), // 8: FriendAgreeRsp + (*FriendRefuseReq)(nil), // 9: FriendRefuseReq + (*FriendRefuseRsp)(nil), // 10: FriendRefuseRsp + (*FriendApplyListReq)(nil), // 11: FriendApplyListReq + (*FriendApplyListRsp)(nil), // 12: FriendApplyListRsp + (*FriendSearchReq)(nil), // 13: FriendSearchReq + (*FriendSearchRsp)(nil), // 14: FriendSearchRsp + (*FriendBlackListReq)(nil), // 15: FriendBlackListReq + (*FriendBlackListRsp)(nil), // 16: FriendBlackListRsp + (*FriendBlackAddReq)(nil), // 17: FriendBlackAddReq + (*FriendBlackAddRsp)(nil), // 18: FriendBlackAddRsp + (*FriendDelBlackReq)(nil), // 19: FriendDelBlackReq + (*FriendDelBlackRsp)(nil), // 20: FriendDelBlackRsp + (*FriendReceiveReq)(nil), // 21: FriendReceiveReq + (*FriendReceiveRsp)(nil), // 22: FriendReceiveRsp + (*FriendGiveReq)(nil), // 23: FriendGiveReq + (*FriendGiveRsp)(nil), // 24: FriendGiveRsp + (*FriendTotalReq)(nil), // 25: FriendTotalReq + (*FriendTotalRsp)(nil), // 26: FriendTotalRsp } var file_friend_friend_msg_proto_depIdxs = []int32{ - 0, // 0: Friend_List_Rsp.list:type_name -> FriendBase - 0, // 1: Friend_ApplyList_Rsp.list:type_name -> FriendBase - 0, // 2: Friend_Search_Rsp.friend:type_name -> FriendBase - 0, // 3: Friend_BlackList_Rsp.friends:type_name -> FriendBase + 0, // 0: FriendListRsp.list:type_name -> FriendBase + 0, // 1: FriendApplyListRsp.list:type_name -> FriendBase + 0, // 2: FriendSearchRsp.friend:type_name -> FriendBase + 0, // 3: FriendBlackListRsp.friends:type_name -> FriendBase 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 @@ -1558,7 +1555,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_List_Req); i { + switch v := v.(*FriendListReq); i { case 0: return &v.state case 1: @@ -1570,7 +1567,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_List_Rsp); i { + switch v := v.(*FriendListRsp); i { case 0: return &v.state case 1: @@ -1582,7 +1579,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Apply_Req); i { + switch v := v.(*FriendApplyReq); i { case 0: return &v.state case 1: @@ -1594,7 +1591,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Apply_Rsp); i { + switch v := v.(*FriendApplyRsp); i { case 0: return &v.state case 1: @@ -1606,7 +1603,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Del_Req); i { + switch v := v.(*FriendDelReq); i { case 0: return &v.state case 1: @@ -1618,7 +1615,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Del_Rsp); i { + switch v := v.(*FriendDelRsp); i { case 0: return &v.state case 1: @@ -1630,7 +1627,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Agree_Req); i { + switch v := v.(*FriendAgreeReq); i { case 0: return &v.state case 1: @@ -1642,7 +1639,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Agree_Rsp); i { + switch v := v.(*FriendAgreeRsp); i { case 0: return &v.state case 1: @@ -1654,7 +1651,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Refuse_Req); i { + switch v := v.(*FriendRefuseReq); i { case 0: return &v.state case 1: @@ -1666,7 +1663,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Refuse_Rsp); i { + switch v := v.(*FriendRefuseRsp); i { case 0: return &v.state case 1: @@ -1678,7 +1675,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_ApplyList_Req); i { + switch v := v.(*FriendApplyListReq); i { case 0: return &v.state case 1: @@ -1690,7 +1687,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_ApplyList_Rsp); i { + switch v := v.(*FriendApplyListRsp); i { case 0: return &v.state case 1: @@ -1702,7 +1699,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Search_Req); i { + switch v := v.(*FriendSearchReq); i { case 0: return &v.state case 1: @@ -1714,7 +1711,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Search_Rsp); i { + switch v := v.(*FriendSearchRsp); i { case 0: return &v.state case 1: @@ -1726,7 +1723,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_BlackList_Req); i { + switch v := v.(*FriendBlackListReq); i { case 0: return &v.state case 1: @@ -1738,7 +1735,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_BlackList_Rsp); i { + switch v := v.(*FriendBlackListRsp); i { case 0: return &v.state case 1: @@ -1750,7 +1747,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_BlackAdd_Req); i { + switch v := v.(*FriendBlackAddReq); i { case 0: return &v.state case 1: @@ -1762,7 +1759,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_BlackAdd_Rsp); i { + switch v := v.(*FriendBlackAddRsp); i { case 0: return &v.state case 1: @@ -1774,7 +1771,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_DelBlack_Req); i { + switch v := v.(*FriendDelBlackReq); i { case 0: return &v.state case 1: @@ -1786,7 +1783,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_DelBlack_Rsp); i { + switch v := v.(*FriendDelBlackRsp); i { case 0: return &v.state case 1: @@ -1798,7 +1795,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Receive_Req); i { + switch v := v.(*FriendReceiveReq); i { case 0: return &v.state case 1: @@ -1810,7 +1807,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Receive_Rsp); i { + switch v := v.(*FriendReceiveRsp); i { case 0: return &v.state case 1: @@ -1822,7 +1819,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Give_Req); i { + switch v := v.(*FriendGiveReq); i { case 0: return &v.state case 1: @@ -1834,7 +1831,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Give_Rsp); i { + switch v := v.(*FriendGiveRsp); i { case 0: return &v.state case 1: @@ -1846,7 +1843,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Total_Req); i { + switch v := v.(*FriendTotalReq); i { case 0: return &v.state case 1: @@ -1858,7 +1855,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Friend_Total_Rsp); i { + switch v := v.(*FriendTotalRsp); i { case 0: return &v.state case 1: diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 82e092408..7a52ec9e1 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -430,7 +430,8 @@ type Hero_StrengthenUpStar_Req struct { unknownFields protoimpl.UnknownFields HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - Items []*CostCardData `protobuf:"bytes,2,rep,name=items,proto3" json:"items"` // 消耗卡牌对象ID + Hero []*CostCardData `protobuf:"bytes,2,rep,name=hero,proto3" json:"hero"` // 消耗卡牌对象ID + HeroRace []*CostCardData `protobuf:"bytes,3,rep,name=heroRace,proto3" json:"heroRace"` // 消耗种族卡牌对象ID } func (x *Hero_StrengthenUpStar_Req) Reset() { @@ -472,9 +473,16 @@ func (x *Hero_StrengthenUpStar_Req) GetHeroObjID() string { return "" } -func (x *Hero_StrengthenUpStar_Req) GetItems() []*CostCardData { +func (x *Hero_StrengthenUpStar_Req) GetHero() []*CostCardData { if x != nil { - return x.Items + return x.Hero + } + return nil +} + +func (x *Hero_StrengthenUpStar_Req) GetHeroRace() []*CostCardData { + if x != nil { + return x.HeroRace } return nil } @@ -1111,74 +1119,77 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x61, 0x0a, 0x19, 0x48, 0x65, 0x72, - 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, - 0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, - 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, - 0x62, 0x6a, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, + 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8d, 0x01, 0x0a, 0x19, 0x48, 0x65, + 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, + 0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, - 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x41, 0x0a, 0x1a, - 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, - 0x70, 0x53, 0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, - 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, - 0x82, 0x01, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, - 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, - 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, - 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, - 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, - 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, - 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65, - 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, + 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2c, 0x0a, 0x08, 0x68, + 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, + 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x41, 0x0a, 0x1a, 0x48, 0x65, 0x72, + 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, + 0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, + 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x82, 0x01, 0x0a, + 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6b, 0x69, + 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, + 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, + 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a, - 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36, - 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, - 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, - 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72, - 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, - 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, - 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, - 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, - 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, - 0x70, 0x65, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, - 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, - 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, + 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, - 0x49, 0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, - 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, - 0x74, 0x6d, 0x65, 0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, - 0x78, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, - 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, - 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, + 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x5f, + 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, + 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, + 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a, 0x0a, 0x75, 0x70, + 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, + 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36, 0x0a, 0x16, 0x48, + 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, + 0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, + 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, + 0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, + 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, + 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72, 0x0a, 0x1a, 0x48, + 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, + 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, + 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, + 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, + 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, + 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, + 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, + 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x74, + 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, 0x65, + 0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, 0x69, 0x6e, + 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, + 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1221,21 +1232,22 @@ var file_hero_hero_msg_proto_depIdxs = []int32{ 20, // 0: pb.Hero_Info_Rsp.base:type_name -> pb.DB_HeroData 20, // 1: pb.Hero_List_Rsp.list:type_name -> pb.DB_HeroData 20, // 2: pb.Hero_StrengthenUplv_Resp.hero:type_name -> pb.DB_HeroData - 7, // 3: pb.Hero_StrengthenUpStar_Req.items:type_name -> pb.CostCardData - 20, // 4: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData - 7, // 5: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData - 20, // 6: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData - 20, // 7: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData - 20, // 8: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData - 20, // 9: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData - 20, // 10: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData - 4, // 11: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData - 20, // 12: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 7, // 3: pb.Hero_StrengthenUpStar_Req.hero:type_name -> pb.CostCardData + 7, // 4: pb.Hero_StrengthenUpStar_Req.heroRace:type_name -> pb.CostCardData + 20, // 5: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData + 7, // 6: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData + 20, // 7: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData + 20, // 8: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData + 20, // 9: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData + 20, // 10: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData + 20, // 11: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData + 4, // 12: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData + 20, // 13: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } diff --git a/pb/proto/friend/friend_db.proto b/pb/proto/friend/friend_db.proto index f09779d6a..e4944d2c2 100644 --- a/pb/proto/friend/friend_db.proto +++ b/pb/proto/friend/friend_db.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option go_package = ".;pb"; -message DB_FriendData { +message DBFriend { string uId = 1; //@go_tags(`bson:"uId"`) 用户ID repeated string friendIds = 2; //@go_tags(`bson:"friendIds"`) 好友ID repeated string applyIds = 3; //@go_tags(`bson:"applyIds"`) 申请用户ID diff --git a/pb/proto/friend/friend_msg.proto b/pb/proto/friend/friend_msg.proto index 4498a9984..5b25eacdb 100644 --- a/pb/proto/friend/friend_msg.proto +++ b/pb/proto/friend/friend_msg.proto @@ -12,97 +12,97 @@ message FriendBase { } //好友列表 -message Friend_List_Req {} +message FriendListReq {} -message Friend_List_Rsp { repeated FriendBase list = 1; } +message FriendListRsp { repeated FriendBase list = 1; } //申请好友 -message Friend_Apply_Req { +message FriendApplyReq { string friendId = 1; //好友ID } -message Friend_Apply_Rsp { +message FriendApplyRsp { string userId = 1; //用户ID string friendId = 2; //好友ID } //删除好友 -message Friend_Del_Req { +message FriendDelReq { string friendId = 1; //好友ID } -message Friend_Del_Rsp { +message FriendDelRsp { string friendId = 1; //好友ID string userId = 2; //用户ID } //同意 -message Friend_Agree_Req { +message FriendAgreeReq { repeated string friendIds = 1; //被同意的用户 } -message Friend_Agree_Rsp { +message FriendAgreeRsp { int32 Num = 1; //操作的数量 } //拒绝 -message Friend_Refuse_Req { +message FriendRefuseReq { repeated string friendIds = 1; //被拒绝的用户 } -message Friend_Refuse_Rsp { +message FriendRefuseRsp { int32 Num = 1; //操作的数量 } //好友申请列表 -message Friend_ApplyList_Req {} -message Friend_ApplyList_Rsp { repeated FriendBase list = 1; } +message FriendApplyListReq {} +message FriendApplyListRsp { repeated FriendBase list = 1; } //好友搜索 -message Friend_Search_Req { +message FriendSearchReq { string nickName = 1; //好友昵称 } -message Friend_Search_Rsp { FriendBase friend = 1; } +message FriendSearchRsp { FriendBase friend = 1; } //黑名单 -message Friend_BlackList_Req {} +message FriendBlackListReq {} -message Friend_BlackList_Rsp { repeated FriendBase friends = 1; } +message FriendBlackListRsp { repeated FriendBase friends = 1; } //添加黑名单 -message Friend_BlackAdd_Req { string friendId = 1; } +message FriendBlackAddReq { string friendId = 1; } -message Friend_BlackAdd_Rsp { +message FriendBlackAddRsp { string friendId = 1; string userId = 2; } //删除黑名单 -message Friend_DelBlack_Req { string friendId = 1; } +message FriendDelBlackReq { string friendId = 1; } -message Friend_DelBlack_Rsp { +message FriendDelBlackRsp { string friendId = 1; string userId = 2; } //接收 -message Friend_Receive_Req { string friendId = 1; } +message FriendReceiveReq { string friendId = 1; } -message Friend_Receive_Rsp { +message FriendReceiveRsp { string friendId = 1; string userId = 2; } //赠送 -message Friend_Give_Req { string friendId = 1; } +message FriendGiveReq { string friendId = 1; } -message Friend_Give_Rsp { +message FriendGiveRsp { string friendId = 1; string userId = 2; } //好友数量 -message Friend_Total_Req { string friendId = 1; } +message FriendTotalReq { string friendId = 1; } -message Friend_Total_Rsp { +message FriendTotalRsp { string friendId = 1; int32 total = 2; //好友数量 } \ No newline at end of file From 9e986f40f31840875ddd102f7c9106930daf5f69 Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 28 Jun 2022 18:04:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?proto=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/friend.go | 18 +- cmd/robot/hero.go | 10 +- cmd/robot/login.go | 2 +- cmd/robot/notify.go | 4 +- cmd/robot/pack.go | 6 +- cmd/robot/user.go | 2 +- comm/const.go | 34 +- comm/imodule.go | 6 +- modules/dbservice/db_comp.go | 4 +- modules/dbservice/module.go | 2 +- modules/equipment/api_equip.go | 6 +- modules/equipment/api_upgrade.go | 2 +- modules/equipment/module.go | 4 +- modules/forum/module.go | 2 +- modules/friend/module.go | 2 +- modules/game/module.go | 2 +- modules/gateway/agent.go | 8 +- modules/gateway/module.go | 2 +- modules/hero/api.go | 4 +- modules/hero/api_heroStarUp.go | 6 +- modules/hero/api_heroStrengthen.go | 6 +- modules/hero/api_info.go | 8 +- modules/hero/api_list.go | 6 +- modules/hero/model_hero.go | 16 +- modules/hero/module.go | 10 +- modules/items/module.go | 2 +- modules/mail/api.go | 2 +- modules/mail/module.go | 2 +- modules/modulebase.go | 6 +- modules/user/api.go | 2 +- modules/user/api_login.go | 2 +- modules/user/module.go | 4 +- modules/web/module.go | 2 +- pb/hero_db.pb.go | 189 ++++---- pb/hero_msg.pb.go | 663 ++++++++++++++--------------- pb/proto/hero/hero_db.proto | 13 +- pb/proto/hero/hero_msg.proto | 52 +-- services/comp_gateroute.go | 2 +- 38 files changed, 551 insertions(+), 562 deletions(-) diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go index f55119e8b..b8ebc92ac 100644 --- a/cmd/robot/friend.go +++ b/cmd/robot/friend.go @@ -11,20 +11,20 @@ var ( friendBuilders = []*builder{ { //list - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeList, req: &pb.FriendListReq{}, rsp: &pb.FriendListRsp{}, enabled: true, }, { //blacklist - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeBlacklist, req: &pb.FriendBlackListReq{}, rsp: &pb.FriendBlackListRsp{}, }, { //search - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeSearch, req: &pb.FriendSearchReq{ NickName: "", //设置测试参数 @@ -32,32 +32,32 @@ var ( rsp: &pb.FriendSearchRsp{}, }, { //apply - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeApply, req: &pb.FriendApplyReq{}, rsp: &pb.FriendApplyRsp{}, enabled: true, }, { //applylist - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeApplyList, req: &pb.FriendApplyListReq{}, rsp: &pb.FriendApplyListRsp{}, }, { //agree - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeAgree, req: &pb.FriendAgreeReq{}, rsp: &pb.FriendAgreeRsp{}, }, { //refuse - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeRefuse, req: &pb.FriendAgreeReq{}, rsp: &pb.FriendAgreeRsp{}, }, { //addblack - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeAddBlack, req: &pb.FriendBlackAddReq{ FriendId: "", @@ -65,7 +65,7 @@ var ( rsp: &pb.FriendBlackAddRsp{}, }, { //delblack - mainType: string(comm.SM_FriendModule), + mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeDelBlack, req: &pb.FriendDelBlackReq{}, rsp: &pb.FriendDelBlackRsp{}, diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 4d21147c0..c4983a19e 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -10,13 +10,15 @@ var ( //hero heroBuilders = []*builder{ { - mainType: string(comm.SM_HeroModule), + mainType: string(comm.ModuleHero), subType: hero.HeroSubTypeList, - req: &pb.Hero_List_Req{}, - rsp: &pb.Hero_List_Rsp{}, + req: &pb.HeroListReq{}, + rsp: &pb.HeroListRsp{}, enabled: true, }, { - mainType: string(comm.SM_HeroModule), + mainType: string(comm.ModuleHero), + subType: hero.HeroSubTypeList, + req: &pb.HeroInfoReq{}, }, } ) diff --git a/cmd/robot/login.go b/cmd/robot/login.go index cb9ec6c64..11f0db9ab 100644 --- a/cmd/robot/login.go +++ b/cmd/robot/login.go @@ -37,7 +37,7 @@ func (r *Robot) AccountLogin() { log.Printf("区服:[%d] 账号:[%s] login...", r.opts.ServerId, r.opts.Account) builders := []*builder{ { - mainType: string(comm.SM_UserModule), + mainType: string(comm.ModuleUser), subType: user.UserSubTypeLogin, req: &pb.UserLoginReq{ Account: r.opts.Account, diff --git a/cmd/robot/notify.go b/cmd/robot/notify.go index 90558e6cc..89847d73a 100644 --- a/cmd/robot/notify.go +++ b/cmd/robot/notify.go @@ -8,8 +8,8 @@ import ( var notify_builders = []*builder{ { //create - mainType: comm.MainType_Notify, - subType: comm.SubType_ErrorNotify, + mainType: comm.MainTypeNotify, + subType: comm.SubTypeErrorNotify, rsp: &pb.ErrorNotify{}, enabled: true, }, diff --git a/cmd/robot/pack.go b/cmd/robot/pack.go index fc477e08a..e5d0ef588 100644 --- a/cmd/robot/pack.go +++ b/cmd/robot/pack.go @@ -9,11 +9,11 @@ import ( var pack_builders = []*builder{ { //create - mainType: string(comm.SM_PackModule), + mainType: string(comm.ModulePack), subType: "queryuserpackreq", // req: &pb.Pack_Getlist_Req{IType: 1}, - rsp: &pb.UserCreateRsp{}, - enabled: true, + rsp: &pb.UserCreateRsp{}, + enabled: true, }, } diff --git a/cmd/robot/user.go b/cmd/robot/user.go index eb3bd3165..749b220f9 100644 --- a/cmd/robot/user.go +++ b/cmd/robot/user.go @@ -10,7 +10,7 @@ import ( var user_builders = []*builder{ { //create - mainType: string(comm.SM_UserModule), + mainType: string(comm.ModuleUser), subType: user.UserSubTypeCreate, req: &pb.UserCreateReq{ //设置请求参数 NickName: "乐谷6281", diff --git a/comm/const.go b/comm/const.go index aa04c2736..09364f8ce 100644 --- a/comm/const.go +++ b/comm/const.go @@ -22,23 +22,23 @@ const ( //ERR const ( - MainType_Notify = "notify" //通知 - SubType_ErrorNotify = "errornotify" //错误通知 + MainTypeNotify = "notify" //通知 + SubTypeErrorNotify = "errornotify" //错误通知 ) //模块名定义处 const ( - SM_GateModule core.M_Modules = "gateway" //gate模块 网关服务模块 - SM_WebModule core.M_Modules = "web" //web模块 - SM_UserModule core.M_Modules = "user" //用户模块 - SM_PackModule core.M_Modules = "pack" //背包模块 - SM_MailModule core.M_Modules = "mail" //邮件模块 - SM_FriendModule core.M_Modules = "friend" //好友模块 - SM_LogModelModule core.M_Modules = "model" //日志模块 - SM_EquipmentModule core.M_Modules = "equipment" //装备模块 - SM_HeroModule core.M_Modules = "hero" //英雄模块 - SM_ForumModule core.M_Modules = "forum" //论坛模块 - SM_ItemsModule core.M_Modules = "item" + ModuleGate core.M_Modules = "gateway" //gate模块 网关服务模块 + ModuleWeb core.M_Modules = "web" //web模块 + ModuleUser core.M_Modules = "user" //用户模块 + ModulePack core.M_Modules = "pack" //背包模块 + ModuleMail core.M_Modules = "mail" //邮件模块 + ModuleFriend core.M_Modules = "friend" //好友模块 + ModuleLogModel core.M_Modules = "model" //日志模块 + ModuleEquipment core.M_Modules = "equipment" //装备模块 + ModuleHero core.M_Modules = "hero" //英雄模块 + ModuleForum core.M_Modules = "forum" //论坛模块 + ModuleItems core.M_Modules = "item" ) //RPC服务接口定义处 @@ -55,13 +55,13 @@ const ( //Rpc //事件类型定义处 const ( - Event_UserLogin core.Event_Key = "Event_UserLogin" //登录事件 - Event_CreateUser core.Event_Key = "Event_CreateUser" //创建角色事件 - Event_UserOffline core.Event_Key = "Event_UserOffline" //用户离线事件 + EventUserLogin core.Event_Key = "Event_UserLogin" //登录事件 + EventCreateUser core.Event_Key = "Event_CreateUser" //创建角色事件 + EventUserOffline core.Event_Key = "Event_UserOffline" //用户离线事件 ) const ( - DBService_Status string = "DBService_status" + DBServiceStatus string = "DBService_status" ) const ( diff --git a/comm/imodule.go b/comm/imodule.go index 61e725d61..82a11fbb4 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -42,11 +42,11 @@ type ( // 获取英雄 // heroId 英雄ID - GetHero(uid, heroId string) (*pb.DB_HeroData, pb.ErrorCode) + GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode) // 佩戴装备 - UpdateEquipment(hero *pb.DB_HeroData, equip []*pb.DB_Equipment) (code pb.ErrorCode) + UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) //获取玩家英雄列表 - GetHeroList(uid string) []*pb.DB_HeroData + GetHeroList(uid string) []*pb.DBHero } //玩家 diff --git a/modules/dbservice/db_comp.go b/modules/dbservice/db_comp.go index 9da684309..2b8dfca63 100644 --- a/modules/dbservice/db_comp.go +++ b/modules/dbservice/db_comp.go @@ -30,7 +30,7 @@ func (this *DB_Comp) Start() (err error) { err = this.MCompModel.Start() model_count := this.Model_TotalCount() if model_count > 0 { //1000 - this.Redis.Set(comm.DBService_Status, true, -1) + this.Redis.Set(comm.DBServiceStatus, true, -1) this.isInit = false } else { this.isInit = true @@ -48,7 +48,7 @@ func (this *DB_Comp) run() { this.Model_UpdateDBByLog("") } if !this.isInit && this.Model_TotalCount() <= 0 { - this.Redis.Delete(comm.DBService_Status) + this.Redis.Delete(comm.DBServiceStatus) } } } diff --git a/modules/dbservice/module.go b/modules/dbservice/module.go index 14ee46e59..6e619d1f5 100644 --- a/modules/dbservice/module.go +++ b/modules/dbservice/module.go @@ -23,7 +23,7 @@ func (this *DBService) Init(service core.IService, module core.IModule, options } func (this *DBService) GetType() core.M_Modules { - return comm.SM_LogModelModule + return comm.ModuleLogModel } func (this *DBService) OnInstallComp() { diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 633b82523..7173d36d0 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -14,7 +14,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.Equipment_Equ errorCode pb.ErrorCode confs []*cfg.Game_equipData equipments []*pb.DB_Equipment - hero *pb.DB_HeroData + hero *pb.DBHero ) confs = make([]*cfg.Game_equipData, len(req.EquipmentId)) equipments = make([]*pb.DB_Equipment, len(req.EquipmentId)) @@ -53,13 +53,13 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ equipment *pb.DB_Equipment equipments []*pb.DB_Equipment updatequipment []*pb.DB_Equipment - hero *pb.DB_HeroData + hero *pb.DBHero ) confs = agrs["conf"].([]*cfg.Game_equipData) equipments = agrs["equipment"].([]*pb.DB_Equipment) updatequipment = make([]*pb.DB_Equipment, 0) - hero = agrs["hero"].(*pb.DB_HeroData) + hero = agrs["hero"].(*pb.DBHero) for i, v := range hero.EquipID { if v != "" { diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 8eb8c37c0..63c2d1ff0 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -55,7 +55,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac conf *cfg.Game_equipData intensify *cfg.Game_equipIntensifyData equipment *pb.DB_Equipment - hero *pb.DB_HeroData + hero *pb.DBHero equipments []*pb.DB_Equipment issucc bool ) diff --git a/modules/equipment/module.go b/modules/equipment/module.go index d17fed2cb..739c5f282 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -31,7 +31,7 @@ type Equipment struct { //模块名 func (this *Equipment) GetType() core.M_Modules { - return comm.SM_EquipmentModule + return comm.ModuleEquipment } //模块初始化接口 注册用户创建角色事件 @@ -45,7 +45,7 @@ func (this *Equipment) Init(service core.IService, module core.IModule, options func (this *Equipment) Start() (err error) { err = this.ModuleBase.Start() var module interface{} - if module, err = this.service.GetModule(comm.SM_HeroModule); err != nil { + if module, err = this.service.GetModule(comm.ModuleHero); err != nil { log.Errorf("Equipment Start err:%v", err) return } diff --git a/modules/forum/module.go b/modules/forum/module.go index 228ef1db7..36ecd2cf7 100644 --- a/modules/forum/module.go +++ b/modules/forum/module.go @@ -25,7 +25,7 @@ type Forum struct { //模块名 func (this *Forum) GetType() core.M_Modules { - return comm.SM_EquipmentModule + return comm.ModuleEquipment } //模块初始化接口 注册用户创建角色事件 diff --git a/modules/friend/module.go b/modules/friend/module.go index 7aebe6189..2e1dbdbcc 100644 --- a/modules/friend/module.go +++ b/modules/friend/module.go @@ -19,7 +19,7 @@ type Friend struct { } func (this *Friend) GetType() core.M_Modules { - return comm.SM_FriendModule + return comm.ModuleFriend } func (this *Friend) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { diff --git a/modules/game/module.go b/modules/game/module.go index 2544ff375..1daed23df 100644 --- a/modules/game/module.go +++ b/modules/game/module.go @@ -24,7 +24,7 @@ type Game struct { //模块名 func (this *Game) GetType() core.M_Modules { - return comm.SM_EquipmentModule + return comm.ModuleEquipment } //模块初始化接口 注册用户创建角色事件 diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go index cc47f0a47..4aadb1872 100644 --- a/modules/gateway/agent.go +++ b/modules/gateway/agent.go @@ -83,8 +83,8 @@ locp: } else { data, _ := anypb.New(&pb.ErrorNotify{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: pb.ErrorCode_SecKeyInvalid}) if err = this.WriteMsg(&pb.UserMessage{ - MainType: comm.MainType_Notify, - SubType: comm.SubType_ErrorNotify, + MainType: comm.MainTypeNotify, + SubType: comm.SubTypeErrorNotify, Data: data, }); err != nil { go this.Close() @@ -234,8 +234,8 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { if reply.Code != pb.ErrorCode_Success { data, _ := anypb.New(&pb.ErrorNotify{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: pb.ErrorCode(reply.Code.Number())}) err = this.WriteMsg(&pb.UserMessage{ - MainType: comm.MainType_Notify, - SubType: comm.SubType_ErrorNotify, + MainType: comm.MainTypeNotify, + SubType: comm.SubTypeErrorNotify, Data: data, }) return diff --git a/modules/gateway/module.go b/modules/gateway/module.go index 28805c891..64b645319 100644 --- a/modules/gateway/module.go +++ b/modules/gateway/module.go @@ -29,7 +29,7 @@ type Gateway struct { //模块名 func (this *Gateway) GetType() core.M_Modules { - return comm.SM_GateModule + return comm.ModuleGate } //模块自定义参数 diff --git a/modules/hero/api.go b/modules/hero/api.go index 6083321cb..dc44450cb 100644 --- a/modules/hero/api.go +++ b/modules/hero/api.go @@ -21,7 +21,7 @@ const ( //消息回复的头名称 //组件初始化接口 func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.MCompGate.Init(service, module, comp, options) + err = this.MCompGate.Init(service, module, comp, options) this.moduleHero = module.(*Hero) this.service = service return @@ -32,7 +32,7 @@ func (this *apiComp) Start() (err error) { var module core.IModule - if module, err = this.service.GetModule(comm.SM_UserModule); err != nil { + if module, err = this.service.GetModule(comm.ModuleUser); err != nil { return } this.user = module.(comm.IUser) diff --git a/modules/hero/api_heroStarUp.go b/modules/hero/api_heroStarUp.go index 52db12bbe..ac6582567 100644 --- a/modules/hero/api_heroStarUp.go +++ b/modules/hero/api_heroStarUp.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.Hero_StrengthenUpStar_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (result map[string]interface{}, code comm.ErrorCode) { if req.HeroObjID == "" { code.Code = pb.ErrorCode_ReqParameterError return @@ -17,11 +17,11 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He } /// 英雄升星 -func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string]interface{}, req *pb.Hero_StrengthenUpStar_Req) (code pb.ErrorCode) { +func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode) { defer func() { if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.Hero_StrengthenUpStar_Resp{}) + session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUpStarResp{}) } }() diff --git a/modules/hero/api_heroStrengthen.go b/modules/hero/api_heroStrengthen.go index 40d9afe32..e021f2c97 100644 --- a/modules/hero/api_heroStrengthen.go +++ b/modules/hero/api_heroStrengthen.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero_StrengthenUplv_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (result map[string]interface{}, code comm.ErrorCode) { if req.HeroObjID == "" { code.Code = pb.ErrorCode_ReqParameterError return @@ -101,7 +101,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero } /// 英雄升级 -func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]interface{}, req *pb.Hero_StrengthenUplv_Req) (code pb.ErrorCode) { +func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode) { var ( curLv int32 curExp int32 // 当前英雄的经验 @@ -111,7 +111,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]i ) defer func() { if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.Hero_StrengthenUplv_Resp{}) + session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{}) } }() costGold = agrs["costGold"].(int32) diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go index 5005dc24b..23cb4e8a5 100644 --- a/modules/hero/api_info.go +++ b/modules/hero/api_info.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.Hero_Info_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (result map[string]interface{}, code comm.ErrorCode) { result = map[string]interface{}{} hero := this.moduleHero.modelHero.getOneHero(session.GetUserId(), req.HeroId) if hero == nil { @@ -16,8 +16,8 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.Hero_Info_Req) return } -func (this *apiComp) Info(session comm.IUserSession, result map[string]interface{}, req *pb.Hero_Info_Req) (code pb.ErrorCode) { - rsp := &pb.Hero_Info_Rsp{} +func (this *apiComp) Info(session comm.IUserSession, result map[string]interface{}, req *pb.HeroInfoReq) (code pb.ErrorCode) { + rsp := &pb.HeroInfoRsp{} defer func() { err := session.SendMsg(string(this.moduleHero.GetType()), HeroSubTypeInfo, rsp) if err != nil { @@ -27,7 +27,7 @@ func (this *apiComp) Info(session comm.IUserSession, result map[string]interface }() if v, ok := result["hero"]; ok { - rsp.Base = v.(*pb.DB_HeroData) + rsp.Base = v.(*pb.DBHero) } return } diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go index a6cc3e0f9..67188aa93 100644 --- a/modules/hero/api_list.go +++ b/modules/hero/api_list.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.Hero_List_Req) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.HeroListReq) (result map[string]interface{}, code comm.ErrorCode) { return } -func (this *apiComp) List(session comm.IUserSession, result map[string]interface{}, req *pb.Hero_List_Req) (code pb.ErrorCode) { - rsp := &pb.Hero_List_Rsp{} +func (this *apiComp) List(session comm.IUserSession, result map[string]interface{}, req *pb.HeroListReq) (code pb.ErrorCode) { + rsp := &pb.HeroListRsp{} defer func() { err := session.SendMsg(string(this.moduleHero.GetType()), HeroSubTypeList, rsp) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index f76f7d1a0..718fc6446 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -26,14 +26,14 @@ func (this *ModelHero) Init(service core.IService, module core.IModule, comp cor } //初始化英雄 -func (this *ModelHero) initHero(uid string, heroCfgId int32) *pb.DB_HeroData { +func (this *ModelHero) initHero(uid string, heroCfgId int32) *pb.DBHero { heroCfg := this.moduleHero.configure.GetHero(heroCfgId) if heroCfg == nil { log.Errorf("%v hero not found from config %v", heroCfgId) return nil } objId := primitive.NewObjectID().Hex() - newHero := &pb.DB_HeroData{ + newHero := &pb.DBHero{ Id: objId, Uid: uid, HeroID: heroCfg.Hid, @@ -77,8 +77,8 @@ func (this *ModelHero) createMultiHero(uid string, heroCfgIds ...int32) error { } //获取一个英雄 -func (this *ModelHero) getOneHero(uid, heroId string) *pb.DB_HeroData { - hero := &pb.DB_HeroData{} +func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero { + hero := &pb.DBHero{} err := this.moduleHero.modelHero.GetListObj(uid, heroId, hero) if err != nil { return nil @@ -91,14 +91,14 @@ func (this *ModelHero) consumeOneHeroCard(uid, heroId string) error { return this.moduleHero.modelHero.DelListlds(uid, heroId) } -func (this *Hero) ModifyHero(heroId *pb.DB_HeroData) (*pb.DB_HeroData, pb.ErrorCode) { +func (this *Hero) ModifyHero(heroId *pb.DBHero) (*pb.DBHero, pb.ErrorCode) { return nil, pb.ErrorCode_HeroNoExist } //获取玩家的英雄列表 -func (this *ModelHero) getHeroList(uid string) ([]*pb.DB_HeroData, error) { - heroes := make([]*pb.DB_HeroData, 0) +func (this *ModelHero) getHeroList(uid string) ([]*pb.DBHero, error) { + heroes := make([]*pb.DBHero, 0) err := this.GetList(uid, &heroes) if err != nil { return nil, err @@ -120,7 +120,7 @@ func (this *ModelHero) setEquipment(uid, heroId string, equipIds []string) pb.Er //指定英雄升级 func (this *ModelHero) levelUp(uid string, heroId int32) error { - var heroes []*pb.DB_HeroData + var heroes []*pb.DBHero err := this.moduleHero.modelHero.GetList(uid, heroes) if err != nil { log.Errorf("levelUp err:%v", err) diff --git a/modules/hero/module.go b/modules/hero/module.go index d567963f1..7e3a09a86 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -22,7 +22,7 @@ type Hero struct { //模块名 func (this *Hero) GetType() core.M_Modules { - return comm.SM_HeroModule + return comm.ModuleHero } //模块初始化接口 注册用户创建角色事件 @@ -47,7 +47,7 @@ func (this *Hero) CreateHero(uid string, heroCfgId ...int32) error { //消耗英雄卡 func (this *Hero) ChangeCard(uId string, heroCfgId int32, count int32) (code pb.ErrorCode) { heroes := this.GetHeroList(uId) - var curList []*pb.DB_HeroData + var curList []*pb.DBHero for _, v := range heroes { if heroCfgId == v.HeroID { curList = append(curList, v) @@ -68,7 +68,7 @@ func (this *Hero) ChangeCard(uId string, heroCfgId int32, count int32) (code pb. } //获取英雄 -func (this *Hero) GetHero(uid, heroId string) (*pb.DB_HeroData, pb.ErrorCode) { +func (this *Hero) GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode) { hero := this.modelHero.getOneHero(uid, heroId) if hero == nil { return nil, pb.ErrorCode_HeroNoExist @@ -77,7 +77,7 @@ func (this *Hero) GetHero(uid, heroId string) (*pb.DB_HeroData, pb.ErrorCode) { } //佩戴装备 -func (this *Hero) UpdateEquipment(hero *pb.DB_HeroData, equip []*pb.DB_Equipment) (code pb.ErrorCode) { +func (this *Hero) UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) { equipIds := make([]string, 4) for _, v := range equip { equipIds = append(equipIds, v.Id) @@ -86,7 +86,7 @@ func (this *Hero) UpdateEquipment(hero *pb.DB_HeroData, equip []*pb.DB_Equipment } //英雄列表 -func (this *Hero) GetHeroList(uid string) []*pb.DB_HeroData { +func (this *Hero) GetHeroList(uid string) []*pb.DBHero { list, err := this.modelHero.getHeroList(uid) if err != nil { return nil diff --git a/modules/items/module.go b/modules/items/module.go index af4122aa2..7958944d2 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -28,7 +28,7 @@ type Items struct { //模块名称 func (this *Items) GetType() core.M_Modules { - return comm.SM_ItemsModule + return comm.ModuleItems } //模块初始化接口 注册用户创建角色事件 diff --git a/modules/mail/api.go b/modules/mail/api.go index 3b1e7540c..ee0aa90a1 100644 --- a/modules/mail/api.go +++ b/modules/mail/api.go @@ -34,7 +34,7 @@ func (this *apiComp) Start() (err error) { err = this.MCompGate.Start() var module core.IModule - if module, err = this.service.GetModule(comm.SM_ItemsModule); err != nil { + if module, err = this.service.GetModule(comm.ModuleItems); err != nil { return } this.items = module.(comm.IItems) diff --git a/modules/mail/module.go b/modules/mail/module.go index 39bc8e571..e825ed6b3 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -30,7 +30,7 @@ type Mail struct { } func (this *Mail) GetType() core.M_Modules { - return comm.SM_MailModule + return comm.ModuleMail } func (this *Mail) OnInstallComp() { diff --git a/modules/modulebase.go b/modules/modulebase.go index c05563aaf..15eb8d30a 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -89,15 +89,15 @@ func (this *ModuleBase) CheckConsumeRes(uid string, res []*cfg.Game_atn) (code p hero comm.IHero //英雄模块 // equipment comm.IEquipment //装备模块 ) - if module, err = this.service.GetModule(comm.SM_UserModule); err == nil { + if module, err = this.service.GetModule(comm.ModuleUser); err == nil { return } user = module.(comm.IUser) - if module, err = this.service.GetModule(comm.SM_ItemsModule); err == nil { + if module, err = this.service.GetModule(comm.ModuleItems); err == nil { return } items = module.(comm.IItems) - if module, err = this.service.GetModule(comm.SM_HeroModule); err == nil { + if module, err = this.service.GetModule(comm.ModuleHero); err == nil { return } hero = module.(comm.IHero) diff --git a/modules/user/api.go b/modules/user/api.go index 73622a297..324a00d36 100644 --- a/modules/user/api.go +++ b/modules/user/api.go @@ -33,7 +33,7 @@ func (this *apiComp) Start() (err error) { var module core.IModule //get module hero - if module, err = this.service.GetModule(comm.SM_HeroModule); err != nil { + if module, err = this.service.GetModule(comm.ModuleHero); err != nil { return } this.hero = module.(comm.IHero) diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 10359020c..04f04a81e 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -33,7 +33,7 @@ func (this *apiComp) Login(session comm.IUserSession, result map[string]interfac code = pb.ErrorCode_SystemError return } - event.TriggerEvent(comm.Event_UserLogin, user.Uid) + event.TriggerEvent(comm.EventUserLogin, user.Uid) } }() diff --git a/modules/user/module.go b/modules/user/module.go index 80e40a6ec..1933d7cb5 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -21,7 +21,7 @@ type User struct { } func (this *User) GetType() core.M_Modules { - return comm.SM_UserModule + return comm.ModuleUser } func (this *User) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { @@ -38,7 +38,7 @@ func (this *User) OnInstallComp() { } //获取英雄列表 -func (this *User) GetHeroList(uid string) []*pb.DB_HeroData { +func (this *User) GetHeroList(uid string) []*pb.DBHero { return nil } diff --git a/modules/web/module.go b/modules/web/module.go index 9bb697e00..6d7788448 100644 --- a/modules/web/module.go +++ b/modules/web/module.go @@ -27,7 +27,7 @@ type Web struct { //模块名 func (this *Web) GetType() core.M_Modules { - return comm.SM_WebModule + return comm.ModuleWeb } //模块自定义参数 diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 72b05d480..767cc2f59 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -75,7 +75,7 @@ func (x *SkillData) GetSkillLv() int32 { return 0 } -type DB_HeroData struct { +type DBHero struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -103,8 +103,8 @@ type DB_HeroData struct { Count int32 `protobuf:"varint,21,opt,name=count,proto3" json:"count"` // 数量 } -func (x *DB_HeroData) Reset() { - *x = DB_HeroData{} +func (x *DBHero) Reset() { + *x = DBHero{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -112,13 +112,13 @@ func (x *DB_HeroData) Reset() { } } -func (x *DB_HeroData) String() string { +func (x *DBHero) String() string { return protoimpl.X.MessageStringOf(x) } -func (*DB_HeroData) ProtoMessage() {} +func (*DBHero) ProtoMessage() {} -func (x *DB_HeroData) ProtoReflect() protoreflect.Message { +func (x *DBHero) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -130,152 +130,152 @@ func (x *DB_HeroData) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use DB_HeroData.ProtoReflect.Descriptor instead. -func (*DB_HeroData) Descriptor() ([]byte, []int) { +// Deprecated: Use DBHero.ProtoReflect.Descriptor instead. +func (*DBHero) Descriptor() ([]byte, []int) { return file_hero_hero_db_proto_rawDescGZIP(), []int{1} } -func (x *DB_HeroData) GetId() string { +func (x *DBHero) GetId() string { if x != nil { return x.Id } return "" } -func (x *DB_HeroData) GetUid() string { +func (x *DBHero) GetUid() string { if x != nil { return x.Uid } return "" } -func (x *DB_HeroData) GetHeroID() int32 { +func (x *DBHero) GetHeroID() int32 { if x != nil { return x.HeroID } return 0 } -func (x *DB_HeroData) GetStar() int32 { +func (x *DBHero) GetStar() int32 { if x != nil { return x.Star } return 0 } -func (x *DB_HeroData) GetLv() int32 { +func (x *DBHero) GetLv() int32 { if x != nil { return x.Lv } return 0 } -func (x *DB_HeroData) GetExp() int32 { +func (x *DBHero) GetExp() int32 { if x != nil { return x.Exp } return 0 } -func (x *DB_HeroData) GetJuexingLv() int32 { +func (x *DBHero) GetJuexingLv() int32 { if x != nil { return x.JuexingLv } return 0 } -func (x *DB_HeroData) GetCaptainSkill() int32 { +func (x *DBHero) GetCaptainSkill() int32 { if x != nil { return x.CaptainSkill } return 0 } -func (x *DB_HeroData) GetNormalSkill() []*SkillData { +func (x *DBHero) GetNormalSkill() []*SkillData { if x != nil { return x.NormalSkill } return nil } -func (x *DB_HeroData) GetProperty() map[int32]int32 { +func (x *DBHero) GetProperty() map[int32]int32 { if x != nil { return x.Property } return nil } -func (x *DB_HeroData) GetAddProperty() map[int32]int32 { +func (x *DBHero) GetAddProperty() map[int32]int32 { if x != nil { return x.AddProperty } return nil } -func (x *DB_HeroData) GetFormation() int32 { +func (x *DBHero) GetFormation() int32 { if x != nil { return x.Formation } return 0 } -func (x *DB_HeroData) GetCardType() int32 { +func (x *DBHero) GetCardType() int32 { if x != nil { return x.CardType } return 0 } -func (x *DB_HeroData) GetCurSkin() int32 { +func (x *DBHero) GetCurSkin() int32 { if x != nil { return x.CurSkin } return 0 } -func (x *DB_HeroData) GetSkins() []int32 { +func (x *DBHero) GetSkins() []int32 { if x != nil { return x.Skins } return nil } -func (x *DB_HeroData) GetBlock() bool { +func (x *DBHero) GetBlock() bool { if x != nil { return x.Block } return false } -func (x *DB_HeroData) GetEquipID() []string { +func (x *DBHero) GetEquipID() []string { if x != nil { return x.EquipID } return nil } -func (x *DB_HeroData) GetResonateNum() int32 { +func (x *DBHero) GetResonateNum() int32 { if x != nil { return x.ResonateNum } return 0 } -func (x *DB_HeroData) GetDistributionResonate() int32 { +func (x *DBHero) GetDistributionResonate() int32 { if x != nil { return x.DistributionResonate } return 0 } -func (x *DB_HeroData) GetEnergy() map[int32]int32 { +func (x *DBHero) GetEnergy() map[int32]int32 { if x != nil { return x.Energy } return nil } -func (x *DB_HeroData) GetCount() int32 { +func (x *DBHero) GetCount() int32 { if x != nil { return x.Count } @@ -290,62 +290,61 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xe2, 0x06, 0x0a, 0x0b, 0x44, 0x42, - 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 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, 0x16, 0x0a, 0x06, 0x68, - 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, - 0x6f, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x6a, 0x75, 0x65, - 0x78, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6a, 0x75, - 0x65, 0x78, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, - 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, - 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2f, 0x0a, 0x0b, 0x6e, - 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, - 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x2e, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x42, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x70, - 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x64, - 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, - 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x66, - 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, - 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, - 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, - 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, - 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x10, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x65, - 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x18, 0x11, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, - 0x75, 0x69, 0x70, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, - 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x73, 0x6f, - 0x6e, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x18, - 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x65, - 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x62, - 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x6e, 0x65, - 0x72, 0x67, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 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, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 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, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xce, 0x06, 0x0a, 0x06, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x12, 0x12, + 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, + 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, + 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x65, 0x78, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x6a, 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x4c, + 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6a, 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, + 0x4c, 0x76, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, + 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2f, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, + 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, + 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x34, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x3d, 0x0a, + 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0b, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x41, + 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09, + 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, + 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, + 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, + 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, + 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x05, 0x52, + 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, + 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, + 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x18, 0x11, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x65, + 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x6e, 0x61, + 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x73, + 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, + 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x0a, 0x06, + 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, + 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x1a, + 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x1a, + 0x39, 0x0a, 0x0b, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -362,17 +361,17 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte { var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_hero_hero_db_proto_goTypes = []interface{}{ - (*SkillData)(nil), // 0: pb.SkillData - (*DB_HeroData)(nil), // 1: pb.DB_HeroData - nil, // 2: pb.DB_HeroData.PropertyEntry - nil, // 3: pb.DB_HeroData.AddPropertyEntry - nil, // 4: pb.DB_HeroData.EnergyEntry + (*SkillData)(nil), // 0: pb.SkillData + (*DBHero)(nil), // 1: pb.DBHero + nil, // 2: pb.DBHero.PropertyEntry + nil, // 3: pb.DBHero.AddPropertyEntry + nil, // 4: pb.DBHero.EnergyEntry } var file_hero_hero_db_proto_depIdxs = []int32{ - 0, // 0: pb.DB_HeroData.normalSkill:type_name -> pb.SkillData - 2, // 1: pb.DB_HeroData.property:type_name -> pb.DB_HeroData.PropertyEntry - 3, // 2: pb.DB_HeroData.addProperty:type_name -> pb.DB_HeroData.AddPropertyEntry - 4, // 3: pb.DB_HeroData.energy:type_name -> pb.DB_HeroData.EnergyEntry + 0, // 0: pb.DBHero.normalSkill:type_name -> pb.SkillData + 2, // 1: pb.DBHero.property:type_name -> pb.DBHero.PropertyEntry + 3, // 2: pb.DBHero.addProperty:type_name -> pb.DBHero.AddPropertyEntry + 4, // 3: pb.DBHero.energy:type_name -> pb.DBHero.EnergyEntry 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 @@ -399,7 +398,7 @@ func file_hero_hero_db_proto_init() { } } file_hero_hero_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DB_HeroData); i { + switch v := v.(*DBHero); i { case 0: return &v.state case 1: diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 7a52ec9e1..0d136263e 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -21,7 +21,7 @@ const ( ) //英雄基础信息 -type Hero_Info_Req struct { +type HeroInfoReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -29,8 +29,8 @@ type Hero_Info_Req struct { HeroId string `protobuf:"bytes,1,opt,name=heroId,proto3" json:"heroId"` //英雄唯一ID } -func (x *Hero_Info_Req) Reset() { - *x = Hero_Info_Req{} +func (x *HeroInfoReq) Reset() { + *x = HeroInfoReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -38,13 +38,13 @@ func (x *Hero_Info_Req) Reset() { } } -func (x *Hero_Info_Req) String() string { +func (x *HeroInfoReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_Info_Req) ProtoMessage() {} +func (*HeroInfoReq) ProtoMessage() {} -func (x *Hero_Info_Req) ProtoReflect() protoreflect.Message { +func (x *HeroInfoReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -56,28 +56,28 @@ func (x *Hero_Info_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_Info_Req.ProtoReflect.Descriptor instead. -func (*Hero_Info_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroInfoReq.ProtoReflect.Descriptor instead. +func (*HeroInfoReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{0} } -func (x *Hero_Info_Req) GetHeroId() string { +func (x *HeroInfoReq) GetHeroId() string { if x != nil { return x.HeroId } return "" } -type Hero_Info_Rsp struct { +type HeroInfoRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Base *DB_HeroData `protobuf:"bytes,1,opt,name=base,proto3" json:"base"` + Base *DBHero `protobuf:"bytes,1,opt,name=base,proto3" json:"base"` } -func (x *Hero_Info_Rsp) Reset() { - *x = Hero_Info_Rsp{} +func (x *HeroInfoRsp) Reset() { + *x = HeroInfoRsp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -85,13 +85,13 @@ func (x *Hero_Info_Rsp) Reset() { } } -func (x *Hero_Info_Rsp) String() string { +func (x *HeroInfoRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_Info_Rsp) ProtoMessage() {} +func (*HeroInfoRsp) ProtoMessage() {} -func (x *Hero_Info_Rsp) ProtoReflect() protoreflect.Message { +func (x *HeroInfoRsp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -103,12 +103,12 @@ func (x *Hero_Info_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_Info_Rsp.ProtoReflect.Descriptor instead. -func (*Hero_Info_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroInfoRsp.ProtoReflect.Descriptor instead. +func (*HeroInfoRsp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{1} } -func (x *Hero_Info_Rsp) GetBase() *DB_HeroData { +func (x *HeroInfoRsp) GetBase() *DBHero { if x != nil { return x.Base } @@ -116,14 +116,14 @@ func (x *Hero_Info_Rsp) GetBase() *DB_HeroData { } //英雄列表 -type Hero_List_Req struct { +type HeroListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *Hero_List_Req) Reset() { - *x = Hero_List_Req{} +func (x *HeroListReq) Reset() { + *x = HeroListReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -131,13 +131,13 @@ func (x *Hero_List_Req) Reset() { } } -func (x *Hero_List_Req) String() string { +func (x *HeroListReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_List_Req) ProtoMessage() {} +func (*HeroListReq) ProtoMessage() {} -func (x *Hero_List_Req) ProtoReflect() protoreflect.Message { +func (x *HeroListReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -149,21 +149,21 @@ func (x *Hero_List_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_List_Req.ProtoReflect.Descriptor instead. -func (*Hero_List_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroListReq.ProtoReflect.Descriptor instead. +func (*HeroListReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{2} } -type Hero_List_Rsp struct { +type HeroListRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - List []*DB_HeroData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` + List []*DBHero `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } -func (x *Hero_List_Rsp) Reset() { - *x = Hero_List_Rsp{} +func (x *HeroListRsp) Reset() { + *x = HeroListRsp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -171,13 +171,13 @@ func (x *Hero_List_Rsp) Reset() { } } -func (x *Hero_List_Rsp) String() string { +func (x *HeroListRsp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_List_Rsp) ProtoMessage() {} +func (*HeroListRsp) ProtoMessage() {} -func (x *Hero_List_Rsp) ProtoReflect() protoreflect.Message { +func (x *HeroListRsp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -189,12 +189,12 @@ func (x *Hero_List_Rsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_List_Rsp.ProtoReflect.Descriptor instead. -func (*Hero_List_Rsp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroListRsp.ProtoReflect.Descriptor instead. +func (*HeroListRsp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{3} } -func (x *Hero_List_Rsp) GetList() []*DB_HeroData { +func (x *HeroListRsp) GetList() []*DBHero { if x != nil { return x.List } @@ -257,7 +257,7 @@ func (x *ItemData) GetAmount() int32 { } // 卡牌升级 -type Hero_StrengthenUplv_Req struct { +type HeroStrengthenUplvReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -267,8 +267,8 @@ type Hero_StrengthenUplv_Req struct { Amount int32 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount"` // 消耗经验卡数量} } -func (x *Hero_StrengthenUplv_Req) Reset() { - *x = Hero_StrengthenUplv_Req{} +func (x *HeroStrengthenUplvReq) Reset() { + *x = HeroStrengthenUplvReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -276,13 +276,13 @@ func (x *Hero_StrengthenUplv_Req) Reset() { } } -func (x *Hero_StrengthenUplv_Req) String() string { +func (x *HeroStrengthenUplvReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_StrengthenUplv_Req) ProtoMessage() {} +func (*HeroStrengthenUplvReq) ProtoMessage() {} -func (x *Hero_StrengthenUplv_Req) ProtoReflect() protoreflect.Message { +func (x *HeroStrengthenUplvReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -294,26 +294,26 @@ func (x *Hero_StrengthenUplv_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_StrengthenUplv_Req.ProtoReflect.Descriptor instead. -func (*Hero_StrengthenUplv_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroStrengthenUplvReq.ProtoReflect.Descriptor instead. +func (*HeroStrengthenUplvReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{5} } -func (x *Hero_StrengthenUplv_Req) GetHeroObjID() string { +func (x *HeroStrengthenUplvReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *Hero_StrengthenUplv_Req) GetExpCardID() string { +func (x *HeroStrengthenUplvReq) GetExpCardID() string { if x != nil { return x.ExpCardID } return "" } -func (x *Hero_StrengthenUplv_Req) GetAmount() int32 { +func (x *HeroStrengthenUplvReq) GetAmount() int32 { if x != nil { return x.Amount } @@ -321,16 +321,16 @@ func (x *Hero_StrengthenUplv_Req) GetAmount() int32 { } // 卡牌升级返回 -type Hero_StrengthenUplv_Resp struct { +type HeroStrengthenUplvResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 } -func (x *Hero_StrengthenUplv_Resp) Reset() { - *x = Hero_StrengthenUplv_Resp{} +func (x *HeroStrengthenUplvResp) Reset() { + *x = HeroStrengthenUplvResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -338,13 +338,13 @@ func (x *Hero_StrengthenUplv_Resp) Reset() { } } -func (x *Hero_StrengthenUplv_Resp) String() string { +func (x *HeroStrengthenUplvResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_StrengthenUplv_Resp) ProtoMessage() {} +func (*HeroStrengthenUplvResp) ProtoMessage() {} -func (x *Hero_StrengthenUplv_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroStrengthenUplvResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -356,12 +356,12 @@ func (x *Hero_StrengthenUplv_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_StrengthenUplv_Resp.ProtoReflect.Descriptor instead. -func (*Hero_StrengthenUplv_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroStrengthenUplvResp.ProtoReflect.Descriptor instead. +func (*HeroStrengthenUplvResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{6} } -func (x *Hero_StrengthenUplv_Resp) GetHero() *DB_HeroData { +func (x *HeroStrengthenUplvResp) GetHero() *DBHero { if x != nil { return x.Hero } @@ -424,7 +424,7 @@ func (x *CostCardData) GetAmount() int32 { } // 卡牌升星 -type Hero_StrengthenUpStar_Req struct { +type HeroStrengthenUpStarReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -434,8 +434,8 @@ type Hero_StrengthenUpStar_Req struct { HeroRace []*CostCardData `protobuf:"bytes,3,rep,name=heroRace,proto3" json:"heroRace"` // 消耗种族卡牌对象ID } -func (x *Hero_StrengthenUpStar_Req) Reset() { - *x = Hero_StrengthenUpStar_Req{} +func (x *HeroStrengthenUpStarReq) Reset() { + *x = HeroStrengthenUpStarReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -443,13 +443,13 @@ func (x *Hero_StrengthenUpStar_Req) Reset() { } } -func (x *Hero_StrengthenUpStar_Req) String() string { +func (x *HeroStrengthenUpStarReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_StrengthenUpStar_Req) ProtoMessage() {} +func (*HeroStrengthenUpStarReq) ProtoMessage() {} -func (x *Hero_StrengthenUpStar_Req) ProtoReflect() protoreflect.Message { +func (x *HeroStrengthenUpStarReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -461,26 +461,26 @@ func (x *Hero_StrengthenUpStar_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_StrengthenUpStar_Req.ProtoReflect.Descriptor instead. -func (*Hero_StrengthenUpStar_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroStrengthenUpStarReq.ProtoReflect.Descriptor instead. +func (*HeroStrengthenUpStarReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{8} } -func (x *Hero_StrengthenUpStar_Req) GetHeroObjID() string { +func (x *HeroStrengthenUpStarReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *Hero_StrengthenUpStar_Req) GetHero() []*CostCardData { +func (x *HeroStrengthenUpStarReq) GetHero() []*CostCardData { if x != nil { return x.Hero } return nil } -func (x *Hero_StrengthenUpStar_Req) GetHeroRace() []*CostCardData { +func (x *HeroStrengthenUpStarReq) GetHeroRace() []*CostCardData { if x != nil { return x.HeroRace } @@ -488,16 +488,16 @@ func (x *Hero_StrengthenUpStar_Req) GetHeroRace() []*CostCardData { } // 卡牌升星返回 -type Hero_StrengthenUpStar_Resp struct { +type HeroStrengthenUpStarResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 } -func (x *Hero_StrengthenUpStar_Resp) Reset() { - *x = Hero_StrengthenUpStar_Resp{} +func (x *HeroStrengthenUpStarResp) Reset() { + *x = HeroStrengthenUpStarResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -505,13 +505,13 @@ func (x *Hero_StrengthenUpStar_Resp) Reset() { } } -func (x *Hero_StrengthenUpStar_Resp) String() string { +func (x *HeroStrengthenUpStarResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_StrengthenUpStar_Resp) ProtoMessage() {} +func (*HeroStrengthenUpStarResp) ProtoMessage() {} -func (x *Hero_StrengthenUpStar_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroStrengthenUpStarResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -523,12 +523,12 @@ func (x *Hero_StrengthenUpStar_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_StrengthenUpStar_Resp.ProtoReflect.Descriptor instead. -func (*Hero_StrengthenUpStar_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroStrengthenUpStarResp.ProtoReflect.Descriptor instead. +func (*HeroStrengthenUpStarResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{9} } -func (x *Hero_StrengthenUpStar_Resp) GetHero() *DB_HeroData { +func (x *HeroStrengthenUpStarResp) GetHero() *DBHero { if x != nil { return x.Hero } @@ -536,7 +536,7 @@ func (x *Hero_StrengthenUpStar_Resp) GetHero() *DB_HeroData { } // 卡牌技能升级 -type Hero_StrengthenUpSkill_Req struct { +type HeroStrengthenUpSkillReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -546,8 +546,8 @@ type Hero_StrengthenUpSkill_Req struct { Items *CostCardData `protobuf:"bytes,3,opt,name=items,proto3" json:"items"` // 消耗技能升级卡 } -func (x *Hero_StrengthenUpSkill_Req) Reset() { - *x = Hero_StrengthenUpSkill_Req{} +func (x *HeroStrengthenUpSkillReq) Reset() { + *x = HeroStrengthenUpSkillReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -555,13 +555,13 @@ func (x *Hero_StrengthenUpSkill_Req) Reset() { } } -func (x *Hero_StrengthenUpSkill_Req) String() string { +func (x *HeroStrengthenUpSkillReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_StrengthenUpSkill_Req) ProtoMessage() {} +func (*HeroStrengthenUpSkillReq) ProtoMessage() {} -func (x *Hero_StrengthenUpSkill_Req) ProtoReflect() protoreflect.Message { +func (x *HeroStrengthenUpSkillReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -573,26 +573,26 @@ func (x *Hero_StrengthenUpSkill_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_StrengthenUpSkill_Req.ProtoReflect.Descriptor instead. -func (*Hero_StrengthenUpSkill_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroStrengthenUpSkillReq.ProtoReflect.Descriptor instead. +func (*HeroStrengthenUpSkillReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{10} } -func (x *Hero_StrengthenUpSkill_Req) GetHeroObjID() string { +func (x *HeroStrengthenUpSkillReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *Hero_StrengthenUpSkill_Req) GetSkillIndex() int32 { +func (x *HeroStrengthenUpSkillReq) GetSkillIndex() int32 { if x != nil { return x.SkillIndex } return 0 } -func (x *Hero_StrengthenUpSkill_Req) GetItems() *CostCardData { +func (x *HeroStrengthenUpSkillReq) GetItems() *CostCardData { if x != nil { return x.Items } @@ -600,16 +600,16 @@ func (x *Hero_StrengthenUpSkill_Req) GetItems() *CostCardData { } // 卡牌技能升级返回 -type Hero_StrengthenUpSkill_Resp struct { +type HeroStrengthenUpSkillResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 } -func (x *Hero_StrengthenUpSkill_Resp) Reset() { - *x = Hero_StrengthenUpSkill_Resp{} +func (x *HeroStrengthenUpSkillResp) Reset() { + *x = HeroStrengthenUpSkillResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -617,13 +617,13 @@ func (x *Hero_StrengthenUpSkill_Resp) Reset() { } } -func (x *Hero_StrengthenUpSkill_Resp) String() string { +func (x *HeroStrengthenUpSkillResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_StrengthenUpSkill_Resp) ProtoMessage() {} +func (*HeroStrengthenUpSkillResp) ProtoMessage() {} -func (x *Hero_StrengthenUpSkill_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroStrengthenUpSkillResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -635,12 +635,12 @@ func (x *Hero_StrengthenUpSkill_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_StrengthenUpSkill_Resp.ProtoReflect.Descriptor instead. -func (*Hero_StrengthenUpSkill_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroStrengthenUpSkillResp.ProtoReflect.Descriptor instead. +func (*HeroStrengthenUpSkillResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{11} } -func (x *Hero_StrengthenUpSkill_Resp) GetHero() *DB_HeroData { +func (x *HeroStrengthenUpSkillResp) GetHero() *DBHero { if x != nil { return x.Hero } @@ -648,7 +648,7 @@ func (x *Hero_StrengthenUpSkill_Resp) GetHero() *DB_HeroData { } // 共鸣英雄 -type Hero_Gongming_Req struct { +type HeroGongmingReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -657,8 +657,8 @@ type Hero_Gongming_Req struct { CostObjID string `protobuf:"bytes,2,opt,name=costObjID,proto3" json:"costObjID"` // 消耗对象 } -func (x *Hero_Gongming_Req) Reset() { - *x = Hero_Gongming_Req{} +func (x *HeroGongmingReq) Reset() { + *x = HeroGongmingReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -666,13 +666,13 @@ func (x *Hero_Gongming_Req) Reset() { } } -func (x *Hero_Gongming_Req) String() string { +func (x *HeroGongmingReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_Gongming_Req) ProtoMessage() {} +func (*HeroGongmingReq) ProtoMessage() {} -func (x *Hero_Gongming_Req) ProtoReflect() protoreflect.Message { +func (x *HeroGongmingReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -684,37 +684,37 @@ func (x *Hero_Gongming_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_Gongming_Req.ProtoReflect.Descriptor instead. -func (*Hero_Gongming_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroGongmingReq.ProtoReflect.Descriptor instead. +func (*HeroGongmingReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{12} } -func (x *Hero_Gongming_Req) GetHeroObjID() string { +func (x *HeroGongmingReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *Hero_Gongming_Req) GetCostObjID() string { +func (x *HeroGongmingReq) GetCostObjID() string { if x != nil { return x.CostObjID } return "" } -type Hero_Gongming_Resp struct { +type HeroGongmingResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 - Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 共鸣成功 获得的能量点数 - UpStarCard *DB_HeroData `protobuf:"bytes,3,opt,name=upStarCard,proto3" json:"upStarCard"` //共鸣成功 获得的升星卡 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 共鸣成功 获得的能量点数 + UpStarCard *DBHero `protobuf:"bytes,3,opt,name=upStarCard,proto3" json:"upStarCard"` //共鸣成功 获得的升星卡 } -func (x *Hero_Gongming_Resp) Reset() { - *x = Hero_Gongming_Resp{} +func (x *HeroGongmingResp) Reset() { + *x = HeroGongmingResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -722,13 +722,13 @@ func (x *Hero_Gongming_Resp) Reset() { } } -func (x *Hero_Gongming_Resp) String() string { +func (x *HeroGongmingResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_Gongming_Resp) ProtoMessage() {} +func (*HeroGongmingResp) ProtoMessage() {} -func (x *Hero_Gongming_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroGongmingResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -740,26 +740,26 @@ func (x *Hero_Gongming_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_Gongming_Resp.ProtoReflect.Descriptor instead. -func (*Hero_Gongming_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroGongmingResp.ProtoReflect.Descriptor instead. +func (*HeroGongmingResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{13} } -func (x *Hero_Gongming_Resp) GetHero() *DB_HeroData { +func (x *HeroGongmingResp) GetHero() *DBHero { if x != nil { return x.Hero } return nil } -func (x *Hero_Gongming_Resp) GetEnergy() int32 { +func (x *HeroGongmingResp) GetEnergy() int32 { if x != nil { return x.Energy } return 0 } -func (x *Hero_Gongming_Resp) GetUpStarCard() *DB_HeroData { +func (x *HeroGongmingResp) GetUpStarCard() *DBHero { if x != nil { return x.UpStarCard } @@ -767,7 +767,7 @@ func (x *Hero_Gongming_Resp) GetUpStarCard() *DB_HeroData { } // 重置共鸣属性 -type Hero_GongmingReset_Req struct { +type HeroGongmingResetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -775,8 +775,8 @@ type Hero_GongmingReset_Req struct { HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID } -func (x *Hero_GongmingReset_Req) Reset() { - *x = Hero_GongmingReset_Req{} +func (x *HeroGongmingResetReq) Reset() { + *x = HeroGongmingResetReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -784,13 +784,13 @@ func (x *Hero_GongmingReset_Req) Reset() { } } -func (x *Hero_GongmingReset_Req) String() string { +func (x *HeroGongmingResetReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_GongmingReset_Req) ProtoMessage() {} +func (*HeroGongmingResetReq) ProtoMessage() {} -func (x *Hero_GongmingReset_Req) ProtoReflect() protoreflect.Message { +func (x *HeroGongmingResetReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -802,29 +802,29 @@ func (x *Hero_GongmingReset_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_GongmingReset_Req.ProtoReflect.Descriptor instead. -func (*Hero_GongmingReset_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroGongmingResetReq.ProtoReflect.Descriptor instead. +func (*HeroGongmingResetReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{14} } -func (x *Hero_GongmingReset_Req) GetHeroObjID() string { +func (x *HeroGongmingResetReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -type Hero_GongmingReset_Resp struct { +type HeroGongmingResetResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 - Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 能量点数 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 能量点数 } -func (x *Hero_GongmingReset_Resp) Reset() { - *x = Hero_GongmingReset_Resp{} +func (x *HeroGongmingResetResp) Reset() { + *x = HeroGongmingResetResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -832,13 +832,13 @@ func (x *Hero_GongmingReset_Resp) Reset() { } } -func (x *Hero_GongmingReset_Resp) String() string { +func (x *HeroGongmingResetResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_GongmingReset_Resp) ProtoMessage() {} +func (*HeroGongmingResetResp) ProtoMessage() {} -func (x *Hero_GongmingReset_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroGongmingResetResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -850,19 +850,19 @@ func (x *Hero_GongmingReset_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_GongmingReset_Resp.ProtoReflect.Descriptor instead. -func (*Hero_GongmingReset_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroGongmingResetResp.ProtoReflect.Descriptor instead. +func (*HeroGongmingResetResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{15} } -func (x *Hero_GongmingReset_Resp) GetHero() *DB_HeroData { +func (x *HeroGongmingResetResp) GetHero() *DBHero { if x != nil { return x.Hero } return nil } -func (x *Hero_GongmingReset_Resp) GetEnergy() int32 { +func (x *HeroGongmingResetResp) GetEnergy() int32 { if x != nil { return x.Energy } @@ -870,7 +870,7 @@ func (x *Hero_GongmingReset_Resp) GetEnergy() int32 { } // 使用能量点数 -type Hero_GongmingUseEnergy_Req struct { +type HeroGongmingUseEnergyReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -880,8 +880,8 @@ type Hero_GongmingUseEnergy_Req struct { UseType int32 `protobuf:"varint,3,opt,name=useType,proto3" json:"useType"` // 使用的类型 （攻击、血量、防御） } -func (x *Hero_GongmingUseEnergy_Req) Reset() { - *x = Hero_GongmingUseEnergy_Req{} +func (x *HeroGongmingUseEnergyReq) Reset() { + *x = HeroGongmingUseEnergyReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -889,13 +889,13 @@ func (x *Hero_GongmingUseEnergy_Req) Reset() { } } -func (x *Hero_GongmingUseEnergy_Req) String() string { +func (x *HeroGongmingUseEnergyReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_GongmingUseEnergy_Req) ProtoMessage() {} +func (*HeroGongmingUseEnergyReq) ProtoMessage() {} -func (x *Hero_GongmingUseEnergy_Req) ProtoReflect() protoreflect.Message { +func (x *HeroGongmingUseEnergyReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -907,42 +907,42 @@ func (x *Hero_GongmingUseEnergy_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_GongmingUseEnergy_Req.ProtoReflect.Descriptor instead. -func (*Hero_GongmingUseEnergy_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroGongmingUseEnergyReq.ProtoReflect.Descriptor instead. +func (*HeroGongmingUseEnergyReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{16} } -func (x *Hero_GongmingUseEnergy_Req) GetHeroObjID() string { +func (x *HeroGongmingUseEnergyReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *Hero_GongmingUseEnergy_Req) GetUseEnergy() int32 { +func (x *HeroGongmingUseEnergyReq) GetUseEnergy() int32 { if x != nil { return x.UseEnergy } return 0 } -func (x *Hero_GongmingUseEnergy_Req) GetUseType() int32 { +func (x *HeroGongmingUseEnergyReq) GetUseType() int32 { if x != nil { return x.UseType } return 0 } -type Hero_GongmingUseEnergy_Resp struct { +type HeroGongmingUseEnergyResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 } -func (x *Hero_GongmingUseEnergy_Resp) Reset() { - *x = Hero_GongmingUseEnergy_Resp{} +func (x *HeroGongmingUseEnergyResp) Reset() { + *x = HeroGongmingUseEnergyResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -950,13 +950,13 @@ func (x *Hero_GongmingUseEnergy_Resp) Reset() { } } -func (x *Hero_GongmingUseEnergy_Resp) String() string { +func (x *HeroGongmingUseEnergyResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_GongmingUseEnergy_Resp) ProtoMessage() {} +func (*HeroGongmingUseEnergyResp) ProtoMessage() {} -func (x *Hero_GongmingUseEnergy_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroGongmingUseEnergyResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -968,12 +968,12 @@ func (x *Hero_GongmingUseEnergy_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_GongmingUseEnergy_Resp.ProtoReflect.Descriptor instead. -func (*Hero_GongmingUseEnergy_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroGongmingUseEnergyResp.ProtoReflect.Descriptor instead. +func (*HeroGongmingUseEnergyResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} } -func (x *Hero_GongmingUseEnergy_Resp) GetHero() *DB_HeroData { +func (x *HeroGongmingUseEnergyResp) GetHero() *DBHero { if x != nil { return x.Hero } @@ -981,7 +981,7 @@ func (x *Hero_GongmingUseEnergy_Resp) GetHero() *DB_HeroData { } // 觉醒 -type Hero_Juexing_Req struct { +type HeroJuexingReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -990,8 +990,8 @@ type Hero_Juexing_Req struct { CostItmes *ItemData `protobuf:"bytes,2,opt,name=costItmes,proto3" json:"costItmes"` // 觉醒消耗待定 } -func (x *Hero_Juexing_Req) Reset() { - *x = Hero_Juexing_Req{} +func (x *HeroJuexingReq) Reset() { + *x = HeroJuexingReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -999,13 +999,13 @@ func (x *Hero_Juexing_Req) Reset() { } } -func (x *Hero_Juexing_Req) String() string { +func (x *HeroJuexingReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_Juexing_Req) ProtoMessage() {} +func (*HeroJuexingReq) ProtoMessage() {} -func (x *Hero_Juexing_Req) ProtoReflect() protoreflect.Message { +func (x *HeroJuexingReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1017,19 +1017,19 @@ func (x *Hero_Juexing_Req) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_Juexing_Req.ProtoReflect.Descriptor instead. -func (*Hero_Juexing_Req) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroJuexingReq.ProtoReflect.Descriptor instead. +func (*HeroJuexingReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} } -func (x *Hero_Juexing_Req) GetHeroObjID() string { +func (x *HeroJuexingReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *Hero_Juexing_Req) GetCostItmes() *ItemData { +func (x *HeroJuexingReq) GetCostItmes() *ItemData { if x != nil { return x.CostItmes } @@ -1037,16 +1037,16 @@ func (x *Hero_Juexing_Req) GetCostItmes() *ItemData { } // 觉醒返回 -type Hero_Juexing_Resp struct { +type HeroJuexingResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hero *DB_HeroData `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 + Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 } -func (x *Hero_Juexing_Resp) Reset() { - *x = Hero_Juexing_Resp{} +func (x *HeroJuexingResp) Reset() { + *x = HeroJuexingResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1054,13 +1054,13 @@ func (x *Hero_Juexing_Resp) Reset() { } } -func (x *Hero_Juexing_Resp) String() string { +func (x *HeroJuexingResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Hero_Juexing_Resp) ProtoMessage() {} +func (*HeroJuexingResp) ProtoMessage() {} -func (x *Hero_Juexing_Resp) ProtoReflect() protoreflect.Message { +func (x *HeroJuexingResp) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1072,12 +1072,12 @@ func (x *Hero_Juexing_Resp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Hero_Juexing_Resp.ProtoReflect.Descriptor instead. -func (*Hero_Juexing_Resp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroJuexingResp.ProtoReflect.Descriptor instead. +func (*HeroJuexingResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} } -func (x *Hero_Juexing_Resp) GetHero() *DB_HeroData { +func (x *HeroJuexingResp) GetHero() *DBHero { if x != nil { return x.Hero } @@ -1089,107 +1089,102 @@ var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ 0x0a, 0x13, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, - 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, - 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x49, 0x6e, 0x66, 0x6f, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x16, - 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x49, - 0x6e, 0x66, 0x6f, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, - 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0f, 0x0a, 0x0d, - 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, - 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x23, - 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, - 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c, - 0x69, 0x73, 0x74, 0x22, 0x3a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, - 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, - 0x6d, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, - 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, + 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x25, 0x0a, + 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, + 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, + 0x72, 0x6f, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, + 0x61, 0x73, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, + 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, + 0x74, 0x22, 0x3a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, + 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, + 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x6b, 0x0a, + 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, + 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, + 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, + 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, + 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x38, 0x0a, 0x16, 0x48, 0x65, + 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, + 0x68, 0x65, 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, + 0x4f, 0x62, 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, + 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8b, + 0x01, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, + 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x70, 0x43, - 0x61, 0x72, 0x64, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x78, 0x70, - 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x3f, - 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, - 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, - 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, - 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, - 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, - 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8d, 0x01, 0x0a, 0x19, 0x48, 0x65, - 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, - 0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, - 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, - 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2c, 0x0a, 0x08, 0x68, - 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, - 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x41, 0x0a, 0x1a, 0x48, 0x65, 0x72, - 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, - 0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, - 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x82, 0x01, 0x0a, - 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, - 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6b, 0x69, - 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, - 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, - 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, - 0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, - 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, - 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, - 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, - 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, - 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x5f, - 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, - 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a, 0x0a, 0x75, 0x70, - 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, - 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36, 0x0a, 0x16, 0x48, - 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, - 0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, + 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2c, + 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x3a, 0x0a, 0x18, + 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, + 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x18, 0x48, 0x65, 0x72, + 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, - 0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, - 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, - 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, - 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72, 0x0a, 0x1a, 0x48, - 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, - 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, - 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, - 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, - 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, - 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, - 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, - 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, - 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, - 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, - 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, + 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, + 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3b, 0x0a, 0x19, 0x48, + 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, + 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, + 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, + 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x76, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x47, + 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, + 0x72, 0x67, 0x79, 0x12, 0x2a, 0x0a, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, + 0x34, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, + 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x4f, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x6f, 0x6e, + 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, + 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, + 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x70, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x6f, + 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, + 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, + 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, + 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x3b, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, + 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, + 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4a, 0x75, 0x65, + 0x78, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, 0x65, - 0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, 0x69, 0x6e, - 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, - 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x22, 0x31, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4a, 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, + 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1206,43 +1201,43 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 20) var file_hero_hero_msg_proto_goTypes = []interface{}{ - (*Hero_Info_Req)(nil), // 0: pb.Hero_Info_Req - (*Hero_Info_Rsp)(nil), // 1: pb.Hero_Info_Rsp - (*Hero_List_Req)(nil), // 2: pb.Hero_List_Req - (*Hero_List_Rsp)(nil), // 3: pb.Hero_List_Rsp - (*ItemData)(nil), // 4: pb.ItemData - (*Hero_StrengthenUplv_Req)(nil), // 5: pb.Hero_StrengthenUplv_Req - (*Hero_StrengthenUplv_Resp)(nil), // 6: pb.Hero_StrengthenUplv_Resp - (*CostCardData)(nil), // 7: pb.CostCardData - (*Hero_StrengthenUpStar_Req)(nil), // 8: pb.Hero_StrengthenUpStar_Req - (*Hero_StrengthenUpStar_Resp)(nil), // 9: pb.Hero_StrengthenUpStar_Resp - (*Hero_StrengthenUpSkill_Req)(nil), // 10: pb.Hero_StrengthenUpSkill_Req - (*Hero_StrengthenUpSkill_Resp)(nil), // 11: pb.Hero_StrengthenUpSkill_Resp - (*Hero_Gongming_Req)(nil), // 12: pb.Hero_Gongming_Req - (*Hero_Gongming_Resp)(nil), // 13: pb.Hero_Gongming_Resp - (*Hero_GongmingReset_Req)(nil), // 14: pb.Hero_GongmingReset_Req - (*Hero_GongmingReset_Resp)(nil), // 15: pb.Hero_GongmingReset_Resp - (*Hero_GongmingUseEnergy_Req)(nil), // 16: pb.Hero_GongmingUseEnergy_Req - (*Hero_GongmingUseEnergy_Resp)(nil), // 17: pb.Hero_GongmingUseEnergy_Resp - (*Hero_Juexing_Req)(nil), // 18: pb.Hero_Juexing_Req - (*Hero_Juexing_Resp)(nil), // 19: pb.Hero_Juexing_Resp - (*DB_HeroData)(nil), // 20: pb.DB_HeroData + (*HeroInfoReq)(nil), // 0: pb.HeroInfoReq + (*HeroInfoRsp)(nil), // 1: pb.HeroInfoRsp + (*HeroListReq)(nil), // 2: pb.HeroListReq + (*HeroListRsp)(nil), // 3: pb.HeroListRsp + (*ItemData)(nil), // 4: pb.ItemData + (*HeroStrengthenUplvReq)(nil), // 5: pb.HeroStrengthenUplvReq + (*HeroStrengthenUplvResp)(nil), // 6: pb.HeroStrengthenUplvResp + (*CostCardData)(nil), // 7: pb.CostCardData + (*HeroStrengthenUpStarReq)(nil), // 8: pb.HeroStrengthenUpStarReq + (*HeroStrengthenUpStarResp)(nil), // 9: pb.HeroStrengthenUpStarResp + (*HeroStrengthenUpSkillReq)(nil), // 10: pb.HeroStrengthenUpSkillReq + (*HeroStrengthenUpSkillResp)(nil), // 11: pb.HeroStrengthenUpSkillResp + (*HeroGongmingReq)(nil), // 12: pb.HeroGongmingReq + (*HeroGongmingResp)(nil), // 13: pb.HeroGongmingResp + (*HeroGongmingResetReq)(nil), // 14: pb.HeroGongmingResetReq + (*HeroGongmingResetResp)(nil), // 15: pb.HeroGongmingResetResp + (*HeroGongmingUseEnergyReq)(nil), // 16: pb.HeroGongmingUseEnergyReq + (*HeroGongmingUseEnergyResp)(nil), // 17: pb.HeroGongmingUseEnergyResp + (*HeroJuexingReq)(nil), // 18: pb.HeroJuexingReq + (*HeroJuexingResp)(nil), // 19: pb.HeroJuexingResp + (*DBHero)(nil), // 20: pb.DBHero } var file_hero_hero_msg_proto_depIdxs = []int32{ - 20, // 0: pb.Hero_Info_Rsp.base:type_name -> pb.DB_HeroData - 20, // 1: pb.Hero_List_Rsp.list:type_name -> pb.DB_HeroData - 20, // 2: pb.Hero_StrengthenUplv_Resp.hero:type_name -> pb.DB_HeroData - 7, // 3: pb.Hero_StrengthenUpStar_Req.hero:type_name -> pb.CostCardData - 7, // 4: pb.Hero_StrengthenUpStar_Req.heroRace:type_name -> pb.CostCardData - 20, // 5: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData - 7, // 6: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData - 20, // 7: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData - 20, // 8: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData - 20, // 9: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData - 20, // 10: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData - 20, // 11: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData - 4, // 12: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData - 20, // 13: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData + 20, // 0: pb.HeroInfoRsp.base:type_name -> pb.DBHero + 20, // 1: pb.HeroListRsp.list:type_name -> pb.DBHero + 20, // 2: pb.HeroStrengthenUplvResp.hero:type_name -> pb.DBHero + 7, // 3: pb.HeroStrengthenUpStarReq.hero:type_name -> pb.CostCardData + 7, // 4: pb.HeroStrengthenUpStarReq.heroRace:type_name -> pb.CostCardData + 20, // 5: pb.HeroStrengthenUpStarResp.hero:type_name -> pb.DBHero + 7, // 6: pb.HeroStrengthenUpSkillReq.items:type_name -> pb.CostCardData + 20, // 7: pb.HeroStrengthenUpSkillResp.hero:type_name -> pb.DBHero + 20, // 8: pb.HeroGongmingResp.hero:type_name -> pb.DBHero + 20, // 9: pb.HeroGongmingResp.upStarCard:type_name -> pb.DBHero + 20, // 10: pb.HeroGongmingResetResp.hero:type_name -> pb.DBHero + 20, // 11: pb.HeroGongmingUseEnergyResp.hero:type_name -> pb.DBHero + 4, // 12: pb.HeroJuexingReq.costItmes:type_name -> pb.ItemData + 20, // 13: pb.HeroJuexingResp.hero:type_name -> pb.DBHero 14, // [14:14] is the sub-list for method output_type 14, // [14:14] is the sub-list for method input_type 14, // [14:14] is the sub-list for extension type_name @@ -1258,7 +1253,7 @@ func file_hero_hero_msg_proto_init() { file_hero_hero_db_proto_init() if !protoimpl.UnsafeEnabled { file_hero_hero_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_Info_Req); i { + switch v := v.(*HeroInfoReq); i { case 0: return &v.state case 1: @@ -1270,7 +1265,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_Info_Rsp); i { + switch v := v.(*HeroInfoRsp); i { case 0: return &v.state case 1: @@ -1282,7 +1277,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_List_Req); i { + switch v := v.(*HeroListReq); i { case 0: return &v.state case 1: @@ -1294,7 +1289,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_List_Rsp); i { + switch v := v.(*HeroListRsp); i { case 0: return &v.state case 1: @@ -1318,7 +1313,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_StrengthenUplv_Req); i { + switch v := v.(*HeroStrengthenUplvReq); i { case 0: return &v.state case 1: @@ -1330,7 +1325,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_StrengthenUplv_Resp); i { + switch v := v.(*HeroStrengthenUplvResp); i { case 0: return &v.state case 1: @@ -1354,7 +1349,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_StrengthenUpStar_Req); i { + switch v := v.(*HeroStrengthenUpStarReq); i { case 0: return &v.state case 1: @@ -1366,7 +1361,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_StrengthenUpStar_Resp); i { + switch v := v.(*HeroStrengthenUpStarResp); i { case 0: return &v.state case 1: @@ -1378,7 +1373,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_StrengthenUpSkill_Req); i { + switch v := v.(*HeroStrengthenUpSkillReq); i { case 0: return &v.state case 1: @@ -1390,7 +1385,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_StrengthenUpSkill_Resp); i { + switch v := v.(*HeroStrengthenUpSkillResp); i { case 0: return &v.state case 1: @@ -1402,7 +1397,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_Gongming_Req); i { + switch v := v.(*HeroGongmingReq); i { case 0: return &v.state case 1: @@ -1414,7 +1409,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_Gongming_Resp); i { + switch v := v.(*HeroGongmingResp); i { case 0: return &v.state case 1: @@ -1426,7 +1421,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_GongmingReset_Req); i { + switch v := v.(*HeroGongmingResetReq); i { case 0: return &v.state case 1: @@ -1438,7 +1433,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_GongmingReset_Resp); i { + switch v := v.(*HeroGongmingResetResp); i { case 0: return &v.state case 1: @@ -1450,7 +1445,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_GongmingUseEnergy_Req); i { + switch v := v.(*HeroGongmingUseEnergyReq); i { case 0: return &v.state case 1: @@ -1462,7 +1457,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_GongmingUseEnergy_Resp); i { + switch v := v.(*HeroGongmingUseEnergyResp); i { case 0: return &v.state case 1: @@ -1474,7 +1469,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_Juexing_Req); i { + switch v := v.(*HeroJuexingReq); i { case 0: return &v.state case 1: @@ -1486,7 +1481,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hero_Juexing_Resp); i { + switch v := v.(*HeroJuexingResp); i { case 0: return &v.state case 1: diff --git a/pb/proto/hero/hero_db.proto b/pb/proto/hero/hero_db.proto index 45d8efec8..de76cb996 100644 --- a/pb/proto/hero/hero_db.proto +++ b/pb/proto/hero/hero_db.proto @@ -2,19 +2,12 @@ syntax = "proto3"; option go_package = ".;pb"; package pb; -// enum PropertyType{ -// Hp = 0; //血量 -// Atk = 1; //攻击 -// Def = 2; //防御 -// Speed = 3; //速度 -// Crit = 4; //暴击 -// } - -message SkillData{ +message SkillData { int32 skillID = 1; int32 skillLv = 2; } -message DB_HeroData { + +message DBHero { string id = 1; //@go_tags(`bson:"_id"`) ID string uid = 2; int32 heroID = 3; //@go_tags(`bson:"heroID"`) 英雄的配置表ID diff --git a/pb/proto/hero/hero_msg.proto b/pb/proto/hero/hero_msg.proto index 8bba2234b..8da28f31d 100644 --- a/pb/proto/hero/hero_msg.proto +++ b/pb/proto/hero/hero_msg.proto @@ -4,15 +4,15 @@ package pb; import "hero/hero_db.proto"; //英雄基础信息 -message Hero_Info_Req { +message HeroInfoReq { string heroId = 1; //英雄唯一ID } -message Hero_Info_Rsp { DB_HeroData base = 1; } +message HeroInfoRsp { DBHero base = 1; } //英雄列表 -message Hero_List_Req {} +message HeroListReq {} -message Hero_List_Rsp { repeated DB_HeroData list = 1; } +message HeroListRsp { repeated DBHero list = 1; } /// 卡牌养成: 强化(卡牌升级、卡牌升星、技能升级) /// 卡牌养成: 共鸣(共鸣消耗、材料返回、能量点使用) @@ -24,15 +24,15 @@ message ItemData { } // 卡牌升级 -message Hero_StrengthenUplv_Req { +message HeroStrengthenUplvReq { string heroObjID = 1; // 英雄对象ID string expCardID = 2; // 经验卡对象ID int32 amount = 3; // 消耗经验卡数量} } // 卡牌升级返回 -message Hero_StrengthenUplv_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroStrengthenUplvResp { + DBHero hero = 1; // 英雄对象 } message CostCardData { @@ -40,69 +40,69 @@ message CostCardData { int32 amount = 2; // 数量 } // 卡牌升星 -message Hero_StrengthenUpStar_Req { +message HeroStrengthenUpStarReq { string heroObjID = 1; // 英雄对象ID repeated CostCardData hero = 2; // 消耗卡牌对象ID repeated CostCardData heroRace = 3; // 消耗种族卡牌对象ID } // 卡牌升星返回 -message Hero_StrengthenUpStar_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroStrengthenUpStarResp { + DBHero hero = 1; // 英雄对象 } // 卡牌技能升级 -message Hero_StrengthenUpSkill_Req { +message HeroStrengthenUpSkillReq { string heroObjID = 1; // 英雄对象ID int32 skillIndex = 2; // 英雄技能索引 CostCardData items = 3; // 消耗技能升级卡 } // 卡牌技能升级返回 -message Hero_StrengthenUpSkill_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroStrengthenUpSkillResp { + DBHero hero = 1; // 英雄对象 } // 共鸣英雄 -message Hero_Gongming_Req { +message HeroGongmingReq { string heroObjID = 1; // 英雄对象ID string costObjID = 2; // 消耗对象 } -message Hero_Gongming_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroGongmingResp { + DBHero hero = 1; // 英雄对象 int32 energy = 2; // 共鸣成功 获得的能量点数 - DB_HeroData upStarCard = 3; //共鸣成功 获得的升星卡 + DBHero upStarCard = 3; //共鸣成功 获得的升星卡 } // 重置共鸣属性 -message Hero_GongmingReset_Req { +message HeroGongmingResetReq { string heroObjID = 1; // 英雄对象ID } -message Hero_GongmingReset_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroGongmingResetResp { + DBHero hero = 1; // 英雄对象 int32 energy = 2; // 能量点数 } // 使用能量点数 -message Hero_GongmingUseEnergy_Req { +message HeroGongmingUseEnergyReq { string heroObjID = 1; // 英雄对象ID int32 useEnergy = 2; // 使用的能量点数 int32 useType = 3; // 使用的类型 （攻击、血量、防御） } -message Hero_GongmingUseEnergy_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroGongmingUseEnergyResp { + DBHero hero = 1; // 英雄对象 } // 觉醒 -message Hero_Juexing_Req { +message HeroJuexingReq { string heroObjID = 1; // 英雄对象ID ItemData costItmes = 2; // 觉醒消耗待定 } // 觉醒返回 -message Hero_Juexing_Resp { - DB_HeroData hero = 1; // 英雄对象 +message HeroJuexingResp { + DBHero hero = 1; // 英雄对象 } \ No newline at end of file diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index 4d92f5495..42d194b72 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -165,7 +165,7 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag //RPC_NoticeUserClose 接收用户离线通知 func (this *SCompGateRoute) NoticeUserClose(ctx context.Context, args *pb.NoticeUserCloseReq, reply *pb.RPCMessageReply) error { - event.TriggerEvent(comm.Event_UserOffline, args.UserId) + event.TriggerEvent(comm.EventUserOffline, args.UserId) this.sessionslock.Lock() delete(this.sessions, args.UserSessionId) this.sessionslock.Unlock() From 40844d1962f7ae4c87dd9c3ac42e90434fd615ef Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 28 Jun 2022 18:19:55 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=B9=E8=B1=A1=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/comp_gateroute.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index 4d92f5495..55f43b18f 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -59,6 +59,7 @@ func (this *SCompGateRoute) Init(service core.IService, comp core.IServiceComp, err = this.ServiceCompBase.Init(service, comp, options) this.service = service.(base.IRPCXService) this.msghandles = make(map[string]*msghandle) + this.sessions = make(map[string]comm.IUserSession) return err } // From 92ee1d454d5c2413b3826db68b64f4cee9309d14 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 28 Jun 2022 19:07:28 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=91=E5=AE=9Auid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/usersession.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/comm/usersession.go b/comm/usersession.go index 82fc50420..ddcec3825 100644 --- a/comm/usersession.go +++ b/comm/usersession.go @@ -66,24 +66,28 @@ func (this *UserSession) IsLogin() bool { ///wokerId 用户绑定worker服务id func (this *UserSession) Bind(uid string, wokerId string) (err error) { reply := &pb.RPCMessageReply{} - if err := this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentBind), &pb.AgentBuildReq{ + if err = this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentBind), &pb.AgentBuildReq{ UserSessionId: this.SessionId, UserId: uid, WorkerId: wokerId, }, reply); err != nil { log.Errorf("Bind UserSession:%s UserId:%s err:%v", this.SessionId, this.UserId, err) + return } + this.UserId = uid return } //解绑uid 注销和切换账号是处理 func (this *UserSession) UnBind() (err error) { reply := &pb.RPCMessageReply{} - if err := this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentUnBind), &pb.AgentUnBuildReq{ + if err = this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentUnBind), &pb.AgentUnBuildReq{ UserSessionId: this.SessionId, }, reply); err != nil { log.Errorf("UnBuild UserSession:%s UserId:%s err:%v", this.SessionId, this.UserId, err) + return } + this.UserId = "" return }