Commit 35adfcdb28605c76001c78b2dd57d5d789bb6239
1 parent
74286d71
fix: 裝備戒指类型特殊处理
Showing
8 changed files
with
342 additions
and
237 deletions
Show diff stats
cmd/gameserver/action/RoleAction.go
| @@ -96,10 +96,10 @@ func HeroEquipReferRpc(role *models.RoleModel, msg components.IMessage) (int32, | @@ -96,10 +96,10 @@ func HeroEquipReferRpc(role *models.RoleModel, msg components.IMessage) (int32, | ||
| 96 | logger.Error("loginRpc err: %v", err) | 96 | logger.Error("loginRpc err: %v", err) |
| 97 | return 1, nil | 97 | return 1, nil |
| 98 | } | 98 | } |
| 99 | - for _, equipId := range req.EquipIds { | ||
| 100 | - ret := role.EquipmentRefer(equipId, req.HeroId, req.Refer, req.Left) | 99 | + for _, equipInfo := range req.EquipIds { |
| 100 | + ret := role.EquipmentRefer(equipInfo.EquipId, req.HeroId, req.Refer, equipInfo.Pos) | ||
| 101 | if ret != 0 { | 101 | if ret != 0 { |
| 102 | - logger.Error("ret: %d, equipId: %s, heroId: %s, refer: %d, pos:%d", ret, equipId, req.HeroId, req.Refer, req.Left) | 102 | + logger.Error("ret: %d, equipId: %s, heroId: %s, refer: %d, pos:%d", ret, equipInfo.EquipId, req.HeroId, req.Refer, equipInfo.Pos) |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | } | 105 | } |
cmd/test/action/protocode.go
| @@ -16,6 +16,7 @@ func GetTestActionMap() map[interface{}]interface{} { | @@ -16,6 +16,7 @@ func GetTestActionMap() map[interface{}]interface{} { | ||
| 16 | am[uint32(pb.ProtoCode_RoleRsp)] = RoleRsp | 16 | am[uint32(pb.ProtoCode_RoleRsp)] = RoleRsp |
| 17 | am[uint32(pb.ProtoCode_RoleUpdatePropertyRsp)] = RoleUpdatePropertyRsp | 17 | am[uint32(pb.ProtoCode_RoleUpdatePropertyRsp)] = RoleUpdatePropertyRsp |
| 18 | am[uint32(pb.ProtoCode_RoleUpdateItemsRsp)] = RoleUpdateItemsRsp | 18 | am[uint32(pb.ProtoCode_RoleUpdateItemsRsp)] = RoleUpdateItemsRsp |
| 19 | + am[uint32(pb.ProtoCode_RoleUpdateChangeRsp)] = RoleUpdateChangeRsp | ||
| 19 | am[uint32(pb.ProtoCode_RoleClearItemsReq)] = RoleClearItemsRsp | 20 | am[uint32(pb.ProtoCode_RoleClearItemsReq)] = RoleClearItemsRsp |
| 20 | am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRsp | 21 | am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRsp |
| 21 | am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRsp | 22 | am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRsp |
common/commonFunc.go
| @@ -115,46 +115,25 @@ func StringToMapNum(items string) IMapStringNum { | @@ -115,46 +115,25 @@ func StringToMapNum(items string) IMapStringNum { | ||
| 115 | return backPack | 115 | return backPack |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | -func EquipmentTypToPos(typ int32) int32 { | 118 | +func EquipmentTyp(typ int32) int32 { |
| 119 | return int32(math.Floor(float64(typ / EquipmentInterval))) | 119 | return int32(math.Floor(float64(typ / EquipmentInterval))) |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | -func EquipmentTToPos(t int) int { | 122 | +func EquipmentPosToTyp(t int32) int32 { |
| 123 | switch t { | 123 | switch t { |
| 124 | - case WeaponT: | 124 | + case WeaponPos: |
| 125 | return Weapon | 125 | return Weapon |
| 126 | - case MailT: | 126 | + case MailPos: |
| 127 | return Mail | 127 | return Mail |
| 128 | - case ShoseT: | 128 | + case ShosePos: |
| 129 | return Shose | 129 | return Shose |
| 130 | - case NecklaceT: | 130 | + case NecklacePos: |
| 131 | return Necklace | 131 | return Necklace |
| 132 | - case RingTL: | 132 | + case RingPosL: |
| 133 | return Ring | 133 | return Ring |
| 134 | - case RingTR: | 134 | + case RingPosR: |
| 135 | return Ring | 135 | return Ring |
| 136 | default: | 136 | default: |
| 137 | return -1 | 137 | return -1 |
| 138 | } | 138 | } |
| 139 | } | 139 | } |
| 140 | - | ||
| 141 | -func EquipmentPosToT(pos int32, left bool) int32 { | ||
| 142 | - switch pos { | ||
| 143 | - case Weapon: | ||
| 144 | - return WeaponT | ||
| 145 | - case Mail: | ||
| 146 | - return MailT | ||
| 147 | - case Shose: | ||
| 148 | - return ShoseT | ||
| 149 | - case Necklace: | ||
| 150 | - return NecklaceT | ||
| 151 | - case Ring: | ||
| 152 | - if left { | ||
| 153 | - return RingTL | ||
| 154 | - } else { | ||
| 155 | - return RingTR | ||
| 156 | - } | ||
| 157 | - default: | ||
| 158 | - return -1 | ||
| 159 | - } | ||
| 160 | -} |
common/const.go
| @@ -44,10 +44,10 @@ const ( | @@ -44,10 +44,10 @@ const ( | ||
| 44 | Necklace = 3 // 项链 | 44 | Necklace = 3 // 项链 |
| 45 | Ring = 4 // 戒指 // 左右 | 45 | Ring = 4 // 戒指 // 左右 |
| 46 | 46 | ||
| 47 | - WeaponT = 0 // 武器 | ||
| 48 | - MailT = 1 // 铠甲 | ||
| 49 | - ShoseT = 2 // 鞋子 | ||
| 50 | - NecklaceT = 3 // 项链 | ||
| 51 | - RingTL = 4 // 左戒指 | ||
| 52 | - RingTR = 5 // 右戒指 | 47 | + WeaponPos = 0 // 武器 |
| 48 | + MailPos = 1 // 铠甲 | ||
| 49 | + ShosePos = 2 // 鞋子 | ||
| 50 | + NecklacePos = 3 // 项链 | ||
| 51 | + RingPosL = 4 // 左戒指 | ||
| 52 | + RingPosR = 5 // 右戒指 | ||
| 53 | ) | 53 | ) |
models/rolePlugin.go
| @@ -168,7 +168,7 @@ func (m *RoleModel) Award(award common.IMapStringNum) common.IMapStringNum { | @@ -168,7 +168,7 @@ func (m *RoleModel) Award(award common.IMapStringNum) common.IMapStringNum { | ||
| 168 | return award | 168 | return award |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | -func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool) int32 { | 171 | +func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, pos int32) int32 { |
| 172 | e, ok := m.Equipments[equipId] | 172 | e, ok := m.Equipments[equipId] |
| 173 | if !ok { | 173 | if !ok { |
| 174 | return 2 | 174 | return 2 |
| @@ -206,13 +206,16 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | @@ -206,13 +206,16 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | ||
| 206 | } | 206 | } |
| 207 | inHero = h1.(*HeroModel) | 207 | inHero = h1.(*HeroModel) |
| 208 | 208 | ||
| 209 | - pos := common.EquipmentTypToPos(inEquip.EquipType) | ||
| 210 | - posT := common.EquipmentPosToT(pos, left) | 209 | + if common.EquipmentTyp(inEquip.EquipType) == common.Ring { |
| 210 | + if pos != common.RingPosL && pos != common.RingPosR { | ||
| 211 | + return 4 | ||
| 212 | + } | ||
| 213 | + } | ||
| 211 | // 2.1.1 | 214 | // 2.1.1 |
| 212 | if equip.Equip.HeroId == "" { | 215 | if equip.Equip.HeroId == "" { |
| 213 | var outEquipID string | 216 | var outEquipID string |
| 214 | for id, typ := range inHero.Equipments { | 217 | for id, typ := range inHero.Equipments { |
| 215 | - if typ == posT { | 218 | + if typ == pos { |
| 216 | outEquipID = id | 219 | outEquipID = id |
| 217 | break | 220 | break |
| 218 | } | 221 | } |
| @@ -226,9 +229,9 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | @@ -226,9 +229,9 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | ||
| 226 | } | 229 | } |
| 227 | } | 230 | } |
| 228 | 231 | ||
| 229 | - inHero.AddEquipment(equip.Equip.Id, posT) | 232 | + inHero.AddEquipment(equip.Equip.Id, pos) |
| 230 | equip.SetProperty("heroid", inHero.Hero.Id) | 233 | equip.SetProperty("heroid", inHero.Hero.Id) |
| 231 | - equip.SetProperty("left", left) | 234 | + equip.SetProperty("pos", pos) |
| 232 | } else { | 235 | } else { |
| 233 | if h2 == nil { | 236 | if h2 == nil { |
| 234 | return 4 | 237 | return 4 |
| @@ -237,7 +240,7 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | @@ -237,7 +240,7 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | ||
| 237 | outHero = h2.(*HeroModel) | 240 | outHero = h2.(*HeroModel) |
| 238 | var outEquipID string | 241 | var outEquipID string |
| 239 | for id, tpos := range inHero.Equipments { | 242 | for id, tpos := range inHero.Equipments { |
| 240 | - if tpos == posT { | 243 | + if tpos == pos { |
| 241 | outEquipID = id | 244 | outEquipID = id |
| 242 | break | 245 | break |
| 243 | } | 246 | } |
| @@ -253,9 +256,9 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | @@ -253,9 +256,9 @@ func (m *RoleModel) EquipmentRefer(equipId, heroId string, refer bool, left bool | ||
| 253 | } | 256 | } |
| 254 | 257 | ||
| 255 | outHero.DelEquipment(equip.Equip.Id) | 258 | outHero.DelEquipment(equip.Equip.Id) |
| 256 | - inHero.AddEquipment(equip.Equip.Id, posT) | 259 | + inHero.AddEquipment(equip.Equip.Id, pos) |
| 257 | equip.SetProperty("heroid", inHero.Hero.Id) | 260 | equip.SetProperty("heroid", inHero.Hero.Id) |
| 258 | - equip.SetProperty("left", left) | 261 | + equip.SetProperty("pos", pos) |
| 259 | } | 262 | } |
| 260 | 263 | ||
| 261 | } | 264 | } |
pb/game.pb.go
| @@ -319,10 +319,9 @@ type HeroEquipReferReq struct { | @@ -319,10 +319,9 @@ type HeroEquipReferReq struct { | ||
| 319 | sizeCache protoimpl.SizeCache | 319 | sizeCache protoimpl.SizeCache |
| 320 | unknownFields protoimpl.UnknownFields | 320 | unknownFields protoimpl.UnknownFields |
| 321 | 321 | ||
| 322 | - EquipIds []string `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds,omitempty"` //[id=pos, id2=pos2] | ||
| 323 | - HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"` | ||
| 324 | - Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴, false 脱下 | ||
| 325 | - Left bool `protobuf:"varint,4,opt,name=left,proto3" json:"left,omitempty"` // 是否左手 只对戒指有效 | 322 | + EquipIds []*HeroEquipReferReq_EquipInfo `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds,omitempty"` |
| 323 | + HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"` | ||
| 324 | + Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴, false 脱下 | ||
| 326 | } | 325 | } |
| 327 | 326 | ||
| 328 | func (x *HeroEquipReferReq) Reset() { | 327 | func (x *HeroEquipReferReq) Reset() { |
| @@ -357,7 +356,7 @@ func (*HeroEquipReferReq) Descriptor() ([]byte, []int) { | @@ -357,7 +356,7 @@ func (*HeroEquipReferReq) Descriptor() ([]byte, []int) { | ||
| 357 | return file_game_proto_rawDescGZIP(), []int{6} | 356 | return file_game_proto_rawDescGZIP(), []int{6} |
| 358 | } | 357 | } |
| 359 | 358 | ||
| 360 | -func (x *HeroEquipReferReq) GetEquipIds() []string { | 359 | +func (x *HeroEquipReferReq) GetEquipIds() []*HeroEquipReferReq_EquipInfo { |
| 361 | if x != nil { | 360 | if x != nil { |
| 362 | return x.EquipIds | 361 | return x.EquipIds |
| 363 | } | 362 | } |
| @@ -378,13 +377,6 @@ func (x *HeroEquipReferReq) GetRefer() bool { | @@ -378,13 +377,6 @@ func (x *HeroEquipReferReq) GetRefer() bool { | ||
| 378 | return false | 377 | return false |
| 379 | } | 378 | } |
| 380 | 379 | ||
| 381 | -func (x *HeroEquipReferReq) GetLeft() bool { | ||
| 382 | - if x != nil { | ||
| 383 | - return x.Left | ||
| 384 | - } | ||
| 385 | - return false | ||
| 386 | -} | ||
| 387 | - | ||
| 388 | type RoleRsp struct { | 380 | type RoleRsp struct { |
| 389 | state protoimpl.MessageState | 381 | state protoimpl.MessageState |
| 390 | sizeCache protoimpl.SizeCache | 382 | sizeCache protoimpl.SizeCache |
| @@ -560,6 +552,44 @@ func (x *RoleUpdateItemsRsp) GetItems() string { | @@ -560,6 +552,44 @@ func (x *RoleUpdateItemsRsp) GetItems() string { | ||
| 560 | return "" | 552 | return "" |
| 561 | } | 553 | } |
| 562 | 554 | ||
| 555 | +type RoleUpdateChangeRsp struct { | ||
| 556 | + state protoimpl.MessageState | ||
| 557 | + sizeCache protoimpl.SizeCache | ||
| 558 | + unknownFields protoimpl.UnknownFields | ||
| 559 | +} | ||
| 560 | + | ||
| 561 | +func (x *RoleUpdateChangeRsp) Reset() { | ||
| 562 | + *x = RoleUpdateChangeRsp{} | ||
| 563 | + if protoimpl.UnsafeEnabled { | ||
| 564 | + mi := &file_game_proto_msgTypes[10] | ||
| 565 | + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 566 | + ms.StoreMessageInfo(mi) | ||
| 567 | + } | ||
| 568 | +} | ||
| 569 | + | ||
| 570 | +func (x *RoleUpdateChangeRsp) String() string { | ||
| 571 | + return protoimpl.X.MessageStringOf(x) | ||
| 572 | +} | ||
| 573 | + | ||
| 574 | +func (*RoleUpdateChangeRsp) ProtoMessage() {} | ||
| 575 | + | ||
| 576 | +func (x *RoleUpdateChangeRsp) ProtoReflect() protoreflect.Message { | ||
| 577 | + mi := &file_game_proto_msgTypes[10] | ||
| 578 | + if protoimpl.UnsafeEnabled && x != nil { | ||
| 579 | + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 580 | + if ms.LoadMessageInfo() == nil { | ||
| 581 | + ms.StoreMessageInfo(mi) | ||
| 582 | + } | ||
| 583 | + return ms | ||
| 584 | + } | ||
| 585 | + return mi.MessageOf(x) | ||
| 586 | +} | ||
| 587 | + | ||
| 588 | +// Deprecated: Use RoleUpdateChangeRsp.ProtoReflect.Descriptor instead. | ||
| 589 | +func (*RoleUpdateChangeRsp) Descriptor() ([]byte, []int) { | ||
| 590 | + return file_game_proto_rawDescGZIP(), []int{10} | ||
| 591 | +} | ||
| 592 | + | ||
| 563 | //ResponseCmd RoleClearItemsReq | 593 | //ResponseCmd RoleClearItemsReq |
| 564 | type RoleClearItemsReq struct { | 594 | type RoleClearItemsReq struct { |
| 565 | state protoimpl.MessageState | 595 | state protoimpl.MessageState |
| @@ -572,7 +602,7 @@ type RoleClearItemsReq struct { | @@ -572,7 +602,7 @@ type RoleClearItemsReq struct { | ||
| 572 | func (x *RoleClearItemsReq) Reset() { | 602 | func (x *RoleClearItemsReq) Reset() { |
| 573 | *x = RoleClearItemsReq{} | 603 | *x = RoleClearItemsReq{} |
| 574 | if protoimpl.UnsafeEnabled { | 604 | if protoimpl.UnsafeEnabled { |
| 575 | - mi := &file_game_proto_msgTypes[10] | 605 | + mi := &file_game_proto_msgTypes[11] |
| 576 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 606 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 577 | ms.StoreMessageInfo(mi) | 607 | ms.StoreMessageInfo(mi) |
| 578 | } | 608 | } |
| @@ -585,7 +615,7 @@ func (x *RoleClearItemsReq) String() string { | @@ -585,7 +615,7 @@ func (x *RoleClearItemsReq) String() string { | ||
| 585 | func (*RoleClearItemsReq) ProtoMessage() {} | 615 | func (*RoleClearItemsReq) ProtoMessage() {} |
| 586 | 616 | ||
| 587 | func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { | 617 | func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { |
| 588 | - mi := &file_game_proto_msgTypes[10] | 618 | + mi := &file_game_proto_msgTypes[11] |
| 589 | if protoimpl.UnsafeEnabled && x != nil { | 619 | if protoimpl.UnsafeEnabled && x != nil { |
| 590 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 620 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 591 | if ms.LoadMessageInfo() == nil { | 621 | if ms.LoadMessageInfo() == nil { |
| @@ -598,7 +628,7 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { | @@ -598,7 +628,7 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { | ||
| 598 | 628 | ||
| 599 | // Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead. | 629 | // Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead. |
| 600 | func (*RoleClearItemsReq) Descriptor() ([]byte, []int) { | 630 | func (*RoleClearItemsReq) Descriptor() ([]byte, []int) { |
| 601 | - return file_game_proto_rawDescGZIP(), []int{10} | 631 | + return file_game_proto_rawDescGZIP(), []int{11} |
| 602 | } | 632 | } |
| 603 | 633 | ||
| 604 | func (x *RoleClearItemsReq) GetItems() []string { | 634 | func (x *RoleClearItemsReq) GetItems() []string { |
| @@ -620,7 +650,7 @@ type RoleStartBattleReq struct { | @@ -620,7 +650,7 @@ type RoleStartBattleReq struct { | ||
| 620 | func (x *RoleStartBattleReq) Reset() { | 650 | func (x *RoleStartBattleReq) Reset() { |
| 621 | *x = RoleStartBattleReq{} | 651 | *x = RoleStartBattleReq{} |
| 622 | if protoimpl.UnsafeEnabled { | 652 | if protoimpl.UnsafeEnabled { |
| 623 | - mi := &file_game_proto_msgTypes[11] | 653 | + mi := &file_game_proto_msgTypes[12] |
| 624 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 654 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 625 | ms.StoreMessageInfo(mi) | 655 | ms.StoreMessageInfo(mi) |
| 626 | } | 656 | } |
| @@ -633,7 +663,7 @@ func (x *RoleStartBattleReq) String() string { | @@ -633,7 +663,7 @@ func (x *RoleStartBattleReq) String() string { | ||
| 633 | func (*RoleStartBattleReq) ProtoMessage() {} | 663 | func (*RoleStartBattleReq) ProtoMessage() {} |
| 634 | 664 | ||
| 635 | func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { | 665 | func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { |
| 636 | - mi := &file_game_proto_msgTypes[11] | 666 | + mi := &file_game_proto_msgTypes[12] |
| 637 | if protoimpl.UnsafeEnabled && x != nil { | 667 | if protoimpl.UnsafeEnabled && x != nil { |
| 638 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 668 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 639 | if ms.LoadMessageInfo() == nil { | 669 | if ms.LoadMessageInfo() == nil { |
| @@ -646,7 +676,7 @@ func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { | @@ -646,7 +676,7 @@ func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { | ||
| 646 | 676 | ||
| 647 | // Deprecated: Use RoleStartBattleReq.ProtoReflect.Descriptor instead. | 677 | // Deprecated: Use RoleStartBattleReq.ProtoReflect.Descriptor instead. |
| 648 | func (*RoleStartBattleReq) Descriptor() ([]byte, []int) { | 678 | func (*RoleStartBattleReq) Descriptor() ([]byte, []int) { |
| 649 | - return file_game_proto_rawDescGZIP(), []int{11} | 679 | + return file_game_proto_rawDescGZIP(), []int{12} |
| 650 | } | 680 | } |
| 651 | 681 | ||
| 652 | func (x *RoleStartBattleReq) GetChapterId() int32 { | 682 | func (x *RoleStartBattleReq) GetChapterId() int32 { |
| @@ -678,7 +708,7 @@ type RoleEndBattleReq struct { | @@ -678,7 +708,7 @@ type RoleEndBattleReq struct { | ||
| 678 | func (x *RoleEndBattleReq) Reset() { | 708 | func (x *RoleEndBattleReq) Reset() { |
| 679 | *x = RoleEndBattleReq{} | 709 | *x = RoleEndBattleReq{} |
| 680 | if protoimpl.UnsafeEnabled { | 710 | if protoimpl.UnsafeEnabled { |
| 681 | - mi := &file_game_proto_msgTypes[12] | 711 | + mi := &file_game_proto_msgTypes[13] |
| 682 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 712 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 683 | ms.StoreMessageInfo(mi) | 713 | ms.StoreMessageInfo(mi) |
| 684 | } | 714 | } |
| @@ -691,7 +721,7 @@ func (x *RoleEndBattleReq) String() string { | @@ -691,7 +721,7 @@ func (x *RoleEndBattleReq) String() string { | ||
| 691 | func (*RoleEndBattleReq) ProtoMessage() {} | 721 | func (*RoleEndBattleReq) ProtoMessage() {} |
| 692 | 722 | ||
| 693 | func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { | 723 | func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { |
| 694 | - mi := &file_game_proto_msgTypes[12] | 724 | + mi := &file_game_proto_msgTypes[13] |
| 695 | if protoimpl.UnsafeEnabled && x != nil { | 725 | if protoimpl.UnsafeEnabled && x != nil { |
| 696 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 726 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 697 | if ms.LoadMessageInfo() == nil { | 727 | if ms.LoadMessageInfo() == nil { |
| @@ -704,7 +734,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { | @@ -704,7 +734,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { | ||
| 704 | 734 | ||
| 705 | // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead. | 735 | // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead. |
| 706 | func (*RoleEndBattleReq) Descriptor() ([]byte, []int) { | 736 | func (*RoleEndBattleReq) Descriptor() ([]byte, []int) { |
| 707 | - return file_game_proto_rawDescGZIP(), []int{12} | 737 | + return file_game_proto_rawDescGZIP(), []int{13} |
| 708 | } | 738 | } |
| 709 | 739 | ||
| 710 | func (x *RoleEndBattleReq) GetChapterId() int32 { | 740 | func (x *RoleEndBattleReq) GetChapterId() int32 { |
| @@ -752,7 +782,7 @@ type RoleEndBattleRsp struct { | @@ -752,7 +782,7 @@ type RoleEndBattleRsp struct { | ||
| 752 | func (x *RoleEndBattleRsp) Reset() { | 782 | func (x *RoleEndBattleRsp) Reset() { |
| 753 | *x = RoleEndBattleRsp{} | 783 | *x = RoleEndBattleRsp{} |
| 754 | if protoimpl.UnsafeEnabled { | 784 | if protoimpl.UnsafeEnabled { |
| 755 | - mi := &file_game_proto_msgTypes[13] | 785 | + mi := &file_game_proto_msgTypes[14] |
| 756 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 786 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 757 | ms.StoreMessageInfo(mi) | 787 | ms.StoreMessageInfo(mi) |
| 758 | } | 788 | } |
| @@ -765,7 +795,7 @@ func (x *RoleEndBattleRsp) String() string { | @@ -765,7 +795,7 @@ func (x *RoleEndBattleRsp) String() string { | ||
| 765 | func (*RoleEndBattleRsp) ProtoMessage() {} | 795 | func (*RoleEndBattleRsp) ProtoMessage() {} |
| 766 | 796 | ||
| 767 | func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { | 797 | func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { |
| 768 | - mi := &file_game_proto_msgTypes[13] | 798 | + mi := &file_game_proto_msgTypes[14] |
| 769 | if protoimpl.UnsafeEnabled && x != nil { | 799 | if protoimpl.UnsafeEnabled && x != nil { |
| 770 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 800 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 771 | if ms.LoadMessageInfo() == nil { | 801 | if ms.LoadMessageInfo() == nil { |
| @@ -778,7 +808,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { | @@ -778,7 +808,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { | ||
| 778 | 808 | ||
| 779 | // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead. | 809 | // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead. |
| 780 | func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) { | 810 | func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) { |
| 781 | - return file_game_proto_rawDescGZIP(), []int{13} | 811 | + return file_game_proto_rawDescGZIP(), []int{14} |
| 782 | } | 812 | } |
| 783 | 813 | ||
| 784 | func (x *RoleEndBattleRsp) GetRoleLevel() int32 { | 814 | func (x *RoleEndBattleRsp) GetRoleLevel() int32 { |
| @@ -835,7 +865,7 @@ type EquipmentDelReq struct { | @@ -835,7 +865,7 @@ type EquipmentDelReq struct { | ||
| 835 | func (x *EquipmentDelReq) Reset() { | 865 | func (x *EquipmentDelReq) Reset() { |
| 836 | *x = EquipmentDelReq{} | 866 | *x = EquipmentDelReq{} |
| 837 | if protoimpl.UnsafeEnabled { | 867 | if protoimpl.UnsafeEnabled { |
| 838 | - mi := &file_game_proto_msgTypes[14] | 868 | + mi := &file_game_proto_msgTypes[15] |
| 839 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 869 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 840 | ms.StoreMessageInfo(mi) | 870 | ms.StoreMessageInfo(mi) |
| 841 | } | 871 | } |
| @@ -848,7 +878,7 @@ func (x *EquipmentDelReq) String() string { | @@ -848,7 +878,7 @@ func (x *EquipmentDelReq) String() string { | ||
| 848 | func (*EquipmentDelReq) ProtoMessage() {} | 878 | func (*EquipmentDelReq) ProtoMessage() {} |
| 849 | 879 | ||
| 850 | func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { | 880 | func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { |
| 851 | - mi := &file_game_proto_msgTypes[14] | 881 | + mi := &file_game_proto_msgTypes[15] |
| 852 | if protoimpl.UnsafeEnabled && x != nil { | 882 | if protoimpl.UnsafeEnabled && x != nil { |
| 853 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 883 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 854 | if ms.LoadMessageInfo() == nil { | 884 | if ms.LoadMessageInfo() == nil { |
| @@ -861,7 +891,7 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { | @@ -861,7 +891,7 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { | ||
| 861 | 891 | ||
| 862 | // Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead. | 892 | // Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead. |
| 863 | func (*EquipmentDelReq) Descriptor() ([]byte, []int) { | 893 | func (*EquipmentDelReq) Descriptor() ([]byte, []int) { |
| 864 | - return file_game_proto_rawDescGZIP(), []int{14} | 894 | + return file_game_proto_rawDescGZIP(), []int{15} |
| 865 | } | 895 | } |
| 866 | 896 | ||
| 867 | func (x *EquipmentDelReq) GetId() []string { | 897 | func (x *EquipmentDelReq) GetId() []string { |
| @@ -883,7 +913,7 @@ type EquipmentAddRsp struct { | @@ -883,7 +913,7 @@ type EquipmentAddRsp struct { | ||
| 883 | func (x *EquipmentAddRsp) Reset() { | 913 | func (x *EquipmentAddRsp) Reset() { |
| 884 | *x = EquipmentAddRsp{} | 914 | *x = EquipmentAddRsp{} |
| 885 | if protoimpl.UnsafeEnabled { | 915 | if protoimpl.UnsafeEnabled { |
| 886 | - mi := &file_game_proto_msgTypes[15] | 916 | + mi := &file_game_proto_msgTypes[16] |
| 887 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 917 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 888 | ms.StoreMessageInfo(mi) | 918 | ms.StoreMessageInfo(mi) |
| 889 | } | 919 | } |
| @@ -896,7 +926,7 @@ func (x *EquipmentAddRsp) String() string { | @@ -896,7 +926,7 @@ func (x *EquipmentAddRsp) String() string { | ||
| 896 | func (*EquipmentAddRsp) ProtoMessage() {} | 926 | func (*EquipmentAddRsp) ProtoMessage() {} |
| 897 | 927 | ||
| 898 | func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { | 928 | func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { |
| 899 | - mi := &file_game_proto_msgTypes[15] | 929 | + mi := &file_game_proto_msgTypes[16] |
| 900 | if protoimpl.UnsafeEnabled && x != nil { | 930 | if protoimpl.UnsafeEnabled && x != nil { |
| 901 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 931 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| 902 | if ms.LoadMessageInfo() == nil { | 932 | if ms.LoadMessageInfo() == nil { |
| @@ -909,7 +939,7 @@ func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { | @@ -909,7 +939,7 @@ func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { | ||
| 909 | 939 | ||
| 910 | // Deprecated: Use EquipmentAddRsp.ProtoReflect.Descriptor instead. | 940 | // Deprecated: Use EquipmentAddRsp.ProtoReflect.Descriptor instead. |
| 911 | func (*EquipmentAddRsp) Descriptor() ([]byte, []int) { | 941 | func (*EquipmentAddRsp) Descriptor() ([]byte, []int) { |
| 912 | - return file_game_proto_rawDescGZIP(), []int{15} | 942 | + return file_game_proto_rawDescGZIP(), []int{16} |
| 913 | } | 943 | } |
| 914 | 944 | ||
| 915 | func (x *EquipmentAddRsp) GetEquip() *Equipment { | 945 | func (x *EquipmentAddRsp) GetEquip() *Equipment { |
| @@ -919,6 +949,61 @@ func (x *EquipmentAddRsp) GetEquip() *Equipment { | @@ -919,6 +949,61 @@ func (x *EquipmentAddRsp) GetEquip() *Equipment { | ||
| 919 | return nil | 949 | return nil |
| 920 | } | 950 | } |
| 921 | 951 | ||
| 952 | +type HeroEquipReferReq_EquipInfo struct { | ||
| 953 | + state protoimpl.MessageState | ||
| 954 | + sizeCache protoimpl.SizeCache | ||
| 955 | + unknownFields protoimpl.UnknownFields | ||
| 956 | + | ||
| 957 | + EquipId string `protobuf:"bytes,1,opt,name=equipId,proto3" json:"equipId,omitempty"` | ||
| 958 | + Pos int32 `protobuf:"varint,2,opt,name=pos,proto3" json:"pos,omitempty"` | ||
| 959 | +} | ||
| 960 | + | ||
| 961 | +func (x *HeroEquipReferReq_EquipInfo) Reset() { | ||
| 962 | + *x = HeroEquipReferReq_EquipInfo{} | ||
| 963 | + if protoimpl.UnsafeEnabled { | ||
| 964 | + mi := &file_game_proto_msgTypes[17] | ||
| 965 | + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 966 | + ms.StoreMessageInfo(mi) | ||
| 967 | + } | ||
| 968 | +} | ||
| 969 | + | ||
| 970 | +func (x *HeroEquipReferReq_EquipInfo) String() string { | ||
| 971 | + return protoimpl.X.MessageStringOf(x) | ||
| 972 | +} | ||
| 973 | + | ||
| 974 | +func (*HeroEquipReferReq_EquipInfo) ProtoMessage() {} | ||
| 975 | + | ||
| 976 | +func (x *HeroEquipReferReq_EquipInfo) ProtoReflect() protoreflect.Message { | ||
| 977 | + mi := &file_game_proto_msgTypes[17] | ||
| 978 | + if protoimpl.UnsafeEnabled && x != nil { | ||
| 979 | + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 980 | + if ms.LoadMessageInfo() == nil { | ||
| 981 | + ms.StoreMessageInfo(mi) | ||
| 982 | + } | ||
| 983 | + return ms | ||
| 984 | + } | ||
| 985 | + return mi.MessageOf(x) | ||
| 986 | +} | ||
| 987 | + | ||
| 988 | +// Deprecated: Use HeroEquipReferReq_EquipInfo.ProtoReflect.Descriptor instead. | ||
| 989 | +func (*HeroEquipReferReq_EquipInfo) Descriptor() ([]byte, []int) { | ||
| 990 | + return file_game_proto_rawDescGZIP(), []int{6, 0} | ||
| 991 | +} | ||
| 992 | + | ||
| 993 | +func (x *HeroEquipReferReq_EquipInfo) GetEquipId() string { | ||
| 994 | + if x != nil { | ||
| 995 | + return x.EquipId | ||
| 996 | + } | ||
| 997 | + return "" | ||
| 998 | +} | ||
| 999 | + | ||
| 1000 | +func (x *HeroEquipReferReq_EquipInfo) GetPos() int32 { | ||
| 1001 | + if x != nil { | ||
| 1002 | + return x.Pos | ||
| 1003 | + } | ||
| 1004 | + return 0 | ||
| 1005 | +} | ||
| 1006 | + | ||
| 922 | var File_game_proto protoreflect.FileDescriptor | 1007 | var File_game_proto protoreflect.FileDescriptor |
| 923 | 1008 | ||
| 924 | var file_game_proto_rawDesc = []byte{ | 1009 | var file_game_proto_rawDesc = []byte{ |
| @@ -939,32 +1024,38 @@ var file_game_proto_rawDesc = []byte{ | @@ -939,32 +1024,38 @@ var file_game_proto_rawDesc = []byte{ | ||
| 939 | 0x65, 0x63, 0x74, 0x52, 0x73, 0x70, 0x22, 0x31, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, | 1024 | 0x65, 0x63, 0x74, 0x52, 0x73, 0x70, 0x22, 0x31, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, |
| 940 | 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, | 1025 | 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, |
| 941 | 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, | 1026 | 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, |
| 942 | - 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x72, 0x0a, 0x11, 0x48, 0x65, 0x72, | ||
| 943 | - 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, | ||
| 944 | - 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, | ||
| 945 | - 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, | ||
| 946 | - 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, | ||
| 947 | - 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, | ||
| 948 | - 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x65, 0x66, | ||
| 949 | - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x22, 0xa2, 0x01, | ||
| 950 | - 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, | ||
| 951 | - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, | ||
| 952 | - 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, | ||
| 953 | - 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, | ||
| 954 | - 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, | ||
| 955 | - 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, | ||
| 956 | - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, | ||
| 957 | - 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, | ||
| 958 | - 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, | ||
| 959 | - 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, | ||
| 960 | - 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, | ||
| 961 | - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, | ||
| 962 | - 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, | ||
| 963 | - 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, | ||
| 964 | - 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, | ||
| 965 | - 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, | ||
| 966 | - 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, | ||
| 967 | - 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, | 1027 | + 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xba, 0x01, 0x0a, 0x11, 0x48, 0x65, |
| 1028 | + 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, | ||
| 1029 | + 0x3d, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, | ||
| 1030 | + 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, | ||
| 1031 | + 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, | ||
| 1032 | + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, | ||
| 1033 | + 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, | ||
| 1034 | + 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, | ||
| 1035 | + 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x1a, 0x37, 0x0a, | ||
| 1036 | + 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, | ||
| 1037 | + 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, | ||
| 1038 | + 0x69, 0x70, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, | ||
| 1039 | + 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0xa2, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, | ||
| 1040 | + 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, | ||
| 1041 | + 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, | ||
| 1042 | + 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, | ||
| 1043 | + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, | ||
| 1044 | + 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, | ||
| 1045 | + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, | ||
| 1046 | + 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, | ||
| 1047 | + 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, | ||
| 1048 | + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, | ||
| 1049 | + 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52, | ||
| 1050 | + 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, | ||
| 1051 | + 0x79, 0x52, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, | ||
| 1052 | + 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, | ||
| 1053 | + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, | ||
| 1054 | + 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, | ||
| 1055 | + 0x64, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, | ||
| 1056 | + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, | ||
| 1057 | + 0x6d, 0x73, 0x22, 0x15, 0x0a, 0x13, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, | ||
| 1058 | + 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, | ||
| 968 | 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, | 1059 | 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, |
| 969 | 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, | 1060 | 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, |
| 970 | 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, | 1061 | 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, |
| @@ -1014,43 +1105,46 @@ func file_game_proto_rawDescGZIP() []byte { | @@ -1014,43 +1105,46 @@ func file_game_proto_rawDescGZIP() []byte { | ||
| 1014 | return file_game_proto_rawDescData | 1105 | return file_game_proto_rawDescData |
| 1015 | } | 1106 | } |
| 1016 | 1107 | ||
| 1017 | -var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 16) | 1108 | +var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 18) |
| 1018 | var file_game_proto_goTypes = []interface{}{ | 1109 | var file_game_proto_goTypes = []interface{}{ |
| 1019 | - (*HeartReq)(nil), // 0: game.HeartReq | ||
| 1020 | - (*HeartRsp)(nil), // 1: game.HeartRsp | ||
| 1021 | - (*LoginReq)(nil), // 2: game.LoginReq | ||
| 1022 | - (*CreateReq)(nil), // 3: game.CreateReq | ||
| 1023 | - (*DisConnectRsp)(nil), // 4: game.DisConnectRsp | ||
| 1024 | - (*ChangeTeamReq)(nil), // 5: game.ChangeTeamReq | ||
| 1025 | - (*HeroEquipReferReq)(nil), // 6: game.HeroEquipReferReq | ||
| 1026 | - (*RoleRsp)(nil), // 7: game.RoleRsp | ||
| 1027 | - (*RoleUpdatePropertyRsp)(nil), // 8: game.RoleUpdatePropertyRsp | ||
| 1028 | - (*RoleUpdateItemsRsp)(nil), // 9: game.RoleUpdateItemsRsp | ||
| 1029 | - (*RoleClearItemsReq)(nil), // 10: game.RoleClearItemsReq | ||
| 1030 | - (*RoleStartBattleReq)(nil), // 11: game.RoleStartBattleReq | ||
| 1031 | - (*RoleEndBattleReq)(nil), // 12: game.RoleEndBattleReq | ||
| 1032 | - (*RoleEndBattleRsp)(nil), // 13: game.RoleEndBattleRsp | ||
| 1033 | - (*EquipmentDelReq)(nil), // 14: game.EquipmentDelReq | ||
| 1034 | - (*EquipmentAddRsp)(nil), // 15: game.EquipmentAddRsp | ||
| 1035 | - (*Team)(nil), // 16: models.Team | ||
| 1036 | - (*Role)(nil), // 17: models.Role | ||
| 1037 | - (*Hero)(nil), // 18: models.Hero | ||
| 1038 | - (*Equipment)(nil), // 19: models.Equipment | 1110 | + (*HeartReq)(nil), // 0: game.HeartReq |
| 1111 | + (*HeartRsp)(nil), // 1: game.HeartRsp | ||
| 1112 | + (*LoginReq)(nil), // 2: game.LoginReq | ||
| 1113 | + (*CreateReq)(nil), // 3: game.CreateReq | ||
| 1114 | + (*DisConnectRsp)(nil), // 4: game.DisConnectRsp | ||
| 1115 | + (*ChangeTeamReq)(nil), // 5: game.ChangeTeamReq | ||
| 1116 | + (*HeroEquipReferReq)(nil), // 6: game.HeroEquipReferReq | ||
| 1117 | + (*RoleRsp)(nil), // 7: game.RoleRsp | ||
| 1118 | + (*RoleUpdatePropertyRsp)(nil), // 8: game.RoleUpdatePropertyRsp | ||
| 1119 | + (*RoleUpdateItemsRsp)(nil), // 9: game.RoleUpdateItemsRsp | ||
| 1120 | + (*RoleUpdateChangeRsp)(nil), // 10: game.RoleUpdateChangeRsp | ||
| 1121 | + (*RoleClearItemsReq)(nil), // 11: game.RoleClearItemsReq | ||
| 1122 | + (*RoleStartBattleReq)(nil), // 12: game.RoleStartBattleReq | ||
| 1123 | + (*RoleEndBattleReq)(nil), // 13: game.RoleEndBattleReq | ||
| 1124 | + (*RoleEndBattleRsp)(nil), // 14: game.RoleEndBattleRsp | ||
| 1125 | + (*EquipmentDelReq)(nil), // 15: game.EquipmentDelReq | ||
| 1126 | + (*EquipmentAddRsp)(nil), // 16: game.EquipmentAddRsp | ||
| 1127 | + (*HeroEquipReferReq_EquipInfo)(nil), // 17: game.HeroEquipReferReq.EquipInfo | ||
| 1128 | + (*Team)(nil), // 18: models.Team | ||
| 1129 | + (*Role)(nil), // 19: models.Role | ||
| 1130 | + (*Hero)(nil), // 20: models.Hero | ||
| 1131 | + (*Equipment)(nil), // 21: models.Equipment | ||
| 1039 | } | 1132 | } |
| 1040 | var file_game_proto_depIdxs = []int32{ | 1133 | var file_game_proto_depIdxs = []int32{ |
| 1041 | - 16, // 0: game.ChangeTeamReq.team:type_name -> models.Team | ||
| 1042 | - 17, // 1: game.RoleRsp.role:type_name -> models.Role | ||
| 1043 | - 18, // 2: game.RoleRsp.hero:type_name -> models.Hero | ||
| 1044 | - 16, // 3: game.RoleRsp.team:type_name -> models.Team | ||
| 1045 | - 19, // 4: game.RoleRsp.equipments:type_name -> models.Equipment | ||
| 1046 | - 17, // 5: game.RoleUpdatePropertyRsp.role:type_name -> models.Role | ||
| 1047 | - 18, // 6: game.RoleEndBattleRsp.hero:type_name -> models.Hero | ||
| 1048 | - 19, // 7: game.EquipmentAddRsp.equip:type_name -> models.Equipment | ||
| 1049 | - 8, // [8:8] is the sub-list for method output_type | ||
| 1050 | - 8, // [8:8] is the sub-list for method input_type | ||
| 1051 | - 8, // [8:8] is the sub-list for extension type_name | ||
| 1052 | - 8, // [8:8] is the sub-list for extension extendee | ||
| 1053 | - 0, // [0:8] is the sub-list for field type_name | 1134 | + 18, // 0: game.ChangeTeamReq.team:type_name -> models.Team |
| 1135 | + 17, // 1: game.HeroEquipReferReq.equipIds:type_name -> game.HeroEquipReferReq.EquipInfo | ||
| 1136 | + 19, // 2: game.RoleRsp.role:type_name -> models.Role | ||
| 1137 | + 20, // 3: game.RoleRsp.hero:type_name -> models.Hero | ||
| 1138 | + 18, // 4: game.RoleRsp.team:type_name -> models.Team | ||
| 1139 | + 21, // 5: game.RoleRsp.equipments:type_name -> models.Equipment | ||
| 1140 | + 19, // 6: game.RoleUpdatePropertyRsp.role:type_name -> models.Role | ||
| 1141 | + 20, // 7: game.RoleEndBattleRsp.hero:type_name -> models.Hero | ||
| 1142 | + 21, // 8: game.EquipmentAddRsp.equip:type_name -> models.Equipment | ||
| 1143 | + 9, // [9:9] is the sub-list for method output_type | ||
| 1144 | + 9, // [9:9] is the sub-list for method input_type | ||
| 1145 | + 9, // [9:9] is the sub-list for extension type_name | ||
| 1146 | + 9, // [9:9] is the sub-list for extension extendee | ||
| 1147 | + 0, // [0:9] is the sub-list for field type_name | ||
| 1054 | } | 1148 | } |
| 1055 | 1149 | ||
| 1056 | func init() { file_game_proto_init() } | 1150 | func init() { file_game_proto_init() } |
| @@ -1181,7 +1275,7 @@ func file_game_proto_init() { | @@ -1181,7 +1275,7 @@ func file_game_proto_init() { | ||
| 1181 | } | 1275 | } |
| 1182 | } | 1276 | } |
| 1183 | file_game_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { | 1277 | file_game_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { |
| 1184 | - switch v := v.(*RoleClearItemsReq); i { | 1278 | + switch v := v.(*RoleUpdateChangeRsp); i { |
| 1185 | case 0: | 1279 | case 0: |
| 1186 | return &v.state | 1280 | return &v.state |
| 1187 | case 1: | 1281 | case 1: |
| @@ -1193,7 +1287,7 @@ func file_game_proto_init() { | @@ -1193,7 +1287,7 @@ func file_game_proto_init() { | ||
| 1193 | } | 1287 | } |
| 1194 | } | 1288 | } |
| 1195 | file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { | 1289 | file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { |
| 1196 | - switch v := v.(*RoleStartBattleReq); i { | 1290 | + switch v := v.(*RoleClearItemsReq); i { |
| 1197 | case 0: | 1291 | case 0: |
| 1198 | return &v.state | 1292 | return &v.state |
| 1199 | case 1: | 1293 | case 1: |
| @@ -1205,7 +1299,7 @@ func file_game_proto_init() { | @@ -1205,7 +1299,7 @@ func file_game_proto_init() { | ||
| 1205 | } | 1299 | } |
| 1206 | } | 1300 | } |
| 1207 | file_game_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { | 1301 | file_game_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { |
| 1208 | - switch v := v.(*RoleEndBattleReq); i { | 1302 | + switch v := v.(*RoleStartBattleReq); i { |
| 1209 | case 0: | 1303 | case 0: |
| 1210 | return &v.state | 1304 | return &v.state |
| 1211 | case 1: | 1305 | case 1: |
| @@ -1217,7 +1311,7 @@ func file_game_proto_init() { | @@ -1217,7 +1311,7 @@ func file_game_proto_init() { | ||
| 1217 | } | 1311 | } |
| 1218 | } | 1312 | } |
| 1219 | file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { | 1313 | file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { |
| 1220 | - switch v := v.(*RoleEndBattleRsp); i { | 1314 | + switch v := v.(*RoleEndBattleReq); i { |
| 1221 | case 0: | 1315 | case 0: |
| 1222 | return &v.state | 1316 | return &v.state |
| 1223 | case 1: | 1317 | case 1: |
| @@ -1229,7 +1323,7 @@ func file_game_proto_init() { | @@ -1229,7 +1323,7 @@ func file_game_proto_init() { | ||
| 1229 | } | 1323 | } |
| 1230 | } | 1324 | } |
| 1231 | file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { | 1325 | file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { |
| 1232 | - switch v := v.(*EquipmentDelReq); i { | 1326 | + switch v := v.(*RoleEndBattleRsp); i { |
| 1233 | case 0: | 1327 | case 0: |
| 1234 | return &v.state | 1328 | return &v.state |
| 1235 | case 1: | 1329 | case 1: |
| @@ -1241,6 +1335,18 @@ func file_game_proto_init() { | @@ -1241,6 +1335,18 @@ func file_game_proto_init() { | ||
| 1241 | } | 1335 | } |
| 1242 | } | 1336 | } |
| 1243 | file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { | 1337 | file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { |
| 1338 | + switch v := v.(*EquipmentDelReq); i { | ||
| 1339 | + case 0: | ||
| 1340 | + return &v.state | ||
| 1341 | + case 1: | ||
| 1342 | + return &v.sizeCache | ||
| 1343 | + case 2: | ||
| 1344 | + return &v.unknownFields | ||
| 1345 | + default: | ||
| 1346 | + return nil | ||
| 1347 | + } | ||
| 1348 | + } | ||
| 1349 | + file_game_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { | ||
| 1244 | switch v := v.(*EquipmentAddRsp); i { | 1350 | switch v := v.(*EquipmentAddRsp); i { |
| 1245 | case 0: | 1351 | case 0: |
| 1246 | return &v.state | 1352 | return &v.state |
| @@ -1252,6 +1358,18 @@ func file_game_proto_init() { | @@ -1252,6 +1358,18 @@ func file_game_proto_init() { | ||
| 1252 | return nil | 1358 | return nil |
| 1253 | } | 1359 | } |
| 1254 | } | 1360 | } |
| 1361 | + file_game_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { | ||
| 1362 | + switch v := v.(*HeroEquipReferReq_EquipInfo); i { | ||
| 1363 | + case 0: | ||
| 1364 | + return &v.state | ||
| 1365 | + case 1: | ||
| 1366 | + return &v.sizeCache | ||
| 1367 | + case 2: | ||
| 1368 | + return &v.unknownFields | ||
| 1369 | + default: | ||
| 1370 | + return nil | ||
| 1371 | + } | ||
| 1372 | + } | ||
| 1255 | } | 1373 | } |
| 1256 | type x struct{} | 1374 | type x struct{} |
| 1257 | out := protoimpl.TypeBuilder{ | 1375 | out := protoimpl.TypeBuilder{ |
| @@ -1259,7 +1377,7 @@ func file_game_proto_init() { | @@ -1259,7 +1377,7 @@ func file_game_proto_init() { | ||
| 1259 | GoPackagePath: reflect.TypeOf(x{}).PkgPath(), | 1377 | GoPackagePath: reflect.TypeOf(x{}).PkgPath(), |
| 1260 | RawDescriptor: file_game_proto_rawDesc, | 1378 | RawDescriptor: file_game_proto_rawDesc, |
| 1261 | NumEnums: 0, | 1379 | NumEnums: 0, |
| 1262 | - NumMessages: 16, | 1380 | + NumMessages: 18, |
| 1263 | NumExtensions: 0, | 1381 | NumExtensions: 0, |
| 1264 | NumServices: 0, | 1382 | NumServices: 0, |
| 1265 | }, | 1383 | }, |
pb/models.pb.go
| @@ -197,7 +197,7 @@ type Equipment struct { | @@ -197,7 +197,7 @@ type Equipment struct { | ||
| 197 | EnhanceLevel int32 `protobuf:"varint,4,opt,name=enhance_level,json=enhanceLevel,proto3" json:"enhance_level,omitempty"` | 197 | EnhanceLevel int32 `protobuf:"varint,4,opt,name=enhance_level,json=enhanceLevel,proto3" json:"enhance_level,omitempty"` |
| 198 | HeroId string `protobuf:"bytes,5,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"` | 198 | HeroId string `protobuf:"bytes,5,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"` |
| 199 | Quality int32 `protobuf:"varint,6,opt,name=quality,proto3" json:"quality,omitempty"` | 199 | Quality int32 `protobuf:"varint,6,opt,name=quality,proto3" json:"quality,omitempty"` |
| 200 | - Left bool `protobuf:"varint,7,opt,name=left,proto3" json:"left,omitempty"` // 是否左手 只对戒指有效 | 200 | + Pos int32 `protobuf:"varint,7,opt,name=pos,proto3" json:"pos,omitempty"` |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | func (x *Equipment) Reset() { | 203 | func (x *Equipment) Reset() { |
| @@ -274,11 +274,11 @@ func (x *Equipment) GetQuality() int32 { | @@ -274,11 +274,11 @@ func (x *Equipment) GetQuality() int32 { | ||
| 274 | return 0 | 274 | return 0 |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | -func (x *Equipment) GetLeft() bool { | 277 | +func (x *Equipment) GetPos() int32 { |
| 278 | if x != nil { | 278 | if x != nil { |
| 279 | - return x.Left | 279 | + return x.Pos |
| 280 | } | 280 | } |
| 281 | - return false | 281 | + return 0 |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | type Prop struct { | 284 | type Prop struct { |
| @@ -683,7 +683,7 @@ var file_models_proto_rawDesc = []byte{ | @@ -683,7 +683,7 @@ var file_models_proto_rawDesc = []byte{ | ||
| 683 | 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, | 683 | 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, |
| 684 | 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, | 684 | 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, |
| 685 | 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, | 685 | 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, |
| 686 | - 0x70, 0x22, 0xb5, 0x01, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, | 686 | + 0x70, 0x22, 0xb3, 0x01, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, |
| 687 | 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, | 687 | 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, |
| 688 | 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, | 688 | 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, |
| 689 | 0x52, 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x13, 0x0a, 0x05, 0x74, 0x62, 0x5f, 0x69, | 689 | 0x52, 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x13, 0x0a, 0x05, 0x74, 0x62, 0x5f, 0x69, |
| @@ -693,65 +693,65 @@ var file_models_proto_rawDesc = []byte{ | @@ -693,65 +693,65 @@ var file_models_proto_rawDesc = []byte{ | ||
| 693 | 0x65, 0x6c, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, | 693 | 0x65, 0x6c, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, |
| 694 | 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x71, | 694 | 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x71, |
| 695 | 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, | 695 | 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, |
| 696 | - 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x18, 0x07, 0x20, | ||
| 697 | - 0x01, 0x28, 0x08, 0x52, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x22, 0x2c, 0x0a, 0x04, 0x50, 0x72, 0x6f, | ||
| 698 | - 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, | ||
| 699 | - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, | ||
| 700 | - 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x80, 0x01, 0x0a, 0x04, 0x54, 0x65, 0x61, 0x6d, | ||
| 701 | - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, | ||
| 702 | - 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, | ||
| 703 | - 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, | ||
| 704 | - 0x6f, 0x5f, 0x69, 0x64, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, | ||
| 705 | - 0x6f, 0x49, 0x64, 0x31, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x32, | ||
| 706 | - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x32, 0x12, | ||
| 707 | - 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x33, 0x18, 0x05, 0x20, 0x01, 0x28, | ||
| 708 | - 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x33, 0x22, 0x2f, 0x0a, 0x09, 0x49, 0x6e, | ||
| 709 | - 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, | ||
| 710 | - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, | ||
| 711 | - 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x22, 0x9a, 0x05, 0x0a, 0x04, | ||
| 712 | - 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, | ||
| 713 | - 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, | ||
| 714 | - 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, | ||
| 715 | - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, | ||
| 716 | - 0x0a, 0x04, 0x6e, 0x69, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x69, | ||
| 717 | - 0x63, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, | ||
| 718 | - 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, | ||
| 719 | - 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, | ||
| 720 | - 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x68, 0x70, 0x12, 0x15, 0x0a, 0x06, 0x68, 0x70, | ||
| 721 | - 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x68, 0x70, 0x4d, 0x61, | ||
| 722 | - 0x78, 0x12, 0x13, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x5f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, | ||
| 723 | - 0x52, 0x04, 0x62, 0x75, 0x79, 0x52, 0x12, 0x13, 0x0a, 0x05, 0x70, 0x61, 0x79, 0x5f, 0x72, 0x18, | ||
| 724 | - 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x79, 0x52, 0x12, 0x10, 0x0a, 0x03, 0x64, | ||
| 725 | - 0x65, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x65, 0x6c, 0x12, 0x30, 0x0a, | ||
| 726 | - 0x06, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, | ||
| 727 | - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x49, 0x6e, 0x63, 0x72, | ||
| 728 | - 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x12, | ||
| 729 | - 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, | ||
| 730 | - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6c, 0x6f, 0x74, 0x68, 0x65, 0x73, | ||
| 731 | - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x63, 0x6c, 0x6f, | ||
| 732 | - 0x74, 0x68, 0x65, 0x73, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x61, | ||
| 733 | - 0x70, 0x6f, 0x6e, 0x73, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0d, 0x52, | ||
| 734 | - 0x0c, 0x77, 0x65, 0x61, 0x70, 0x6f, 0x6e, 0x73, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1e, 0x0a, | ||
| 735 | - 0x0a, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, | ||
| 736 | - 0x0d, 0x52, 0x0a, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x22, 0x0a, | ||
| 737 | - 0x0c, 0x6a, 0x65, 0x77, 0x65, 0x6c, 0x72, 0x79, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x13, 0x20, | ||
| 738 | - 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6a, 0x65, 0x77, 0x65, 0x6c, 0x72, 0x79, 0x6c, 0x69, 0x6d, 0x69, | ||
| 739 | - 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x6c, 0x69, 0x6d, | ||
| 740 | - 0x69, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, | ||
| 741 | - 0x61, 0x6c, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x43, 0x0a, 0x0d, 0x70, 0x61, 0x73, 0x73, 0x5f, | ||
| 742 | - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x15, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, | ||
| 743 | - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x61, 0x73, | ||
| 744 | - 0x73, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, | ||
| 745 | - 0x70, 0x61, 0x73, 0x73, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x39, 0x0a, 0x0b, | ||
| 746 | - 0x49, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, | ||
| 747 | - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, | ||
| 748 | - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, | ||
| 749 | - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x50, 0x61, 0x73, 0x73, 0x43, | ||
| 750 | - 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, | ||
| 751 | - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, | ||
| 752 | - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, | ||
| 753 | - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, | ||
| 754 | - 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | 696 | + 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x07, 0x20, 0x01, |
| 697 | + 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x2c, 0x0a, 0x04, 0x50, 0x72, 0x6f, 0x70, 0x12, | ||
| 698 | + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, | ||
| 699 | + 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, | ||
| 700 | + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x80, 0x01, 0x0a, 0x04, 0x54, 0x65, 0x61, 0x6d, 0x12, 0x0e, | ||
| 701 | + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, | ||
| 702 | + 0x0a, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, | ||
| 703 | + 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, | ||
| 704 | + 0x69, 0x64, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, | ||
| 705 | + 0x64, 0x31, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x32, 0x18, 0x04, | ||
| 706 | + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x32, 0x12, 0x19, 0x0a, | ||
| 707 | + 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x33, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, | ||
| 708 | + 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x33, 0x22, 0x2f, 0x0a, 0x09, 0x49, 0x6e, 0x63, 0x72, | ||
| 709 | + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, | ||
| 710 | + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, | ||
| 711 | + 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x22, 0x9a, 0x05, 0x0a, 0x04, 0x52, 0x6f, | ||
| 712 | + 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, | ||
| 713 | + 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, | ||
| 714 | + 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, | ||
| 715 | + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, | ||
| 716 | + 0x6e, 0x69, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x69, 0x63, 0x6b, | ||
| 717 | + 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, | ||
| 718 | + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, | ||
| 719 | + 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x07, | ||
| 720 | + 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x68, 0x70, 0x12, 0x15, 0x0a, 0x06, 0x68, 0x70, 0x5f, 0x6d, | ||
| 721 | + 0x61, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x68, 0x70, 0x4d, 0x61, 0x78, 0x12, | ||
| 722 | + 0x13, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x5f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, | ||
| 723 | + 0x62, 0x75, 0x79, 0x52, 0x12, 0x13, 0x0a, 0x05, 0x70, 0x61, 0x79, 0x5f, 0x72, 0x18, 0x0c, 0x20, | ||
| 724 | + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x79, 0x52, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x65, 0x6c, | ||
| 725 | + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x65, 0x6c, 0x12, 0x30, 0x0a, 0x06, 0x69, | ||
| 726 | + 0x6e, 0x63, 0x72, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, | ||
| 727 | + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x73, | ||
| 728 | + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x12, 0x14, 0x0a, | ||
| 729 | + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, | ||
| 730 | + 0x65, 0x6d, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6c, 0x6f, 0x74, 0x68, 0x65, 0x73, 0x6c, 0x69, | ||
| 731 | + 0x6d, 0x69, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x63, 0x6c, 0x6f, 0x74, 0x68, | ||
| 732 | + 0x65, 0x73, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x61, 0x70, 0x6f, | ||
| 733 | + 0x6e, 0x73, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x77, | ||
| 734 | + 0x65, 0x61, 0x70, 0x6f, 0x6e, 0x73, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, | ||
| 735 | + 0x74, 0x68, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0d, 0x52, | ||
| 736 | + 0x0a, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6a, | ||
| 737 | + 0x65, 0x77, 0x65, 0x6c, 0x72, 0x79, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, | ||
| 738 | + 0x0d, 0x52, 0x0c, 0x6a, 0x65, 0x77, 0x65, 0x6c, 0x72, 0x79, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, | ||
| 739 | + 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x6c, 0x69, 0x6d, 0x69, 0x74, | ||
| 740 | + 0x18, 0x14, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, | ||
| 741 | + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x43, 0x0a, 0x0d, 0x70, 0x61, 0x73, 0x73, 0x5f, 0x63, 0x68, | ||
| 742 | + 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x15, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, | ||
| 743 | + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x43, | ||
| 744 | + 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x70, 0x61, | ||
| 745 | + 0x73, 0x73, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x49, 0x6e, | ||
| 746 | + 0x63, 0x72, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, | ||
| 747 | + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, | ||
| 748 | + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, | ||
| 749 | + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x50, 0x61, 0x73, 0x73, 0x43, 0x68, 0x61, | ||
| 750 | + 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, | ||
| 751 | + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, | ||
| 752 | + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, | ||
| 753 | + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, | ||
| 754 | + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||
| 755 | } | 755 | } |
| 756 | 756 | ||
| 757 | var ( | 757 | var ( |
pb/protocode.pb.go
| @@ -35,12 +35,13 @@ const ( | @@ -35,12 +35,13 @@ const ( | ||
| 35 | ProtoCode_RoleRsp ProtoCode = 9 | 35 | ProtoCode_RoleRsp ProtoCode = 9 |
| 36 | ProtoCode_RoleUpdatePropertyRsp ProtoCode = 10 | 36 | ProtoCode_RoleUpdatePropertyRsp ProtoCode = 10 |
| 37 | ProtoCode_RoleUpdateItemsRsp ProtoCode = 11 | 37 | ProtoCode_RoleUpdateItemsRsp ProtoCode = 11 |
| 38 | - ProtoCode_RoleClearItemsReq ProtoCode = 12 | ||
| 39 | - ProtoCode_RoleStartBattleReq ProtoCode = 13 | ||
| 40 | - ProtoCode_RoleEndBattleReq ProtoCode = 14 | ||
| 41 | - ProtoCode_RoleEndBattleRsp ProtoCode = 15 | ||
| 42 | - ProtoCode_EquipmentDelReq ProtoCode = 16 | ||
| 43 | - ProtoCode_EquipmentAddRsp ProtoCode = 17 | 38 | + ProtoCode_RoleUpdateChangeRsp ProtoCode = 12 |
| 39 | + ProtoCode_RoleClearItemsReq ProtoCode = 13 | ||
| 40 | + ProtoCode_RoleStartBattleReq ProtoCode = 14 | ||
| 41 | + ProtoCode_RoleEndBattleReq ProtoCode = 15 | ||
| 42 | + ProtoCode_RoleEndBattleRsp ProtoCode = 16 | ||
| 43 | + ProtoCode_EquipmentDelReq ProtoCode = 17 | ||
| 44 | + ProtoCode_EquipmentAddRsp ProtoCode = 18 | ||
| 44 | ) | 45 | ) |
| 45 | 46 | ||
| 46 | // Enum value maps for ProtoCode. | 47 | // Enum value maps for ProtoCode. |
| @@ -58,12 +59,13 @@ var ( | @@ -58,12 +59,13 @@ var ( | ||
| 58 | 9: "RoleRsp", | 59 | 9: "RoleRsp", |
| 59 | 10: "RoleUpdatePropertyRsp", | 60 | 10: "RoleUpdatePropertyRsp", |
| 60 | 11: "RoleUpdateItemsRsp", | 61 | 11: "RoleUpdateItemsRsp", |
| 61 | - 12: "RoleClearItemsReq", | ||
| 62 | - 13: "RoleStartBattleReq", | ||
| 63 | - 14: "RoleEndBattleReq", | ||
| 64 | - 15: "RoleEndBattleRsp", | ||
| 65 | - 16: "EquipmentDelReq", | ||
| 66 | - 17: "EquipmentAddRsp", | 62 | + 12: "RoleUpdateChangeRsp", |
| 63 | + 13: "RoleClearItemsReq", | ||
| 64 | + 14: "RoleStartBattleReq", | ||
| 65 | + 15: "RoleEndBattleReq", | ||
| 66 | + 16: "RoleEndBattleRsp", | ||
| 67 | + 17: "EquipmentDelReq", | ||
| 68 | + 18: "EquipmentAddRsp", | ||
| 67 | } | 69 | } |
| 68 | ProtoCode_value = map[string]int32{ | 70 | ProtoCode_value = map[string]int32{ |
| 69 | "UNKNOWN": 0, | 71 | "UNKNOWN": 0, |
| @@ -78,12 +80,13 @@ var ( | @@ -78,12 +80,13 @@ var ( | ||
| 78 | "RoleRsp": 9, | 80 | "RoleRsp": 9, |
| 79 | "RoleUpdatePropertyRsp": 10, | 81 | "RoleUpdatePropertyRsp": 10, |
| 80 | "RoleUpdateItemsRsp": 11, | 82 | "RoleUpdateItemsRsp": 11, |
| 81 | - "RoleClearItemsReq": 12, | ||
| 82 | - "RoleStartBattleReq": 13, | ||
| 83 | - "RoleEndBattleReq": 14, | ||
| 84 | - "RoleEndBattleRsp": 15, | ||
| 85 | - "EquipmentDelReq": 16, | ||
| 86 | - "EquipmentAddRsp": 17, | 83 | + "RoleUpdateChangeRsp": 12, |
| 84 | + "RoleClearItemsReq": 13, | ||
| 85 | + "RoleStartBattleReq": 14, | ||
| 86 | + "RoleEndBattleReq": 15, | ||
| 87 | + "RoleEndBattleRsp": 16, | ||
| 88 | + "EquipmentDelReq": 17, | ||
| 89 | + "EquipmentAddRsp": 18, | ||
| 87 | } | 90 | } |
| 88 | ) | 91 | ) |
| 89 | 92 | ||
| @@ -118,7 +121,7 @@ var File_protocode_proto protoreflect.FileDescriptor | @@ -118,7 +121,7 @@ var File_protocode_proto protoreflect.FileDescriptor | ||
| 118 | 121 | ||
| 119 | var file_protocode_proto_rawDesc = []byte{ | 122 | var file_protocode_proto_rawDesc = []byte{ |
| 120 | 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, | 123 | 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, |
| 121 | - 0x6f, 0x12, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xe1, 0x02, 0x0a, | 124 | + 0x6f, 0x12, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xfa, 0x02, 0x0a, |
| 122 | 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, | 125 | 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, |
| 123 | 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, | 126 | 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, |
| 124 | 0x52, 0x73, 0x70, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x72, 0x74, 0x52, 0x65, | 127 | 0x52, 0x73, 0x70, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x72, 0x74, 0x52, 0x65, |
| @@ -132,17 +135,18 @@ var file_protocode_proto_rawDesc = []byte{ | @@ -132,17 +135,18 @@ var file_protocode_proto_rawDesc = []byte{ | ||
| 132 | 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x10, 0x09, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65, | 135 | 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x10, 0x09, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65, |
| 133 | 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x73, | 136 | 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x73, |
| 134 | 0x70, 0x10, 0x0a, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, | 137 | 0x70, 0x10, 0x0a, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, |
| 135 | - 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x10, 0x0b, 0x12, 0x15, 0x0a, 0x11, 0x52, | ||
| 136 | - 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, | ||
| 137 | - 0x10, 0x0c, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, | ||
| 138 | - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x10, 0x0d, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x6f, | ||
| 139 | - 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x10, 0x0e, | ||
| 140 | - 0x12, 0x14, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, | ||
| 141 | - 0x65, 0x52, 0x73, 0x70, 0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, | ||
| 142 | - 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x45, | ||
| 143 | - 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x10, 0x11, | ||
| 144 | - 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, | ||
| 145 | - 0x6f, 0x74, 0x6f, 0x33, | 138 | + 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x52, |
| 139 | + 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, | ||
| 140 | + 0x73, 0x70, 0x10, 0x0c, 0x12, 0x15, 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, | ||
| 141 | + 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x10, 0x0d, 0x12, 0x16, 0x0a, 0x12, 0x52, | ||
| 142 | + 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, | ||
| 143 | + 0x71, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, | ||
| 144 | + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x10, 0x0f, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x6f, 0x6c, | ||
| 145 | + 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x10, 0x10, 0x12, | ||
| 146 | + 0x13, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, | ||
| 147 | + 0x65, 0x71, 0x10, 0x11, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, | ||
| 148 | + 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x10, 0x12, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, | ||
| 149 | + 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||
| 146 | } | 150 | } |
| 147 | 151 | ||
| 148 | var ( | 152 | var ( |