From d61274b14f843d17af2179b4279149ae7195b507 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 11 Aug 2022 20:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E5=8D=8F=E8=AE=AE=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=94=AF=E6=8C=81=E5=A4=9A=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonanceSelect.go | 29 +- pb/hero_msg.pb.go | 410 ++++++++++++++++------------ 2 files changed, 259 insertions(+), 180 deletions(-) diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go index 028e837ad..c768419d9 100644 --- a/modules/hero/api_resonanceSelect.go +++ b/modules/hero/api_resonanceSelect.go @@ -9,17 +9,26 @@ import ( //参数校验 func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode) { - if len(req.HeroObjID) == 0 || req.UseEnergy <= 0 || (req.UseType != comm.ResonanceHpPro && req.UseType != comm.ResonanceAtkPro && req.UseType != comm.ResonanceDefPro) { + if len(req.HeroObjID) == 0 || len(req.Energy) == 0 { code = pb.ErrorCode_ReqParameterError + return + } + for _, v := range req.Energy { + if v.UseType != comm.ResonanceAtkPro && v.UseType != comm.ResonanceHpPro && v.UseType != comm.ResonanceDefPro { + code = pb.ErrorCode_ReqParameterError + return + } } - return } func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode, data proto.Message) { var ( - _hero *pb.DBHero + _hero *pb.DBHero + energyMap map[string]int32 + totalEnergy int32 ) + energyMap = make(map[string]int32, 0) code = this.ResonanceUseEnergyCheck(session, req) // check if code != pb.ErrorCode_Success { return @@ -29,15 +38,21 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR if code != pb.ErrorCode_Success { return } - if _hero.DistributionResonate < req.UseEnergy { // 能量点数不够 + for _, v := range req.Energy { + energyMap[v.UseType] += v.UseEnergy + totalEnergy += v.UseEnergy + } + + if _hero.DistributionResonate < totalEnergy { // 能量点数不够 code = pb.ErrorCode_HeroNoEnergy return } - - _hero.Energy[req.UseType] += req.UseEnergy + for _, v := range req.Energy { + _hero.Energy[v.UseType] += v.UseEnergy + } _heroMap := map[string]interface{}{ - "DistributionResonate": _hero.DistributionResonate - req.UseEnergy, // 减没有分配的能量 + "DistributionResonate": _hero.DistributionResonate - totalEnergy, // 减没有分配的能量 "Energy": _hero.Energy, "isOverlying": false, } diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 3ef12b4ae..91396e881 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -908,21 +908,75 @@ func (x *HeroResonanceResetResp) GetEnergy() int32 { return 0 } +type EnergyData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + UseEnergy int32 `protobuf:"varint,1,opt,name=useEnergy,proto3" json:"useEnergy"` // 使用的能量点数 + UseType string `protobuf:"bytes,2,opt,name=useType,proto3" json:"useType"` // 使用的类型 （攻击、血量、防御） +} + +func (x *EnergyData) Reset() { + *x = EnergyData{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EnergyData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EnergyData) ProtoMessage() {} + +func (x *EnergyData) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[17] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EnergyData.ProtoReflect.Descriptor instead. +func (*EnergyData) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} +} + +func (x *EnergyData) GetUseEnergy() int32 { + if x != nil { + return x.UseEnergy + } + return 0 +} + +func (x *EnergyData) GetUseType() string { + if x != nil { + return x.UseType + } + return "" +} + // 使用能量点数 type HeroResonanceUseEnergyReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - UseEnergy int32 `protobuf:"varint,2,opt,name=useEnergy,proto3" json:"useEnergy"` // 使用的能量点数 - UseType string `protobuf:"bytes,3,opt,name=useType,proto3" json:"useType"` // 使用的类型 （攻击、血量、防御） + HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID + Energy []*EnergyData `protobuf:"bytes,2,rep,name=energy,proto3" json:"energy"` } func (x *HeroResonanceUseEnergyReq) Reset() { *x = HeroResonanceUseEnergyReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[17] + mi := &file_hero_hero_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -935,7 +989,7 @@ func (x *HeroResonanceUseEnergyReq) String() string { func (*HeroResonanceUseEnergyReq) ProtoMessage() {} func (x *HeroResonanceUseEnergyReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[17] + mi := &file_hero_hero_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -948,7 +1002,7 @@ func (x *HeroResonanceUseEnergyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroResonanceUseEnergyReq.ProtoReflect.Descriptor instead. func (*HeroResonanceUseEnergyReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} } func (x *HeroResonanceUseEnergyReq) GetHeroObjID() string { @@ -958,18 +1012,11 @@ func (x *HeroResonanceUseEnergyReq) GetHeroObjID() string { return "" } -func (x *HeroResonanceUseEnergyReq) GetUseEnergy() int32 { +func (x *HeroResonanceUseEnergyReq) GetEnergy() []*EnergyData { if x != nil { - return x.UseEnergy + return x.Energy } - return 0 -} - -func (x *HeroResonanceUseEnergyReq) GetUseType() string { - if x != nil { - return x.UseType - } - return "" + return nil } type HeroResonanceUseEnergyResp struct { @@ -983,7 +1030,7 @@ type HeroResonanceUseEnergyResp struct { func (x *HeroResonanceUseEnergyResp) Reset() { *x = HeroResonanceUseEnergyResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[18] + mi := &file_hero_hero_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -996,7 +1043,7 @@ func (x *HeroResonanceUseEnergyResp) String() string { func (*HeroResonanceUseEnergyResp) ProtoMessage() {} func (x *HeroResonanceUseEnergyResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[18] + mi := &file_hero_hero_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1009,7 +1056,7 @@ func (x *HeroResonanceUseEnergyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroResonanceUseEnergyResp.ProtoReflect.Descriptor instead. func (*HeroResonanceUseEnergyResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} } func (x *HeroResonanceUseEnergyResp) GetHero() *DBHero { @@ -1031,7 +1078,7 @@ type HeroAwakenReq struct { func (x *HeroAwakenReq) Reset() { *x = HeroAwakenReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[19] + mi := &file_hero_hero_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1044,7 +1091,7 @@ func (x *HeroAwakenReq) String() string { func (*HeroAwakenReq) ProtoMessage() {} func (x *HeroAwakenReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[19] + mi := &file_hero_hero_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1057,7 +1104,7 @@ func (x *HeroAwakenReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroAwakenReq.ProtoReflect.Descriptor instead. func (*HeroAwakenReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{20} } func (x *HeroAwakenReq) GetHeroObjID() string { @@ -1079,7 +1126,7 @@ type HeroAwakenResp struct { func (x *HeroAwakenResp) Reset() { *x = HeroAwakenResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[20] + mi := &file_hero_hero_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1092,7 +1139,7 @@ func (x *HeroAwakenResp) String() string { func (*HeroAwakenResp) ProtoMessage() {} func (x *HeroAwakenResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[20] + mi := &file_hero_hero_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1105,7 +1152,7 @@ func (x *HeroAwakenResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroAwakenResp.ProtoReflect.Descriptor instead. func (*HeroAwakenResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{20} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{21} } func (x *HeroAwakenResp) GetHero() *DBHero { @@ -1127,7 +1174,7 @@ type HeroChoukaReq struct { func (x *HeroChoukaReq) Reset() { *x = HeroChoukaReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[21] + mi := &file_hero_hero_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1140,7 +1187,7 @@ func (x *HeroChoukaReq) String() string { func (*HeroChoukaReq) ProtoMessage() {} func (x *HeroChoukaReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[21] + mi := &file_hero_hero_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1153,7 +1200,7 @@ func (x *HeroChoukaReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroChoukaReq.ProtoReflect.Descriptor instead. func (*HeroChoukaReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{21} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{22} } func (x *HeroChoukaReq) GetHeroIds() []string { @@ -1174,7 +1221,7 @@ type HeroChoukaResp struct { func (x *HeroChoukaResp) Reset() { *x = HeroChoukaResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[22] + mi := &file_hero_hero_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1187,7 +1234,7 @@ func (x *HeroChoukaResp) String() string { func (*HeroChoukaResp) ProtoMessage() {} func (x *HeroChoukaResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[22] + mi := &file_hero_hero_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1200,7 +1247,7 @@ func (x *HeroChoukaResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroChoukaResp.ProtoReflect.Descriptor instead. func (*HeroChoukaResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{22} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} } func (x *HeroChoukaResp) GetHeroes() []*DBHero { @@ -1224,7 +1271,7 @@ type HeroPropertyPush struct { func (x *HeroPropertyPush) Reset() { *x = HeroPropertyPush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[23] + mi := &file_hero_hero_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1237,7 +1284,7 @@ func (x *HeroPropertyPush) String() string { func (*HeroPropertyPush) ProtoMessage() {} func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[23] + mi := &file_hero_hero_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1250,7 +1297,7 @@ func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroPropertyPush.ProtoReflect.Descriptor instead. func (*HeroPropertyPush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{24} } func (x *HeroPropertyPush) GetHeroId() string { @@ -1286,7 +1333,7 @@ type HeroLockReq struct { func (x *HeroLockReq) Reset() { *x = HeroLockReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[24] + mi := &file_hero_hero_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1299,7 +1346,7 @@ func (x *HeroLockReq) String() string { func (*HeroLockReq) ProtoMessage() {} func (x *HeroLockReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[24] + mi := &file_hero_hero_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1312,7 +1359,7 @@ func (x *HeroLockReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockReq.ProtoReflect.Descriptor instead. func (*HeroLockReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{24} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{25} } func (x *HeroLockReq) GetHeroid() string { @@ -1334,7 +1381,7 @@ type HeroLockResp struct { func (x *HeroLockResp) Reset() { *x = HeroLockResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[25] + mi := &file_hero_hero_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1347,7 +1394,7 @@ func (x *HeroLockResp) String() string { func (*HeroLockResp) ProtoMessage() {} func (x *HeroLockResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[25] + mi := &file_hero_hero_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1360,7 +1407,7 @@ func (x *HeroLockResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockResp.ProtoReflect.Descriptor instead. func (*HeroLockResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{25} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{26} } func (x *HeroLockResp) GetHero() *DBHero { @@ -1385,7 +1432,7 @@ type HeroGetSpecifiedReq struct { func (x *HeroGetSpecifiedReq) Reset() { *x = HeroGetSpecifiedReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[26] + mi := &file_hero_hero_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1398,7 +1445,7 @@ func (x *HeroGetSpecifiedReq) String() string { func (*HeroGetSpecifiedReq) ProtoMessage() {} func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[26] + mi := &file_hero_hero_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1411,7 +1458,7 @@ func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedReq.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{26} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{27} } func (x *HeroGetSpecifiedReq) GetHeroCoinfigID() string { @@ -1453,7 +1500,7 @@ type HeroGetSpecifiedResp struct { func (x *HeroGetSpecifiedResp) Reset() { *x = HeroGetSpecifiedResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[27] + mi := &file_hero_hero_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1466,7 +1513,7 @@ func (x *HeroGetSpecifiedResp) String() string { func (*HeroGetSpecifiedResp) ProtoMessage() {} func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[27] + mi := &file_hero_hero_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1479,7 +1526,7 @@ func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedResp.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{27} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{28} } func (x *HeroGetSpecifiedResp) GetHero() *DBHero { @@ -1501,7 +1548,7 @@ type HeroDrawCardReq struct { func (x *HeroDrawCardReq) Reset() { *x = HeroDrawCardReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[28] + mi := &file_hero_hero_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1514,7 +1561,7 @@ func (x *HeroDrawCardReq) String() string { func (*HeroDrawCardReq) ProtoMessage() {} func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[28] + mi := &file_hero_hero_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1527,7 +1574,7 @@ func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardReq.ProtoReflect.Descriptor instead. func (*HeroDrawCardReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{28} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} } func (x *HeroDrawCardReq) GetDrawType() int32 { @@ -1548,7 +1595,7 @@ type HeroDrawCardResp struct { func (x *HeroDrawCardResp) Reset() { *x = HeroDrawCardResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[29] + mi := &file_hero_hero_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1561,7 +1608,7 @@ func (x *HeroDrawCardResp) String() string { func (*HeroDrawCardResp) ProtoMessage() {} func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[29] + mi := &file_hero_hero_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1574,7 +1621,7 @@ func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardResp.ProtoReflect.Descriptor instead. func (*HeroDrawCardResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{30} } func (x *HeroDrawCardResp) GetHeroes() []string { @@ -1596,7 +1643,7 @@ type HeroChangePush struct { func (x *HeroChangePush) Reset() { *x = HeroChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[30] + mi := &file_hero_hero_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1609,7 +1656,7 @@ func (x *HeroChangePush) String() string { func (*HeroChangePush) ProtoMessage() {} func (x *HeroChangePush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[30] + mi := &file_hero_hero_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1622,7 +1669,7 @@ func (x *HeroChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroChangePush.ProtoReflect.Descriptor instead. func (*HeroChangePush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{30} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{31} } func (x *HeroChangePush) GetList() []*DBHero { @@ -1710,74 +1757,77 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 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, 0x71, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, - 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 0x09, 0x52, 0x07, - 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, + 0x65, 0x72, 0x67, 0x79, 0x22, 0x44, 0x0a, 0x0a, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x44, 0x61, + 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, + 0x01, 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, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x5e, 0x0a, 0x19, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 0x23, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x39, 0x0a, 0x1a, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, + 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, + 0x6b, 0x65, 0x6e, 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, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, + 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, + 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x22, 0x31, + 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, + 0x73, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, + 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, + 0x75, 0x73, 0x68, 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, 0x44, 0x0a, 0x0b, 0x61, + 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, + 0x75, 0x73, 0x68, 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, 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, 0x09, 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, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25, + 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, + 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, + 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, + 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, - 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, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, + 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, + 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, + 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, + 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, + 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, + 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, - 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, - 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x22, 0x31, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0xaa, - 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x08, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, - 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, - 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, 0x44, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, - 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, - 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, 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, 0x09, 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, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25, 0x0a, 0x0b, 0x48, - 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, - 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, - 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, - 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, - 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x68, - 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, - 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, - 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, - 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x22, 0x2a, 0x0a, 0x10, - 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, - 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, - 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, - 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x2d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x22, + 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48, + 0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, + 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1792,7 +1842,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 33) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -1811,49 +1861,51 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroResonanceResp)(nil), // 14: HeroResonanceResp (*HeroResonanceResetReq)(nil), // 15: HeroResonanceResetReq (*HeroResonanceResetResp)(nil), // 16: HeroResonanceResetResp - (*HeroResonanceUseEnergyReq)(nil), // 17: HeroResonanceUseEnergyReq - (*HeroResonanceUseEnergyResp)(nil), // 18: HeroResonanceUseEnergyResp - (*HeroAwakenReq)(nil), // 19: HeroAwakenReq - (*HeroAwakenResp)(nil), // 20: HeroAwakenResp - (*HeroChoukaReq)(nil), // 21: HeroChoukaReq - (*HeroChoukaResp)(nil), // 22: HeroChoukaResp - (*HeroPropertyPush)(nil), // 23: HeroPropertyPush - (*HeroLockReq)(nil), // 24: HeroLockReq - (*HeroLockResp)(nil), // 25: HeroLockResp - (*HeroGetSpecifiedReq)(nil), // 26: HeroGetSpecifiedReq - (*HeroGetSpecifiedResp)(nil), // 27: HeroGetSpecifiedResp - (*HeroDrawCardReq)(nil), // 28: HeroDrawCardReq - (*HeroDrawCardResp)(nil), // 29: HeroDrawCardResp - (*HeroChangePush)(nil), // 30: HeroChangePush - nil, // 31: HeroPropertyPush.PropertyEntry - nil, // 32: HeroPropertyPush.AddPropertyEntry - (*DBHero)(nil), // 33: DBHero + (*EnergyData)(nil), // 17: EnergyData + (*HeroResonanceUseEnergyReq)(nil), // 18: HeroResonanceUseEnergyReq + (*HeroResonanceUseEnergyResp)(nil), // 19: HeroResonanceUseEnergyResp + (*HeroAwakenReq)(nil), // 20: HeroAwakenReq + (*HeroAwakenResp)(nil), // 21: HeroAwakenResp + (*HeroChoukaReq)(nil), // 22: HeroChoukaReq + (*HeroChoukaResp)(nil), // 23: HeroChoukaResp + (*HeroPropertyPush)(nil), // 24: HeroPropertyPush + (*HeroLockReq)(nil), // 25: HeroLockReq + (*HeroLockResp)(nil), // 26: HeroLockResp + (*HeroGetSpecifiedReq)(nil), // 27: HeroGetSpecifiedReq + (*HeroGetSpecifiedResp)(nil), // 28: HeroGetSpecifiedResp + (*HeroDrawCardReq)(nil), // 29: HeroDrawCardReq + (*HeroDrawCardResp)(nil), // 30: HeroDrawCardResp + (*HeroChangePush)(nil), // 31: HeroChangePush + nil, // 32: HeroPropertyPush.PropertyEntry + nil, // 33: HeroPropertyPush.AddPropertyEntry + (*DBHero)(nil), // 34: DBHero } var file_hero_hero_msg_proto_depIdxs = []int32{ - 33, // 0: HeroInfoResp.base:type_name -> DBHero - 33, // 1: HeroListResp.list:type_name -> DBHero + 34, // 0: HeroInfoResp.base:type_name -> DBHero + 34, // 1: HeroListResp.list:type_name -> DBHero 5, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32 - 33, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 34, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero 8, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData 8, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData - 33, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 33, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 33, // 8: HeroResonanceResp.hero:type_name -> DBHero - 33, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero - 33, // 10: HeroResonanceResetResp.hero:type_name -> DBHero - 33, // 11: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 33, // 12: HeroAwakenResp.hero:type_name -> DBHero - 33, // 13: HeroChoukaResp.heroes:type_name -> DBHero - 31, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 32, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 33, // 16: HeroLockResp.hero:type_name -> DBHero - 33, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero - 33, // 18: HeroChangePush.list:type_name -> DBHero - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 34, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 34, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 34, // 8: HeroResonanceResp.hero:type_name -> DBHero + 34, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero + 34, // 10: HeroResonanceResetResp.hero:type_name -> DBHero + 17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData + 34, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero + 34, // 13: HeroAwakenResp.hero:type_name -> DBHero + 34, // 14: HeroChoukaResp.heroes:type_name -> DBHero + 32, // 15: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 33, // 16: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 34, // 17: HeroLockResp.hero:type_name -> DBHero + 34, // 18: HeroGetSpecifiedResp.hero:type_name -> DBHero + 34, // 19: HeroChangePush.list:type_name -> DBHero + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -2068,7 +2120,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.(*HeroResonanceUseEnergyReq); i { + switch v := v.(*EnergyData); i { case 0: return &v.state case 1: @@ -2080,7 +2132,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.(*HeroResonanceUseEnergyResp); i { + switch v := v.(*HeroResonanceUseEnergyReq); i { case 0: return &v.state case 1: @@ -2092,7 +2144,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.(*HeroAwakenReq); i { + switch v := v.(*HeroResonanceUseEnergyResp); i { case 0: return &v.state case 1: @@ -2104,7 +2156,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroAwakenResp); i { + switch v := v.(*HeroAwakenReq); i { case 0: return &v.state case 1: @@ -2116,7 +2168,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroChoukaReq); i { + switch v := v.(*HeroAwakenResp); i { case 0: return &v.state case 1: @@ -2128,7 +2180,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroChoukaResp); i { + switch v := v.(*HeroChoukaReq); i { case 0: return &v.state case 1: @@ -2140,7 +2192,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroPropertyPush); i { + switch v := v.(*HeroChoukaResp); i { case 0: return &v.state case 1: @@ -2152,7 +2204,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroLockReq); i { + switch v := v.(*HeroPropertyPush); i { case 0: return &v.state case 1: @@ -2164,7 +2216,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroLockResp); i { + switch v := v.(*HeroLockReq); i { case 0: return &v.state case 1: @@ -2176,7 +2228,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroGetSpecifiedReq); i { + switch v := v.(*HeroLockResp); i { case 0: return &v.state case 1: @@ -2188,7 +2240,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroGetSpecifiedResp); i { + switch v := v.(*HeroGetSpecifiedReq); i { case 0: return &v.state case 1: @@ -2200,7 +2252,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroDrawCardReq); i { + switch v := v.(*HeroGetSpecifiedResp); i { case 0: return &v.state case 1: @@ -2212,7 +2264,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroDrawCardResp); i { + switch v := v.(*HeroDrawCardReq); i { case 0: return &v.state case 1: @@ -2224,6 +2276,18 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroDrawCardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroChangePush); i { case 0: return &v.state @@ -2242,7 +2306,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 33, + NumMessages: 34, NumExtensions: 0, NumServices: 0, },