From 4e75670c3b7664c41b01c33bce9fc19ba77a9b2c Mon Sep 17 00:00:00 2001 From: zqj <582132116@qq.com> Date: Mon, 6 Jun 2022 10:51:14 +0800 Subject: [PATCH] fix: 首次通关记录到数据库 --- cmd/gameserver/action/RoleAction.go | 7 ++++--- pb/game.pb.go | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- protos | 2 +- 3 files changed, 198 insertions(+), 198 deletions(-) diff --git a/cmd/gameserver/action/RoleAction.go b/cmd/gameserver/action/RoleAction.go index b001acf..322bd8b 100644 --- a/cmd/gameserver/action/RoleAction.go +++ b/cmd/gameserver/action/RoleAction.go @@ -208,6 +208,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i } } else { role.Role.PassChapters[req.ChapterId] = chapterCount + 1 + role.UpdateProperty("pass_chapters", role.Role.PassChapters, false) } for k, v := range common.StringToMapNum(carbonInfo.NormalAward) { @@ -236,7 +237,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i t := team.(*models.TeamModel).Team h1, ok := role.Heros[t.HeroId1] if ok { - level, exp := h1.(*models.HeroModel).UpLevel(amount) + level, exp = h1.(*models.HeroModel).UpLevel(amount) h1.SetProperty("level", level) h1.SetProperty("exp", exp) heros = append(heros, h1.(*models.HeroModel).Hero) @@ -244,7 +245,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i h2, ok := role.Heros[t.HeroId2] if ok { - level, exp := h2.(*models.HeroModel).UpLevel(amount) + level, exp = h2.(*models.HeroModel).UpLevel(amount) h2.SetProperty("level", level) h2.SetProperty("exp", exp) heros = append(heros, h2.(*models.HeroModel).Hero) @@ -252,7 +253,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i h3, ok := role.Heros[t.HeroId3] if ok { - level, exp := h3.(*models.HeroModel).UpLevel(amount) + level, exp = h3.(*models.HeroModel).UpLevel(amount) h3.SetProperty("level", level) h3.SetProperty("exp", exp) heros = append(heros, h3.(*models.HeroModel).Hero) diff --git a/pb/game.pb.go b/pb/game.pb.go index 904a386..670f550 100644 --- a/pb/game.pb.go +++ b/pb/game.pb.go @@ -313,21 +313,76 @@ func (x *ChangeTeamReq) GetTeam() []*Team { return nil } +type EquipInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + EquipId string `protobuf:"bytes,1,opt,name=equipId,proto3" json:"equipId,omitempty"` + Pos int32 `protobuf:"varint,2,opt,name=pos,proto3" json:"pos,omitempty"` +} + +func (x *EquipInfo) Reset() { + *x = EquipInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_game_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EquipInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EquipInfo) ProtoMessage() {} + +func (x *EquipInfo) ProtoReflect() protoreflect.Message { + mi := &file_game_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EquipInfo.ProtoReflect.Descriptor instead. +func (*EquipInfo) Descriptor() ([]byte, []int) { + return file_game_proto_rawDescGZIP(), []int{6} +} + +func (x *EquipInfo) GetEquipId() string { + if x != nil { + return x.EquipId + } + return "" +} + +func (x *EquipInfo) GetPos() int32 { + if x != nil { + return x.Pos + } + return 0 +} + //ResponseCmd HeroEquipReferReq type HeroEquipReferReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - EquipIds []*HeroEquipReferReq_EquipInfo `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds,omitempty"` - HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"` - Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴， false 脱下 + EquipIds []*EquipInfo `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds,omitempty"` + HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"` + Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴， false 脱下 } func (x *HeroEquipReferReq) Reset() { *x = HeroEquipReferReq{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[6] + mi := &file_game_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -340,7 +395,7 @@ func (x *HeroEquipReferReq) String() string { func (*HeroEquipReferReq) ProtoMessage() {} func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[6] + mi := &file_game_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -353,10 +408,10 @@ func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroEquipReferReq.ProtoReflect.Descriptor instead. func (*HeroEquipReferReq) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{6} + return file_game_proto_rawDescGZIP(), []int{7} } -func (x *HeroEquipReferReq) GetEquipIds() []*HeroEquipReferReq_EquipInfo { +func (x *HeroEquipReferReq) GetEquipIds() []*EquipInfo { if x != nil { return x.EquipIds } @@ -391,7 +446,7 @@ type RoleRsp struct { func (x *RoleRsp) Reset() { *x = RoleRsp{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[7] + mi := &file_game_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -404,7 +459,7 @@ func (x *RoleRsp) String() string { func (*RoleRsp) ProtoMessage() {} func (x *RoleRsp) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[7] + mi := &file_game_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -417,7 +472,7 @@ func (x *RoleRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleRsp.ProtoReflect.Descriptor instead. func (*RoleRsp) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{7} + return file_game_proto_rawDescGZIP(), []int{8} } func (x *RoleRsp) GetRole() *Role { @@ -461,7 +516,7 @@ type RoleUpdatePropertyRsp struct { func (x *RoleUpdatePropertyRsp) Reset() { *x = RoleUpdatePropertyRsp{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[8] + mi := &file_game_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -474,7 +529,7 @@ func (x *RoleUpdatePropertyRsp) String() string { func (*RoleUpdatePropertyRsp) ProtoMessage() {} func (x *RoleUpdatePropertyRsp) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[8] + mi := &file_game_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -487,7 +542,7 @@ func (x *RoleUpdatePropertyRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleUpdatePropertyRsp.ProtoReflect.Descriptor instead. func (*RoleUpdatePropertyRsp) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{8} + return file_game_proto_rawDescGZIP(), []int{9} } func (x *RoleUpdatePropertyRsp) GetId() []int32 { @@ -516,7 +571,7 @@ type RoleUpdateItemsRsp struct { func (x *RoleUpdateItemsRsp) Reset() { *x = RoleUpdateItemsRsp{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[9] + mi := &file_game_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -529,7 +584,7 @@ func (x *RoleUpdateItemsRsp) String() string { func (*RoleUpdateItemsRsp) ProtoMessage() {} func (x *RoleUpdateItemsRsp) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[9] + mi := &file_game_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -542,7 +597,7 @@ func (x *RoleUpdateItemsRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleUpdateItemsRsp.ProtoReflect.Descriptor instead. func (*RoleUpdateItemsRsp) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{9} + return file_game_proto_rawDescGZIP(), []int{10} } func (x *RoleUpdateItemsRsp) GetItems() string { @@ -561,7 +616,7 @@ type RoleUpdateChangeRsp struct { func (x *RoleUpdateChangeRsp) Reset() { *x = RoleUpdateChangeRsp{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[10] + mi := &file_game_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -574,7 +629,7 @@ func (x *RoleUpdateChangeRsp) String() string { func (*RoleUpdateChangeRsp) ProtoMessage() {} func (x *RoleUpdateChangeRsp) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[10] + mi := &file_game_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -587,7 +642,7 @@ func (x *RoleUpdateChangeRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleUpdateChangeRsp.ProtoReflect.Descriptor instead. func (*RoleUpdateChangeRsp) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{10} + return file_game_proto_rawDescGZIP(), []int{11} } //ResponseCmd RoleClearItemsReq @@ -602,7 +657,7 @@ type RoleClearItemsReq struct { func (x *RoleClearItemsReq) Reset() { *x = RoleClearItemsReq{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[11] + mi := &file_game_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -615,7 +670,7 @@ func (x *RoleClearItemsReq) String() string { func (*RoleClearItemsReq) ProtoMessage() {} func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[11] + mi := &file_game_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -628,7 +683,7 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead. func (*RoleClearItemsReq) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{11} + return file_game_proto_rawDescGZIP(), []int{12} } func (x *RoleClearItemsReq) GetItems() []string { @@ -650,7 +705,7 @@ type RoleStartBattleReq struct { func (x *RoleStartBattleReq) Reset() { *x = RoleStartBattleReq{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[12] + mi := &file_game_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -663,7 +718,7 @@ func (x *RoleStartBattleReq) String() string { func (*RoleStartBattleReq) ProtoMessage() {} func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[12] + mi := &file_game_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -676,7 +731,7 @@ func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleStartBattleReq.ProtoReflect.Descriptor instead. func (*RoleStartBattleReq) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{12} + return file_game_proto_rawDescGZIP(), []int{13} } func (x *RoleStartBattleReq) GetChapterId() int32 { @@ -708,7 +763,7 @@ type RoleEndBattleReq struct { func (x *RoleEndBattleReq) Reset() { *x = RoleEndBattleReq{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[13] + mi := &file_game_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -721,7 +776,7 @@ func (x *RoleEndBattleReq) String() string { func (*RoleEndBattleReq) ProtoMessage() {} func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[13] + mi := &file_game_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -734,7 +789,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead. func (*RoleEndBattleReq) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{13} + return file_game_proto_rawDescGZIP(), []int{14} } func (x *RoleEndBattleReq) GetChapterId() int32 { @@ -782,7 +837,7 @@ type RoleEndBattleRsp struct { func (x *RoleEndBattleRsp) Reset() { *x = RoleEndBattleRsp{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[14] + mi := &file_game_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -795,7 +850,7 @@ func (x *RoleEndBattleRsp) String() string { func (*RoleEndBattleRsp) ProtoMessage() {} func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[14] + mi := &file_game_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -808,7 +863,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead. func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{14} + return file_game_proto_rawDescGZIP(), []int{15} } func (x *RoleEndBattleRsp) GetRoleLevel() int32 { @@ -865,7 +920,7 @@ type EquipmentDelReq struct { func (x *EquipmentDelReq) Reset() { *x = EquipmentDelReq{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[15] + mi := &file_game_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -878,7 +933,7 @@ func (x *EquipmentDelReq) String() string { func (*EquipmentDelReq) ProtoMessage() {} func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[15] + mi := &file_game_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -891,7 +946,7 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { // Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead. func (*EquipmentDelReq) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{15} + return file_game_proto_rawDescGZIP(), []int{16} } func (x *EquipmentDelReq) GetId() []string { @@ -913,7 +968,7 @@ type EquipmentAddRsp struct { func (x *EquipmentAddRsp) Reset() { *x = EquipmentAddRsp{} if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[16] + mi := &file_game_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -926,7 +981,7 @@ func (x *EquipmentAddRsp) String() string { func (*EquipmentAddRsp) ProtoMessage() {} func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[16] + mi := &file_game_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -939,7 +994,7 @@ func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use EquipmentAddRsp.ProtoReflect.Descriptor instead. func (*EquipmentAddRsp) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{16} + return file_game_proto_rawDescGZIP(), []int{17} } func (x *EquipmentAddRsp) GetEquip() *Equipment { @@ -949,61 +1004,6 @@ func (x *EquipmentAddRsp) GetEquip() *Equipment { return nil } -type HeroEquipReferReq_EquipInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - EquipId string `protobuf:"bytes,1,opt,name=equipId,proto3" json:"equipId,omitempty"` - Pos int32 `protobuf:"varint,2,opt,name=pos,proto3" json:"pos,omitempty"` -} - -func (x *HeroEquipReferReq_EquipInfo) Reset() { - *x = HeroEquipReferReq_EquipInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_game_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroEquipReferReq_EquipInfo) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroEquipReferReq_EquipInfo) ProtoMessage() {} - -func (x *HeroEquipReferReq_EquipInfo) ProtoReflect() protoreflect.Message { - mi := &file_game_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use HeroEquipReferReq_EquipInfo.ProtoReflect.Descriptor instead. -func (*HeroEquipReferReq_EquipInfo) Descriptor() ([]byte, []int) { - return file_game_proto_rawDescGZIP(), []int{6, 0} -} - -func (x *HeroEquipReferReq_EquipInfo) GetEquipId() string { - if x != nil { - return x.EquipId - } - return "" -} - -func (x *HeroEquipReferReq_EquipInfo) GetPos() int32 { - if x != nil { - return x.Pos - } - return 0 -} - var File_game_proto protoreflect.FileDescriptor var file_game_proto_rawDesc = []byte{ @@ -1024,73 +1024,72 @@ var file_game_proto_rawDesc = []byte{ 0x65, 0x63, 0x74, 0x52, 0x73, 0x70, 0x22, 0x31, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, - 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xba, 0x01, 0x0a, 0x11, 0x48, 0x65, - 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, - 0x3d, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, - 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, - 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x1a, 0x37, 0x0a, - 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, - 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, - 0x69, 0x70, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0xa2, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, - 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, - 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, - 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, - 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, - 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52, - 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x52, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, - 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x22, 0x15, 0x0a, 0x13, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, - 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, - 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, - 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, - 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, - 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, - 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x7b, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, - 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, - 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, - 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, - 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, - 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, - 0x6d, 0x49, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, - 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, - 0x6c, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, - 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, - 0x78, 0x70, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, - 0x45, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, - 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, - 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, - 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x27, 0x0a, - 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, - 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x37, 0x0a, 0x09, 0x45, 0x71, 0x75, + 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, + 0x6f, 0x73, 0x22, 0x6f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, + 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x2b, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, + 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x67, 0x61, 0x6d, 0x65, + 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, + 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, + 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, + 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, + 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52, + 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x73, + 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, + 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, + 0x15, 0x0a, 0x13, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x52, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, + 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, + 0x6e, 0x49, 0x64, 0x22, 0x7b, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, + 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f, + 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, + 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x6c, 0x65, + 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, 0x6c, 0x65, 0x4c, + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x12, + 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, + 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, + 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, + 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, + 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, + 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1107,32 +1106,32 @@ func file_game_proto_rawDescGZIP() []byte { var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_game_proto_goTypes = []interface{}{ - (*HeartReq)(nil), // 0: game.HeartReq - (*HeartRsp)(nil), // 1: game.HeartRsp - (*LoginReq)(nil), // 2: game.LoginReq - (*CreateReq)(nil), // 3: game.CreateReq - (*DisConnectRsp)(nil), // 4: game.DisConnectRsp - (*ChangeTeamReq)(nil), // 5: game.ChangeTeamReq - (*HeroEquipReferReq)(nil), // 6: game.HeroEquipReferReq - (*RoleRsp)(nil), // 7: game.RoleRsp - (*RoleUpdatePropertyRsp)(nil), // 8: game.RoleUpdatePropertyRsp - (*RoleUpdateItemsRsp)(nil), // 9: game.RoleUpdateItemsRsp - (*RoleUpdateChangeRsp)(nil), // 10: game.RoleUpdateChangeRsp - (*RoleClearItemsReq)(nil), // 11: game.RoleClearItemsReq - (*RoleStartBattleReq)(nil), // 12: game.RoleStartBattleReq - (*RoleEndBattleReq)(nil), // 13: game.RoleEndBattleReq - (*RoleEndBattleRsp)(nil), // 14: game.RoleEndBattleRsp - (*EquipmentDelReq)(nil), // 15: game.EquipmentDelReq - (*EquipmentAddRsp)(nil), // 16: game.EquipmentAddRsp - (*HeroEquipReferReq_EquipInfo)(nil), // 17: game.HeroEquipReferReq.EquipInfo - (*Team)(nil), // 18: models.Team - (*Role)(nil), // 19: models.Role - (*Hero)(nil), // 20: models.Hero - (*Equipment)(nil), // 21: models.Equipment + (*HeartReq)(nil), // 0: game.HeartReq + (*HeartRsp)(nil), // 1: game.HeartRsp + (*LoginReq)(nil), // 2: game.LoginReq + (*CreateReq)(nil), // 3: game.CreateReq + (*DisConnectRsp)(nil), // 4: game.DisConnectRsp + (*ChangeTeamReq)(nil), // 5: game.ChangeTeamReq + (*EquipInfo)(nil), // 6: game.EquipInfo + (*HeroEquipReferReq)(nil), // 7: game.HeroEquipReferReq + (*RoleRsp)(nil), // 8: game.RoleRsp + (*RoleUpdatePropertyRsp)(nil), // 9: game.RoleUpdatePropertyRsp + (*RoleUpdateItemsRsp)(nil), // 10: game.RoleUpdateItemsRsp + (*RoleUpdateChangeRsp)(nil), // 11: game.RoleUpdateChangeRsp + (*RoleClearItemsReq)(nil), // 12: game.RoleClearItemsReq + (*RoleStartBattleReq)(nil), // 13: game.RoleStartBattleReq + (*RoleEndBattleReq)(nil), // 14: game.RoleEndBattleReq + (*RoleEndBattleRsp)(nil), // 15: game.RoleEndBattleRsp + (*EquipmentDelReq)(nil), // 16: game.EquipmentDelReq + (*EquipmentAddRsp)(nil), // 17: game.EquipmentAddRsp + (*Team)(nil), // 18: models.Team + (*Role)(nil), // 19: models.Role + (*Hero)(nil), // 20: models.Hero + (*Equipment)(nil), // 21: models.Equipment } var file_game_proto_depIdxs = []int32{ 18, // 0: game.ChangeTeamReq.team:type_name -> models.Team - 17, // 1: game.HeroEquipReferReq.equipIds:type_name -> game.HeroEquipReferReq.EquipInfo + 6, // 1: game.HeroEquipReferReq.equipIds:type_name -> game.EquipInfo 19, // 2: game.RoleRsp.role:type_name -> models.Role 20, // 3: game.RoleRsp.hero:type_name -> models.Hero 18, // 4: game.RoleRsp.team:type_name -> models.Team @@ -1227,7 +1226,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroEquipReferReq); i { + switch v := v.(*EquipInfo); i { case 0: return &v.state case 1: @@ -1239,7 +1238,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleRsp); i { + switch v := v.(*HeroEquipReferReq); i { case 0: return &v.state case 1: @@ -1251,7 +1250,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleUpdatePropertyRsp); i { + switch v := v.(*RoleRsp); i { case 0: return &v.state case 1: @@ -1263,7 +1262,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleUpdateItemsRsp); i { + switch v := v.(*RoleUpdatePropertyRsp); i { case 0: return &v.state case 1: @@ -1275,7 +1274,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleUpdateChangeRsp); i { + switch v := v.(*RoleUpdateItemsRsp); i { case 0: return &v.state case 1: @@ -1287,7 +1286,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleClearItemsReq); i { + switch v := v.(*RoleUpdateChangeRsp); i { case 0: return &v.state case 1: @@ -1299,7 +1298,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleStartBattleReq); i { + switch v := v.(*RoleClearItemsReq); i { case 0: return &v.state case 1: @@ -1311,7 +1310,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleEndBattleReq); i { + switch v := v.(*RoleStartBattleReq); i { case 0: return &v.state case 1: @@ -1323,7 +1322,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RoleEndBattleRsp); i { + switch v := v.(*RoleEndBattleReq); i { case 0: return &v.state case 1: @@ -1335,7 +1334,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EquipmentDelReq); i { + switch v := v.(*RoleEndBattleRsp); i { case 0: return &v.state case 1: @@ -1347,7 +1346,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EquipmentAddRsp); i { + switch v := v.(*EquipmentDelReq); i { case 0: return &v.state case 1: @@ -1359,7 +1358,7 @@ func file_game_proto_init() { } } file_game_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroEquipReferReq_EquipInfo); i { + switch v := v.(*EquipmentAddRsp); i { case 0: return &v.state case 1: diff --git a/protos b/protos index f903532..9a1343a 160000 --- a/protos +++ b/protos @@ -1 +1 @@ -Subproject commit f9035326a63d3ef7a335953ca56b821ed0ee945a +Subproject commit 9a1343a1d61885be03b96ecf329f2602ec99c8d1 -- libgit2 0.21.2