From 4406de02c45715f74fac67ee903144f32d22848a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 29 Jun 2022 18:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_heroResonance.go | 26 +-- modules/hero/api_heroResonanceReset.go | 6 +- modules/hero/api_heroResonanceSelect.go | 6 +- modules/hero/api_heroSkillUp.go | 11 +- modules/hero/api_heroStarUp.go | 22 +- pb/hero_msg.pb.go | 283 ++++++++++++------------ pb/proto/hero/hero_msg.proto | 12 +- 7 files changed, 183 insertions(+), 183 deletions(-) diff --git a/modules/hero/api_heroResonance.go b/modules/hero/api_heroResonance.go index cf6060b20..04ef478ec 100644 --- a/modules/hero/api_heroResonance.go +++ b/modules/hero/api_heroResonance.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) HeroResonanceCheck(session comm.IUserSession, req *pb.HeroGongmingReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ResonanceCheck(session comm.IUserSession, req *pb.HeroResonanceReq) (result map[string]interface{}, code comm.ErrorCode) { if req.HeroObjID == "" || req.CostObjID == "" { code.Code = pb.ErrorCode_ReqParameterError return @@ -72,25 +72,25 @@ func (this *apiComp) HeroResonanceCheck(session comm.IUserSession, req *pb.HeroG code.Code = pb.ErrorCode_ResNoEnough return } - + result = map[string]interface{}{ + "heroObj": _hero, + } return } /// 英雄共鸣 -func (this *apiComp) HeroResonance(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroGongmingReq) (code pb.ErrorCode) { - - defer func() { - if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroGongmingResp{}) - } - }() - - _hero, errr := this.moduleHero.modelHero.moduleHero.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 - if errr != 0 { +func (this *apiComp) Resonance(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroResonanceReq) (code pb.ErrorCode) { + _hero := agrs["heroObj"].(*pb.DBHero) + if _hero == nil { code = pb.ErrorCode_HeroNoExist - log.Errorf("not find card:%s,%v", req.HeroObjID, errr) + log.Errorf("not find card:%s,", req.HeroObjID) return } + defer func() { + if code == pb.ErrorCode_Success { + session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroResonanceResp{Hero: _hero}) + } + }() code = this.moduleHero.DelCard(req.CostObjID, req.Amount) if code != 0 { diff --git a/modules/hero/api_heroResonanceReset.go b/modules/hero/api_heroResonanceReset.go index c71bbc506..fdd567d40 100644 --- a/modules/hero/api_heroResonanceReset.go +++ b/modules/hero/api_heroResonanceReset.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) ResonanceRestCheck(session comm.IUserSession, req *pb.HeroGongmingResetReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ResonanceResetCheck(session comm.IUserSession, req *pb.HeroResonanceResetReq) (result map[string]interface{}, code comm.ErrorCode) { if req.HeroObjID == "" { code.Code = pb.ErrorCode_ReqParameterError return @@ -58,7 +58,7 @@ func (this *apiComp) ResonanceRestCheck(session comm.IUserSession, req *pb.HeroG } /// 英雄共鸣 -func (this *apiComp) ResonanceRest(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroGongmingResetReq) (code pb.ErrorCode) { +func (this *apiComp) ResonanceReset(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroResonanceResetReq) (code pb.ErrorCode) { restResonance := agrs["resonateNum"].(int32) _hero := agrs["heroObj"].(*pb.DBHero) @@ -66,7 +66,7 @@ func (this *apiComp) ResonanceRest(session comm.IUserSession, agrs map[string]in defer func() { if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), "GongmingReset", &pb.HeroGongmingResetResp{Hero: _hero, Energy: _hero.ResonateNum}) + session.SendMsg(string(this.moduleHero.GetType()), "ResonanceReset", &pb.HeroResonanceResetResp{Hero: _hero, Energy: _hero.ResonateNum}) } }() diff --git a/modules/hero/api_heroResonanceSelect.go b/modules/hero/api_heroResonanceSelect.go index 030c4040d..fb39941ab 100644 --- a/modules/hero/api_heroResonanceSelect.go +++ b/modules/hero/api_heroResonanceSelect.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) GongmingUseEnergyCheck(session comm.IUserSession, req *pb.HeroGongmingUseEnergyReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (result map[string]interface{}, code comm.ErrorCode) { if req.HeroObjID == "" || req.UseEnergy <= 0 || req.UseType < 0 { code.Code = pb.ErrorCode_ReqParameterError return @@ -27,12 +27,12 @@ func (this *apiComp) GongmingUseEnergyCheck(session comm.IUserSession, req *pb.H return } -func (this *apiComp) GongmingUseEnergy(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroGongmingUseEnergyReq) (code pb.ErrorCode) { +func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode) { _hero := agrs["heroObj"].(*pb.DBHero) defer func() { if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroGongmingUseEnergyResp{Hero: _hero}) + session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroResonanceUseEnergyResp{Hero: _hero}) } }() diff --git a/modules/hero/api_heroSkillUp.go b/modules/hero/api_heroSkillUp.go index 326d2146c..3e697990c 100644 --- a/modules/hero/api_heroSkillUp.go +++ b/modules/hero/api_heroSkillUp.go @@ -55,12 +55,6 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H /// 英雄技能升级 func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode) { - - defer func() { - if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUpSkillResp{}) - } - }() var ( tagHero int32 // 操作的英雄（configid） tmpUpSkillID map[int32]*pb.SkillData // 即将要升级的技能id @@ -78,6 +72,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, agrs map[strin log.Errorf("not find card:%s,", req.HeroObjID) return } + defer func() { + if code == pb.ErrorCode_Success { + session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUpSkillResp{Hero: _hero}) + } + }() log.Debugf("英雄:%d 技能升级", tagHero) config, err := this.moduleHero.configure.GetHeroSkillUpConfig() if err != nil { diff --git a/modules/hero/api_heroStarUp.go b/modules/hero/api_heroStarUp.go index a82a8a7b4..08931fd7e 100644 --- a/modules/hero/api_heroStarUp.go +++ b/modules/hero/api_heroStarUp.go @@ -96,21 +96,26 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He result = map[string]interface{}{ "costGold": target.Gold, + "heroObj": tagHero, } return } /// 英雄升星 func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode) { - var ( - costGold int32 // 当前需要消耗金币的数量 - ) + + costGold := agrs["costGold"].(int32) + _hero := agrs["heroObj"].(*pb.DBHero) + if _hero == nil { + code = pb.ErrorCode_HeroNoExist + return + } defer func() { if code == pb.ErrorCode_Success { - session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUpStarResp{}) + session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUpStarResp{Hero: _hero}) } }() - costGold = agrs["costGold"].(int32) + // 消耗道具 code = this.user.AddAttributeValue(session.GetUserId(), "gold", -costGold) // 减少金币 if code != pb.ErrorCode_Success { @@ -136,12 +141,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string return } } - _hero, errr := this.moduleHero.modelHero.moduleHero.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 - if errr != 0 { - code = pb.ErrorCode_HeroNoExist - log.Errorf("not find card:%s,%v", req.HeroObjID, errr) - return - } + _hero.Star += 1 _heroMap := map[string]interface{}{ "star": _hero.Star, } diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 9c031091e..3f3b710ff 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -640,7 +640,7 @@ func (x *HeroStrengthenUpSkillResp) GetHero() *DBHero { } // 共鸣英雄 -type HeroGongmingReq struct { +type HeroResonanceReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -650,8 +650,8 @@ type HeroGongmingReq struct { Amount int32 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount"` // 消耗的数量 } -func (x *HeroGongmingReq) Reset() { - *x = HeroGongmingReq{} +func (x *HeroResonanceReq) Reset() { + *x = HeroResonanceReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -659,13 +659,13 @@ func (x *HeroGongmingReq) Reset() { } } -func (x *HeroGongmingReq) String() string { +func (x *HeroResonanceReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*HeroGongmingReq) ProtoMessage() {} +func (*HeroResonanceReq) ProtoMessage() {} -func (x *HeroGongmingReq) ProtoReflect() protoreflect.Message { +func (x *HeroResonanceReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -677,33 +677,33 @@ func (x *HeroGongmingReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use HeroGongmingReq.ProtoReflect.Descriptor instead. -func (*HeroGongmingReq) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroResonanceReq.ProtoReflect.Descriptor instead. +func (*HeroResonanceReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{12} } -func (x *HeroGongmingReq) GetHeroObjID() string { +func (x *HeroResonanceReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *HeroGongmingReq) GetCostObjID() string { +func (x *HeroResonanceReq) GetCostObjID() string { if x != nil { return x.CostObjID } return "" } -func (x *HeroGongmingReq) GetAmount() int32 { +func (x *HeroResonanceReq) GetAmount() int32 { if x != nil { return x.Amount } return 0 } -type HeroGongmingResp struct { +type HeroResonanceResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -713,8 +713,8 @@ type HeroGongmingResp struct { UpStarCard *DBHero `protobuf:"bytes,3,opt,name=upStarCard,proto3" json:"upStarCard"` //共鸣成功 获得的升星卡 } -func (x *HeroGongmingResp) Reset() { - *x = HeroGongmingResp{} +func (x *HeroResonanceResp) Reset() { + *x = HeroResonanceResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -722,13 +722,13 @@ func (x *HeroGongmingResp) Reset() { } } -func (x *HeroGongmingResp) String() string { +func (x *HeroResonanceResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*HeroGongmingResp) ProtoMessage() {} +func (*HeroResonanceResp) ProtoMessage() {} -func (x *HeroGongmingResp) ProtoReflect() protoreflect.Message { +func (x *HeroResonanceResp) 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 *HeroGongmingResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use HeroGongmingResp.ProtoReflect.Descriptor instead. -func (*HeroGongmingResp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroResonanceResp.ProtoReflect.Descriptor instead. +func (*HeroResonanceResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{13} } -func (x *HeroGongmingResp) GetHero() *DBHero { +func (x *HeroResonanceResp) GetHero() *DBHero { if x != nil { return x.Hero } return nil } -func (x *HeroGongmingResp) GetEnergy() int32 { +func (x *HeroResonanceResp) GetEnergy() int32 { if x != nil { return x.Energy } return 0 } -func (x *HeroGongmingResp) GetUpStarCard() *DBHero { +func (x *HeroResonanceResp) GetUpStarCard() *DBHero { if x != nil { return x.UpStarCard } @@ -767,7 +767,7 @@ func (x *HeroGongmingResp) GetUpStarCard() *DBHero { } // 重置共鸣属性 -type HeroGongmingResetReq struct { +type HeroResonanceResetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -775,8 +775,8 @@ type HeroGongmingResetReq struct { HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID } -func (x *HeroGongmingResetReq) Reset() { - *x = HeroGongmingResetReq{} +func (x *HeroResonanceResetReq) Reset() { + *x = HeroResonanceResetReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -784,13 +784,13 @@ func (x *HeroGongmingResetReq) Reset() { } } -func (x *HeroGongmingResetReq) String() string { +func (x *HeroResonanceResetReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*HeroGongmingResetReq) ProtoMessage() {} +func (*HeroResonanceResetReq) ProtoMessage() {} -func (x *HeroGongmingResetReq) ProtoReflect() protoreflect.Message { +func (x *HeroResonanceResetReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -802,19 +802,19 @@ func (x *HeroGongmingResetReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use HeroGongmingResetReq.ProtoReflect.Descriptor instead. -func (*HeroGongmingResetReq) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroResonanceResetReq.ProtoReflect.Descriptor instead. +func (*HeroResonanceResetReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{14} } -func (x *HeroGongmingResetReq) GetHeroObjID() string { +func (x *HeroResonanceResetReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -type HeroGongmingResetResp struct { +type HeroResonanceResetResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -823,8 +823,8 @@ type HeroGongmingResetResp struct { Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 能量点数 } -func (x *HeroGongmingResetResp) Reset() { - *x = HeroGongmingResetResp{} +func (x *HeroResonanceResetResp) Reset() { + *x = HeroResonanceResetResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -832,13 +832,13 @@ func (x *HeroGongmingResetResp) Reset() { } } -func (x *HeroGongmingResetResp) String() string { +func (x *HeroResonanceResetResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*HeroGongmingResetResp) ProtoMessage() {} +func (*HeroResonanceResetResp) ProtoMessage() {} -func (x *HeroGongmingResetResp) ProtoReflect() protoreflect.Message { +func (x *HeroResonanceResetResp) 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 *HeroGongmingResetResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use HeroGongmingResetResp.ProtoReflect.Descriptor instead. -func (*HeroGongmingResetResp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroResonanceResetResp.ProtoReflect.Descriptor instead. +func (*HeroResonanceResetResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{15} } -func (x *HeroGongmingResetResp) GetHero() *DBHero { +func (x *HeroResonanceResetResp) GetHero() *DBHero { if x != nil { return x.Hero } return nil } -func (x *HeroGongmingResetResp) GetEnergy() int32 { +func (x *HeroResonanceResetResp) GetEnergy() int32 { if x != nil { return x.Energy } @@ -870,7 +870,7 @@ func (x *HeroGongmingResetResp) GetEnergy() int32 { } // 使用能量点数 -type HeroGongmingUseEnergyReq struct { +type HeroResonanceUseEnergyReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -880,8 +880,8 @@ type HeroGongmingUseEnergyReq struct { UseType int32 `protobuf:"varint,3,opt,name=useType,proto3" json:"useType"` // 使用的类型 （攻击、血量、防御） } -func (x *HeroGongmingUseEnergyReq) Reset() { - *x = HeroGongmingUseEnergyReq{} +func (x *HeroResonanceUseEnergyReq) Reset() { + *x = HeroResonanceUseEnergyReq{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -889,13 +889,13 @@ func (x *HeroGongmingUseEnergyReq) Reset() { } } -func (x *HeroGongmingUseEnergyReq) String() string { +func (x *HeroResonanceUseEnergyReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*HeroGongmingUseEnergyReq) ProtoMessage() {} +func (*HeroResonanceUseEnergyReq) ProtoMessage() {} -func (x *HeroGongmingUseEnergyReq) ProtoReflect() protoreflect.Message { +func (x *HeroResonanceUseEnergyReq) ProtoReflect() protoreflect.Message { mi := &file_hero_hero_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -907,33 +907,33 @@ func (x *HeroGongmingUseEnergyReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use HeroGongmingUseEnergyReq.ProtoReflect.Descriptor instead. -func (*HeroGongmingUseEnergyReq) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroResonanceUseEnergyReq.ProtoReflect.Descriptor instead. +func (*HeroResonanceUseEnergyReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{16} } -func (x *HeroGongmingUseEnergyReq) GetHeroObjID() string { +func (x *HeroResonanceUseEnergyReq) GetHeroObjID() string { if x != nil { return x.HeroObjID } return "" } -func (x *HeroGongmingUseEnergyReq) GetUseEnergy() int32 { +func (x *HeroResonanceUseEnergyReq) GetUseEnergy() int32 { if x != nil { return x.UseEnergy } return 0 } -func (x *HeroGongmingUseEnergyReq) GetUseType() int32 { +func (x *HeroResonanceUseEnergyReq) GetUseType() int32 { if x != nil { return x.UseType } return 0 } -type HeroGongmingUseEnergyResp struct { +type HeroResonanceUseEnergyResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -941,8 +941,8 @@ type HeroGongmingUseEnergyResp struct { Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 } -func (x *HeroGongmingUseEnergyResp) Reset() { - *x = HeroGongmingUseEnergyResp{} +func (x *HeroResonanceUseEnergyResp) Reset() { + *x = HeroResonanceUseEnergyResp{} if protoimpl.UnsafeEnabled { mi := &file_hero_hero_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -950,13 +950,13 @@ func (x *HeroGongmingUseEnergyResp) Reset() { } } -func (x *HeroGongmingUseEnergyResp) String() string { +func (x *HeroResonanceUseEnergyResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*HeroGongmingUseEnergyResp) ProtoMessage() {} +func (*HeroResonanceUseEnergyResp) ProtoMessage() {} -func (x *HeroGongmingUseEnergyResp) ProtoReflect() protoreflect.Message { +func (x *HeroResonanceUseEnergyResp) 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 *HeroGongmingUseEnergyResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use HeroGongmingUseEnergyResp.ProtoReflect.Descriptor instead. -func (*HeroGongmingUseEnergyResp) Descriptor() ([]byte, []int) { +// Deprecated: Use HeroResonanceUseEnergyResp.ProtoReflect.Descriptor instead. +func (*HeroResonanceUseEnergyResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} } -func (x *HeroGongmingUseEnergyResp) GetHero() *DBHero { +func (x *HeroResonanceUseEnergyResp) GetHero() *DBHero { if x != nil { return x.Hero } @@ -1226,54 +1226,55 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 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, 0x65, 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, - 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, 0x76, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, - 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, + 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, + 0x63, 0x65, 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, 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, 0x77, 0x0a, 0x11, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, + 0x6e, 0x63, 0x65, 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, 0x50, 0x0a, 0x16, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 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, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x3c, + 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, 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, 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, 0x22, 0x0f, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, - 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, - 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 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, 0x22, 0x0f, 0x0a, 0x0d, 0x48, + 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x0e, + 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, + 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, + 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, + 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -1290,29 +1291,29 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_hero_hero_msg_proto_goTypes = []interface{}{ - (*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 - (*HeroChoukaReq)(nil), // 20: pb.HeroChoukaReq - (*HeroChoukaResp)(nil), // 21: pb.HeroChoukaResp - (*DBHero)(nil), // 22: pb.DBHero + (*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 + (*HeroResonanceReq)(nil), // 12: pb.HeroResonanceReq + (*HeroResonanceResp)(nil), // 13: pb.HeroResonanceResp + (*HeroResonanceResetReq)(nil), // 14: pb.HeroResonanceResetReq + (*HeroResonanceResetResp)(nil), // 15: pb.HeroResonanceResetResp + (*HeroResonanceUseEnergyReq)(nil), // 16: pb.HeroResonanceUseEnergyReq + (*HeroResonanceUseEnergyResp)(nil), // 17: pb.HeroResonanceUseEnergyResp + (*HeroJuexingReq)(nil), // 18: pb.HeroJuexingReq + (*HeroJuexingResp)(nil), // 19: pb.HeroJuexingResp + (*HeroChoukaReq)(nil), // 20: pb.HeroChoukaReq + (*HeroChoukaResp)(nil), // 21: pb.HeroChoukaResp + (*DBHero)(nil), // 22: pb.DBHero } var file_hero_hero_msg_proto_depIdxs = []int32{ 22, // 0: pb.HeroInfoRsp.base:type_name -> pb.DBHero @@ -1322,10 +1323,10 @@ var file_hero_hero_msg_proto_depIdxs = []int32{ 7, // 4: pb.HeroStrengthenUpStarReq.heroRace:type_name -> pb.CostCardData 22, // 5: pb.HeroStrengthenUpStarResp.hero:type_name -> pb.DBHero 22, // 6: pb.HeroStrengthenUpSkillResp.hero:type_name -> pb.DBHero - 22, // 7: pb.HeroGongmingResp.hero:type_name -> pb.DBHero - 22, // 8: pb.HeroGongmingResp.upStarCard:type_name -> pb.DBHero - 22, // 9: pb.HeroGongmingResetResp.hero:type_name -> pb.DBHero - 22, // 10: pb.HeroGongmingUseEnergyResp.hero:type_name -> pb.DBHero + 22, // 7: pb.HeroResonanceResp.hero:type_name -> pb.DBHero + 22, // 8: pb.HeroResonanceResp.upStarCard:type_name -> pb.DBHero + 22, // 9: pb.HeroResonanceResetResp.hero:type_name -> pb.DBHero + 22, // 10: pb.HeroResonanceUseEnergyResp.hero:type_name -> pb.DBHero 4, // 11: pb.HeroJuexingReq.costItmes:type_name -> pb.ItemData 22, // 12: pb.HeroJuexingResp.hero:type_name -> pb.DBHero 22, // 13: pb.HeroChoukaResp.heroes:type_name -> pb.DBHero @@ -1488,7 +1489,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.(*HeroGongmingReq); i { + switch v := v.(*HeroResonanceReq); i { case 0: return &v.state case 1: @@ -1500,7 +1501,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.(*HeroGongmingResp); i { + switch v := v.(*HeroResonanceResp); i { case 0: return &v.state case 1: @@ -1512,7 +1513,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.(*HeroGongmingResetReq); i { + switch v := v.(*HeroResonanceResetReq); i { case 0: return &v.state case 1: @@ -1524,7 +1525,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.(*HeroGongmingResetResp); i { + switch v := v.(*HeroResonanceResetResp); i { case 0: return &v.state case 1: @@ -1536,7 +1537,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.(*HeroGongmingUseEnergyReq); i { + switch v := v.(*HeroResonanceUseEnergyReq); i { case 0: return &v.state case 1: @@ -1548,7 +1549,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.(*HeroGongmingUseEnergyResp); i { + switch v := v.(*HeroResonanceUseEnergyResp); i { case 0: return &v.state case 1: diff --git a/pb/proto/hero/hero_msg.proto b/pb/proto/hero/hero_msg.proto index a1338eadf..143e87e24 100644 --- a/pb/proto/hero/hero_msg.proto +++ b/pb/proto/hero/hero_msg.proto @@ -63,36 +63,36 @@ message HeroStrengthenUpSkillResp { } // 共鸣英雄 -message HeroGongmingReq { +message HeroResonanceReq { string heroObjID = 1; // 英雄对象ID string costObjID = 2; // 消耗对象 int32 amount = 3;// 消耗的数量 } -message HeroGongmingResp { +message HeroResonanceResp { DBHero hero = 1; // 英雄对象 int32 energy = 2; // 共鸣成功 获得的能量点数 DBHero upStarCard = 3; //共鸣成功 获得的升星卡 } // 重置共鸣属性 -message HeroGongmingResetReq { +message HeroResonanceResetReq { string heroObjID = 1; // 英雄对象ID } -message HeroGongmingResetResp { +message HeroResonanceResetResp { DBHero hero = 1; // 英雄对象 int32 energy = 2; // 能量点数 } // 使用能量点数 -message HeroGongmingUseEnergyReq { +message HeroResonanceUseEnergyReq { string heroObjID = 1; // 英雄对象ID int32 useEnergy = 2; // 使用的能量点数 int32 useType = 3; // 使用的类型 （攻击、血量、防御） } -message HeroGongmingUseEnergyResp { +message HeroResonanceUseEnergyResp { DBHero hero = 1; // 英雄对象 }