diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go
index 0131dc749..bb473b423 100644
--- a/modules/hero/api_strengthenUplv.go
+++ b/modules/hero/api_strengthenUplv.go
@@ -14,8 +14,8 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
-	for k, v := range req.ExpCards {
-		if v <= 0 || k == "" {
+	for _, v := range req.ExpCards {
+		if v.Value <= 0 || v.Key == "" {
 			code = pb.ErrorCode_ReqParameterError
 			return
 		}
@@ -51,8 +51,8 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 		code = pb.ErrorCode_HeroTypeErr
 		return
 	}
-	for k, v := range req.ExpCards {
-		_expHero, code = this.module.GetHero(session.GetUserId(), k) // 校验需要消耗经验卡牌的对象是否存在
+	for _, v := range req.ExpCards {
+		_expHero, code = this.module.GetHero(session.GetUserId(), v.Key) // 校验需要消耗经验卡牌的对象是否存在
 		if code != pb.ErrorCode_Success {
 			return
 		}
@@ -61,17 +61,17 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 			return
 		}
 
-		if v > _expHero.SameCount { // 校验数量
+		if v.Value > _expHero.SameCount { // 校验数量
 			code = pb.ErrorCode_HeroNoEnough
 			return
 		}
 		// 查询 本次消耗会获得多少经验
 		expConf := this.module.configure.GetHeroExp(_expHero.HeroID)
 		if expConf != nil {
-			addExp += expConf.Heroexp * v
+			addExp += expConf.Heroexp * v.Value
 		}
-		costGold = expConf.Needgold * v // 需要消耗的金币
-		if _expHero.SameCount < v {     // 消耗经验卡片数量不足
+		costGold = expConf.Needgold * v.Value // 需要消耗的金币
+		if _expHero.SameCount < v.Value {     // 消耗经验卡片数量不足
 			code = pb.ErrorCode_HeroNoEnough
 			return
 		}
@@ -162,8 +162,8 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 	}
 
 	// 删除经验卡
-	for k, v := range req.ExpCards {
-		costHero, err1 := this.module.modelHero.consumeHeroCard(session.GetUserId(), k, v)
+	for _, v := range req.ExpCards {
+		costHero, err1 := this.module.modelHero.consumeHeroCard(session.GetUserId(), v.Key, v.Value)
 		if err1 != nil {
 			code = pb.ErrorCode_HeroNoEnough
 			this.module.Errorf("delete err failed err:%T!", err1)
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index 0d1138cd7..0ca35684e 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -256,20 +256,75 @@ func (x *ItemData) GetAmount() int32 {
 	return 0
 }
 
+type MapStringInt32 struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Key   string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key"`
+	Value int32  `protobuf:"varint,2,opt,name=Value,proto3" json:"Value"`
+}
+
+func (x *MapStringInt32) Reset() {
+	*x = MapStringInt32{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hero_hero_msg_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MapStringInt32) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MapStringInt32) ProtoMessage() {}
+
+func (x *MapStringInt32) ProtoReflect() protoreflect.Message {
+	mi := &file_hero_hero_msg_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MapStringInt32.ProtoReflect.Descriptor instead.
+func (*MapStringInt32) Descriptor() ([]byte, []int) {
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *MapStringInt32) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *MapStringInt32) GetValue() int32 {
+	if x != nil {
+		return x.Value
+	}
+	return 0
+}
+
 // 卡牌升级
 type HeroStrengthenUplvReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	HeroObjID string           `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID
-	ExpCards  map[string]int32 `protobuf:"bytes,2,rep,name=expCards,proto3" json:"expCards" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	HeroObjID string            `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID
+	ExpCards  []*MapStringInt32 `protobuf:"bytes,2,rep,name=expCards,proto3" json:"expCards"`
 }
 
 func (x *HeroStrengthenUplvReq) Reset() {
 	*x = HeroStrengthenUplvReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[5]
+		mi := &file_hero_hero_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -282,7 +337,7 @@ func (x *HeroStrengthenUplvReq) String() string {
 func (*HeroStrengthenUplvReq) ProtoMessage() {}
 
 func (x *HeroStrengthenUplvReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[5]
+	mi := &file_hero_hero_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -295,7 +350,7 @@ func (x *HeroStrengthenUplvReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroStrengthenUplvReq.ProtoReflect.Descriptor instead.
 func (*HeroStrengthenUplvReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{5}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *HeroStrengthenUplvReq) GetHeroObjID() string {
@@ -305,7 +360,7 @@ func (x *HeroStrengthenUplvReq) GetHeroObjID() string {
 	return ""
 }
 
-func (x *HeroStrengthenUplvReq) GetExpCards() map[string]int32 {
+func (x *HeroStrengthenUplvReq) GetExpCards() []*MapStringInt32 {
 	if x != nil {
 		return x.ExpCards
 	}
@@ -324,7 +379,7 @@ type HeroStrengthenUplvResp struct {
 func (x *HeroStrengthenUplvResp) Reset() {
 	*x = HeroStrengthenUplvResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[6]
+		mi := &file_hero_hero_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -337,7 +392,7 @@ func (x *HeroStrengthenUplvResp) String() string {
 func (*HeroStrengthenUplvResp) ProtoMessage() {}
 
 func (x *HeroStrengthenUplvResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[6]
+	mi := &file_hero_hero_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -350,7 +405,7 @@ func (x *HeroStrengthenUplvResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroStrengthenUplvResp.ProtoReflect.Descriptor instead.
 func (*HeroStrengthenUplvResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{6}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *HeroStrengthenUplvResp) GetHero() *DBHero {
@@ -372,7 +427,7 @@ type CostCardData struct {
 func (x *CostCardData) Reset() {
 	*x = CostCardData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[7]
+		mi := &file_hero_hero_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -385,7 +440,7 @@ func (x *CostCardData) String() string {
 func (*CostCardData) ProtoMessage() {}
 
 func (x *CostCardData) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[7]
+	mi := &file_hero_hero_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -398,7 +453,7 @@ func (x *CostCardData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CostCardData.ProtoReflect.Descriptor instead.
 func (*CostCardData) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{7}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *CostCardData) GetCostCardObj() string {
@@ -429,7 +484,7 @@ type HeroStrengthenUpStarReq struct {
 func (x *HeroStrengthenUpStarReq) Reset() {
 	*x = HeroStrengthenUpStarReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[8]
+		mi := &file_hero_hero_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -442,7 +497,7 @@ func (x *HeroStrengthenUpStarReq) String() string {
 func (*HeroStrengthenUpStarReq) ProtoMessage() {}
 
 func (x *HeroStrengthenUpStarReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[8]
+	mi := &file_hero_hero_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -455,7 +510,7 @@ func (x *HeroStrengthenUpStarReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroStrengthenUpStarReq.ProtoReflect.Descriptor instead.
 func (*HeroStrengthenUpStarReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{8}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *HeroStrengthenUpStarReq) GetHeroObjID() string {
@@ -491,7 +546,7 @@ type HeroStrengthenUpStarResp struct {
 func (x *HeroStrengthenUpStarResp) Reset() {
 	*x = HeroStrengthenUpStarResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[9]
+		mi := &file_hero_hero_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -504,7 +559,7 @@ func (x *HeroStrengthenUpStarResp) String() string {
 func (*HeroStrengthenUpStarResp) ProtoMessage() {}
 
 func (x *HeroStrengthenUpStarResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[9]
+	mi := &file_hero_hero_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -517,7 +572,7 @@ func (x *HeroStrengthenUpStarResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroStrengthenUpStarResp.ProtoReflect.Descriptor instead.
 func (*HeroStrengthenUpStarResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{9}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *HeroStrengthenUpStarResp) GetHero() *DBHero {
@@ -540,7 +595,7 @@ type HeroStrengthenUpSkillReq struct {
 func (x *HeroStrengthenUpSkillReq) Reset() {
 	*x = HeroStrengthenUpSkillReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[10]
+		mi := &file_hero_hero_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -553,7 +608,7 @@ func (x *HeroStrengthenUpSkillReq) String() string {
 func (*HeroStrengthenUpSkillReq) ProtoMessage() {}
 
 func (x *HeroStrengthenUpSkillReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[10]
+	mi := &file_hero_hero_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -566,7 +621,7 @@ func (x *HeroStrengthenUpSkillReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroStrengthenUpSkillReq.ProtoReflect.Descriptor instead.
 func (*HeroStrengthenUpSkillReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{10}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *HeroStrengthenUpSkillReq) GetHeroObjID() string {
@@ -595,7 +650,7 @@ type HeroStrengthenUpSkillResp struct {
 func (x *HeroStrengthenUpSkillResp) Reset() {
 	*x = HeroStrengthenUpSkillResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[11]
+		mi := &file_hero_hero_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -608,7 +663,7 @@ func (x *HeroStrengthenUpSkillResp) String() string {
 func (*HeroStrengthenUpSkillResp) ProtoMessage() {}
 
 func (x *HeroStrengthenUpSkillResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[11]
+	mi := &file_hero_hero_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -621,7 +676,7 @@ func (x *HeroStrengthenUpSkillResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroStrengthenUpSkillResp.ProtoReflect.Descriptor instead.
 func (*HeroStrengthenUpSkillResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{11}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *HeroStrengthenUpSkillResp) GetHero() *DBHero {
@@ -644,7 +699,7 @@ type HeroResonanceReq struct {
 func (x *HeroResonanceReq) Reset() {
 	*x = HeroResonanceReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[12]
+		mi := &file_hero_hero_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -657,7 +712,7 @@ func (x *HeroResonanceReq) String() string {
 func (*HeroResonanceReq) ProtoMessage() {}
 
 func (x *HeroResonanceReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[12]
+	mi := &file_hero_hero_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -670,7 +725,7 @@ func (x *HeroResonanceReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroResonanceReq.ProtoReflect.Descriptor instead.
 func (*HeroResonanceReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{12}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *HeroResonanceReq) GetHeroObjID() string {
@@ -700,7 +755,7 @@ type HeroResonanceResp struct {
 func (x *HeroResonanceResp) Reset() {
 	*x = HeroResonanceResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[13]
+		mi := &file_hero_hero_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -713,7 +768,7 @@ func (x *HeroResonanceResp) String() string {
 func (*HeroResonanceResp) ProtoMessage() {}
 
 func (x *HeroResonanceResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[13]
+	mi := &file_hero_hero_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -726,7 +781,7 @@ func (x *HeroResonanceResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroResonanceResp.ProtoReflect.Descriptor instead.
 func (*HeroResonanceResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{13}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *HeroResonanceResp) GetHero() *DBHero {
@@ -762,7 +817,7 @@ type HeroResonanceResetReq struct {
 func (x *HeroResonanceResetReq) Reset() {
 	*x = HeroResonanceResetReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[14]
+		mi := &file_hero_hero_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -775,7 +830,7 @@ func (x *HeroResonanceResetReq) String() string {
 func (*HeroResonanceResetReq) ProtoMessage() {}
 
 func (x *HeroResonanceResetReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[14]
+	mi := &file_hero_hero_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -788,7 +843,7 @@ func (x *HeroResonanceResetReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroResonanceResetReq.ProtoReflect.Descriptor instead.
 func (*HeroResonanceResetReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{14}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *HeroResonanceResetReq) GetHeroObjID() string {
@@ -810,7 +865,7 @@ type HeroResonanceResetResp struct {
 func (x *HeroResonanceResetResp) Reset() {
 	*x = HeroResonanceResetResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[15]
+		mi := &file_hero_hero_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -823,7 +878,7 @@ func (x *HeroResonanceResetResp) String() string {
 func (*HeroResonanceResetResp) ProtoMessage() {}
 
 func (x *HeroResonanceResetResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[15]
+	mi := &file_hero_hero_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -836,7 +891,7 @@ func (x *HeroResonanceResetResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroResonanceResetResp.ProtoReflect.Descriptor instead.
 func (*HeroResonanceResetResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{15}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *HeroResonanceResetResp) GetHero() *DBHero {
@@ -867,7 +922,7 @@ type HeroResonanceUseEnergyReq struct {
 func (x *HeroResonanceUseEnergyReq) Reset() {
 	*x = HeroResonanceUseEnergyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[16]
+		mi := &file_hero_hero_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -880,7 +935,7 @@ func (x *HeroResonanceUseEnergyReq) String() string {
 func (*HeroResonanceUseEnergyReq) ProtoMessage() {}
 
 func (x *HeroResonanceUseEnergyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[16]
+	mi := &file_hero_hero_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -893,7 +948,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{16}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *HeroResonanceUseEnergyReq) GetHeroObjID() string {
@@ -928,7 +983,7 @@ type HeroResonanceUseEnergyResp struct {
 func (x *HeroResonanceUseEnergyResp) Reset() {
 	*x = HeroResonanceUseEnergyResp{}
 	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)
 	}
@@ -941,7 +996,7 @@ func (x *HeroResonanceUseEnergyResp) String() string {
 func (*HeroResonanceUseEnergyResp) ProtoMessage() {}
 
 func (x *HeroResonanceUseEnergyResp) 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 {
@@ -954,7 +1009,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{17}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *HeroResonanceUseEnergyResp) GetHero() *DBHero {
@@ -976,7 +1031,7 @@ type HeroAwakenReq struct {
 func (x *HeroAwakenReq) Reset() {
 	*x = HeroAwakenReq{}
 	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)
 	}
@@ -989,7 +1044,7 @@ func (x *HeroAwakenReq) String() string {
 func (*HeroAwakenReq) ProtoMessage() {}
 
 func (x *HeroAwakenReq) 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 {
@@ -1002,7 +1057,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{18}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *HeroAwakenReq) GetHeroObjID() string {
@@ -1024,7 +1079,7 @@ type HeroAwakenResp struct {
 func (x *HeroAwakenResp) Reset() {
 	*x = HeroAwakenResp{}
 	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)
 	}
@@ -1037,7 +1092,7 @@ func (x *HeroAwakenResp) String() string {
 func (*HeroAwakenResp) ProtoMessage() {}
 
 func (x *HeroAwakenResp) 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 {
@@ -1050,7 +1105,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{19}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *HeroAwakenResp) GetHero() *DBHero {
@@ -1072,7 +1127,7 @@ type HeroChoukaReq struct {
 func (x *HeroChoukaReq) Reset() {
 	*x = HeroChoukaReq{}
 	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)
 	}
@@ -1085,7 +1140,7 @@ func (x *HeroChoukaReq) String() string {
 func (*HeroChoukaReq) ProtoMessage() {}
 
 func (x *HeroChoukaReq) 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 {
@@ -1098,7 +1153,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{20}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *HeroChoukaReq) GetHeroIds() []int32 {
@@ -1119,7 +1174,7 @@ type HeroChoukaResp struct {
 func (x *HeroChoukaResp) Reset() {
 	*x = HeroChoukaResp{}
 	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)
 	}
@@ -1132,7 +1187,7 @@ func (x *HeroChoukaResp) String() string {
 func (*HeroChoukaResp) ProtoMessage() {}
 
 func (x *HeroChoukaResp) 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 {
@@ -1145,7 +1200,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{21}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *HeroChoukaResp) GetHeroes() []*DBHero {
@@ -1169,7 +1224,7 @@ type HeroPropertyPush struct {
 func (x *HeroPropertyPush) Reset() {
 	*x = HeroPropertyPush{}
 	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)
 	}
@@ -1182,7 +1237,7 @@ func (x *HeroPropertyPush) String() string {
 func (*HeroPropertyPush) ProtoMessage() {}
 
 func (x *HeroPropertyPush) 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 {
@@ -1195,7 +1250,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{22}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *HeroPropertyPush) GetHeroId() string {
@@ -1231,7 +1286,7 @@ type HeroLockReq struct {
 func (x *HeroLockReq) Reset() {
 	*x = HeroLockReq{}
 	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)
 	}
@@ -1244,7 +1299,7 @@ func (x *HeroLockReq) String() string {
 func (*HeroLockReq) ProtoMessage() {}
 
 func (x *HeroLockReq) 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 {
@@ -1257,7 +1312,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{23}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *HeroLockReq) GetHeroid() string {
@@ -1279,7 +1334,7 @@ type HeroLockResp struct {
 func (x *HeroLockResp) Reset() {
 	*x = HeroLockResp{}
 	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)
 	}
@@ -1292,7 +1347,7 @@ func (x *HeroLockResp) String() string {
 func (*HeroLockResp) ProtoMessage() {}
 
 func (x *HeroLockResp) 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 {
@@ -1305,7 +1360,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{24}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *HeroLockResp) GetHero() *DBHero {
@@ -1330,7 +1385,7 @@ type HeroGetSpecifiedReq struct {
 func (x *HeroGetSpecifiedReq) Reset() {
 	*x = HeroGetSpecifiedReq{}
 	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)
 	}
@@ -1343,7 +1398,7 @@ func (x *HeroGetSpecifiedReq) String() string {
 func (*HeroGetSpecifiedReq) ProtoMessage() {}
 
 func (x *HeroGetSpecifiedReq) 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 {
@@ -1356,7 +1411,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{25}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *HeroGetSpecifiedReq) GetHeroCoinfigID() int32 {
@@ -1398,7 +1453,7 @@ type HeroGetSpecifiedResp struct {
 func (x *HeroGetSpecifiedResp) Reset() {
 	*x = HeroGetSpecifiedResp{}
 	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)
 	}
@@ -1411,7 +1466,7 @@ func (x *HeroGetSpecifiedResp) String() string {
 func (*HeroGetSpecifiedResp) ProtoMessage() {}
 
 func (x *HeroGetSpecifiedResp) 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 {
@@ -1424,7 +1479,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{26}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *HeroGetSpecifiedResp) GetHero() *DBHero {
@@ -1446,7 +1501,7 @@ type HeroDrawCardReq struct {
 func (x *HeroDrawCardReq) Reset() {
 	*x = HeroDrawCardReq{}
 	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)
 	}
@@ -1459,7 +1514,7 @@ func (x *HeroDrawCardReq) String() string {
 func (*HeroDrawCardReq) ProtoMessage() {}
 
 func (x *HeroDrawCardReq) 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 {
@@ -1472,7 +1527,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{27}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *HeroDrawCardReq) GetDrawType() int32 {
@@ -1493,7 +1548,7 @@ type HeroDrawCardResp struct {
 func (x *HeroDrawCardResp) Reset() {
 	*x = HeroDrawCardResp{}
 	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)
 	}
@@ -1506,7 +1561,7 @@ func (x *HeroDrawCardResp) String() string {
 func (*HeroDrawCardResp) ProtoMessage() {}
 
 func (x *HeroDrawCardResp) 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 {
@@ -1519,7 +1574,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{28}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *HeroDrawCardResp) GetHeroes() []int32 {
@@ -1541,7 +1596,7 @@ type HeroChangePush struct {
 func (x *HeroChangePush) Reset() {
 	*x = HeroChangePush{}
 	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)
 	}
@@ -1554,7 +1609,7 @@ func (x *HeroChangePush) String() string {
 func (*HeroChangePush) ProtoMessage() {}
 
 func (x *HeroChangePush) 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 {
@@ -1567,7 +1622,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{29}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *HeroChangePush) GetList() []*DBHero {
@@ -1595,135 +1650,134 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	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, 0xb4, 0x01, 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, 0x40, 0x0a,
-	0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e,
-	0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x2e, 0x45, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x1a,
-	0x3b, 0x0a, 0x0d, 0x45, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 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, 0x35, 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, 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, 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, 0x85, 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, 0x21, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64,
-	0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65,
-	0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43,
-	0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72,
-	0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 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, 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, 0x5a,
-	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, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74,
-	0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63,
-	0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x22, 0x38, 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, 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, 0x4e, 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,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x38, 0x0a, 0x0e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69,
+	0x6e, 0x67, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22,
+	0x62, 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, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62,
-	0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f,
-	0x62, 0x6a, 0x49, 0x44, 0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f,
-	0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 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, 0x27,
-	0x0a, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x07, 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,
+	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2b, 0x0a, 0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72,
+	0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x52, 0x08, 0x65, 0x78, 0x70, 0x43, 0x61,
+	0x72, 0x64, 0x73, 0x22, 0x35, 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, 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, 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, 0x85, 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, 0x22, 0x4d,
-	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, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x21,
+	0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43,
+	0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72,
+	0x6f, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61,
+	0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 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, 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, 0x05, 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,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 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, 0x12,
+	0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62,
+	0x6a, 0x22, 0x38, 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, 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, 0x05, 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, 0x05, 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, 0x05, 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,
+	0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4e, 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, 0x03, 0x28, 0x09,
+	0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x71, 0x0a, 0x11, 0x48,
+	0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 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, 0x27, 0x0a, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43,
+	0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 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, 0x4d, 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,
+	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, 0x05, 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,
+	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, 0x05, 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, 0x05, 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, 0x05,
+	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 (
@@ -1745,32 +1799,32 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*HeroListReq)(nil),                // 2: HeroListReq
 	(*HeroListResp)(nil),               // 3: HeroListResp
 	(*ItemData)(nil),                   // 4: ItemData
-	(*HeroStrengthenUplvReq)(nil),      // 5: HeroStrengthenUplvReq
-	(*HeroStrengthenUplvResp)(nil),     // 6: HeroStrengthenUplvResp
-	(*CostCardData)(nil),               // 7: CostCardData
-	(*HeroStrengthenUpStarReq)(nil),    // 8: HeroStrengthenUpStarReq
-	(*HeroStrengthenUpStarResp)(nil),   // 9: HeroStrengthenUpStarResp
-	(*HeroStrengthenUpSkillReq)(nil),   // 10: HeroStrengthenUpSkillReq
-	(*HeroStrengthenUpSkillResp)(nil),  // 11: HeroStrengthenUpSkillResp
-	(*HeroResonanceReq)(nil),           // 12: HeroResonanceReq
-	(*HeroResonanceResp)(nil),          // 13: HeroResonanceResp
-	(*HeroResonanceResetReq)(nil),      // 14: HeroResonanceResetReq
-	(*HeroResonanceResetResp)(nil),     // 15: HeroResonanceResetResp
-	(*HeroResonanceUseEnergyReq)(nil),  // 16: HeroResonanceUseEnergyReq
-	(*HeroResonanceUseEnergyResp)(nil), // 17: HeroResonanceUseEnergyResp
-	(*HeroAwakenReq)(nil),              // 18: HeroAwakenReq
-	(*HeroAwakenResp)(nil),             // 19: HeroAwakenResp
-	(*HeroChoukaReq)(nil),              // 20: HeroChoukaReq
-	(*HeroChoukaResp)(nil),             // 21: HeroChoukaResp
-	(*HeroPropertyPush)(nil),           // 22: HeroPropertyPush
-	(*HeroLockReq)(nil),                // 23: HeroLockReq
-	(*HeroLockResp)(nil),               // 24: HeroLockResp
-	(*HeroGetSpecifiedReq)(nil),        // 25: HeroGetSpecifiedReq
-	(*HeroGetSpecifiedResp)(nil),       // 26: HeroGetSpecifiedResp
-	(*HeroDrawCardReq)(nil),            // 27: HeroDrawCardReq
-	(*HeroDrawCardResp)(nil),           // 28: HeroDrawCardResp
-	(*HeroChangePush)(nil),             // 29: HeroChangePush
-	nil,                                // 30: HeroStrengthenUplvReq.ExpCardsEntry
+	(*MapStringInt32)(nil),             // 5: MapStringInt32
+	(*HeroStrengthenUplvReq)(nil),      // 6: HeroStrengthenUplvReq
+	(*HeroStrengthenUplvResp)(nil),     // 7: HeroStrengthenUplvResp
+	(*CostCardData)(nil),               // 8: CostCardData
+	(*HeroStrengthenUpStarReq)(nil),    // 9: HeroStrengthenUpStarReq
+	(*HeroStrengthenUpStarResp)(nil),   // 10: HeroStrengthenUpStarResp
+	(*HeroStrengthenUpSkillReq)(nil),   // 11: HeroStrengthenUpSkillReq
+	(*HeroStrengthenUpSkillResp)(nil),  // 12: HeroStrengthenUpSkillResp
+	(*HeroResonanceReq)(nil),           // 13: HeroResonanceReq
+	(*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
@@ -1778,10 +1832,10 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
 var file_hero_hero_msg_proto_depIdxs = []int32{
 	33, // 0: HeroInfoResp.base:type_name -> DBHero
 	33, // 1: HeroListResp.list:type_name -> DBHero
-	30, // 2: HeroStrengthenUplvReq.expCards:type_name -> HeroStrengthenUplvReq.ExpCardsEntry
+	5,  // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32
 	33, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
-	7,  // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
-	7,  // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
+	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
@@ -1870,7 +1924,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.(*HeroStrengthenUplvReq); i {
+			switch v := v.(*MapStringInt32); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1882,7 +1936,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.(*HeroStrengthenUplvResp); i {
+			switch v := v.(*HeroStrengthenUplvReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1894,7 +1948,7 @@ func file_hero_hero_msg_proto_init() {
 			}
 		}
 		file_hero_hero_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CostCardData); i {
+			switch v := v.(*HeroStrengthenUplvResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1906,7 +1960,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.(*HeroStrengthenUpStarReq); i {
+			switch v := v.(*CostCardData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1918,7 +1972,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.(*HeroStrengthenUpStarResp); i {
+			switch v := v.(*HeroStrengthenUpStarReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1930,7 +1984,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.(*HeroStrengthenUpSkillReq); i {
+			switch v := v.(*HeroStrengthenUpStarResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1942,7 +1996,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.(*HeroStrengthenUpSkillResp); i {
+			switch v := v.(*HeroStrengthenUpSkillReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1954,7 +2008,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.(*HeroResonanceReq); i {
+			switch v := v.(*HeroStrengthenUpSkillResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1966,7 +2020,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.(*HeroResonanceResp); i {
+			switch v := v.(*HeroResonanceReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1978,7 +2032,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.(*HeroResonanceResetReq); i {
+			switch v := v.(*HeroResonanceResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1990,7 +2044,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.(*HeroResonanceResetResp); i {
+			switch v := v.(*HeroResonanceResetReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2002,7 +2056,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.(*HeroResonanceUseEnergyReq); i {
+			switch v := v.(*HeroResonanceResetResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2014,7 +2068,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.(*HeroResonanceUseEnergyResp); i {
+			switch v := v.(*HeroResonanceUseEnergyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2026,7 +2080,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.(*HeroAwakenReq); i {
+			switch v := v.(*HeroResonanceUseEnergyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2038,7 +2092,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.(*HeroAwakenResp); i {
+			switch v := v.(*HeroAwakenReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2050,7 +2104,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.(*HeroChoukaReq); i {
+			switch v := v.(*HeroAwakenResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2062,7 +2116,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.(*HeroChoukaResp); i {
+			switch v := v.(*HeroChoukaReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2074,7 +2128,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.(*HeroPropertyPush); i {
+			switch v := v.(*HeroChoukaResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2086,7 +2140,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.(*HeroLockReq); i {
+			switch v := v.(*HeroPropertyPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2098,7 +2152,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.(*HeroLockResp); i {
+			switch v := v.(*HeroLockReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2110,7 +2164,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.(*HeroGetSpecifiedReq); i {
+			switch v := v.(*HeroLockResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2122,7 +2176,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.(*HeroGetSpecifiedResp); i {
+			switch v := v.(*HeroGetSpecifiedReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2134,7 +2188,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.(*HeroDrawCardReq); i {
+			switch v := v.(*HeroGetSpecifiedResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2146,7 +2200,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.(*HeroDrawCardResp); i {
+			switch v := v.(*HeroDrawCardReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2158,6 +2212,18 @@ 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 {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroChangePush); i {
 			case 0:
 				return &v.state
diff --git a/pb/proto/hero/hero_msg.proto b/pb/proto/hero/hero_msg.proto
index 4c92bc3cc..989933a2d 100644
--- a/pb/proto/hero/hero_msg.proto
+++ b/pb/proto/hero/hero_msg.proto
@@ -22,10 +22,15 @@ message ItemData {
   int32 amount = 3; //数量
 }
 
+message MapStringInt32 {
+  string Key = 1;
+  int32 Value = 2;
+}
+
 // 卡牌升级
 message HeroStrengthenUplvReq {
   string heroObjID = 1; // 英雄对象ID
-  map<string, int32> expCards = 2;
+  repeated MapStringInt32 expCards = 2;
 }
 
 // 卡牌升级返回