zhangqijia / Pro2DServer

Commit 4e75670c3b7664c41b01c33bce9fc19ba77a9b2c

Authored by zhangqijia
1 parent 35adfcdb

fix: 首次通关记录到数据库

Showing 3 changed files with 198 additions and 198 deletions   Show diff stats
Inline Side-by-side
cmd/gameserver/action/RoleAction.go
  Show/Hide comments   View file @4e75670
... ... @@ -208,6 +208,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i
208 208 }
209 209 } else {
210 210 role.Role.PassChapters[req.ChapterId] = chapterCount + 1
  211 + role.UpdateProperty("pass_chapters", role.Role.PassChapters, false)
211 212 }
212 213  
213 214 for k, v := range common.StringToMapNum(carbonInfo.NormalAward) {
... ... @@ -236,7 +237,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i
236 237 t := team.(*models.TeamModel).Team
237 238 h1, ok := role.Heros[t.HeroId1]
238 239 if ok {
239   - level, exp := h1.(*models.HeroModel).UpLevel(amount)
  240 + level, exp = h1.(*models.HeroModel).UpLevel(amount)
240 241 h1.SetProperty("level", level)
241 242 h1.SetProperty("exp", exp)
242 243 heros = append(heros, h1.(*models.HeroModel).Hero)
... ... @@ -244,7 +245,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i
244 245  
245 246 h2, ok := role.Heros[t.HeroId2]
246 247 if ok {
247   - level, exp := h2.(*models.HeroModel).UpLevel(amount)
  248 + level, exp = h2.(*models.HeroModel).UpLevel(amount)
248 249 h2.SetProperty("level", level)
249 250 h2.SetProperty("exp", exp)
250 251 heros = append(heros, h2.(*models.HeroModel).Hero)
... ... @@ -252,7 +253,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i
252 253  
253 254 h3, ok := role.Heros[t.HeroId3]
254 255 if ok {
255   - level, exp := h3.(*models.HeroModel).UpLevel(amount)
  256 + level, exp = h3.(*models.HeroModel).UpLevel(amount)
256 257 h3.SetProperty("level", level)
257 258 h3.SetProperty("exp", exp)
258 259 heros = append(heros, h3.(*models.HeroModel).Hero)
... ...
pb/game.pb.go
  Show/Hide comments   View file @4e75670
... ... @@ -313,21 +313,76 @@ func (x *ChangeTeamReq) GetTeam() []*Team {
313 313 return nil
314 314 }
315 315  
  316 +type EquipInfo struct {
  317 + state protoimpl.MessageState
  318 + sizeCache protoimpl.SizeCache
  319 + unknownFields protoimpl.UnknownFields
  320 +
  321 + EquipId string `protobuf:"bytes,1,opt,name=equipId,proto3" json:"equipId,omitempty"`
  322 + Pos int32 `protobuf:"varint,2,opt,name=pos,proto3" json:"pos,omitempty"`
  323 +}
  324 +
  325 +func (x *EquipInfo) Reset() {
  326 + *x = EquipInfo{}
  327 + if protoimpl.UnsafeEnabled {
  328 + mi := &file_game_proto_msgTypes[6]
  329 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  330 + ms.StoreMessageInfo(mi)
  331 + }
  332 +}
  333 +
  334 +func (x *EquipInfo) String() string {
  335 + return protoimpl.X.MessageStringOf(x)
  336 +}
  337 +
  338 +func (*EquipInfo) ProtoMessage() {}
  339 +
  340 +func (x *EquipInfo) ProtoReflect() protoreflect.Message {
  341 + mi := &file_game_proto_msgTypes[6]
  342 + if protoimpl.UnsafeEnabled && x != nil {
  343 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  344 + if ms.LoadMessageInfo() == nil {
  345 + ms.StoreMessageInfo(mi)
  346 + }
  347 + return ms
  348 + }
  349 + return mi.MessageOf(x)
  350 +}
  351 +
  352 +// Deprecated: Use EquipInfo.ProtoReflect.Descriptor instead.
  353 +func (*EquipInfo) Descriptor() ([]byte, []int) {
  354 + return file_game_proto_rawDescGZIP(), []int{6}
  355 +}
  356 +
  357 +func (x *EquipInfo) GetEquipId() string {
  358 + if x != nil {
  359 + return x.EquipId
  360 + }
  361 + return ""
  362 +}
  363 +
  364 +func (x *EquipInfo) GetPos() int32 {
  365 + if x != nil {
  366 + return x.Pos
  367 + }
  368 + return 0
  369 +}
  370 +
316 371 //ResponseCmd HeroEquipReferReq
317 372 type HeroEquipReferReq struct {
318 373 state protoimpl.MessageState
319 374 sizeCache protoimpl.SizeCache
320 375 unknownFields protoimpl.UnknownFields
321 376  
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 脱下
  377 + EquipIds []*EquipInfo `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds,omitempty"`
  378 + HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"`
  379 + Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴， false 脱下
325 380 }
326 381  
327 382 func (x *HeroEquipReferReq) Reset() {
328 383 *x = HeroEquipReferReq{}
329 384 if protoimpl.UnsafeEnabled {
330   - mi := &file_game_proto_msgTypes[6]
  385 + mi := &file_game_proto_msgTypes[7]
331 386 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
332 387 ms.StoreMessageInfo(mi)
333 388 }
... ... @@ -340,7 +395,7 @@ func (x *HeroEquipReferReq) String() string {
340 395 func (*HeroEquipReferReq) ProtoMessage() {}
341 396  
342 397 func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message {
343   - mi := &file_game_proto_msgTypes[6]
  398 + mi := &file_game_proto_msgTypes[7]
344 399 if protoimpl.UnsafeEnabled && x != nil {
345 400 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
346 401 if ms.LoadMessageInfo() == nil {
... ... @@ -353,10 +408,10 @@ func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message {
353 408  
354 409 // Deprecated: Use HeroEquipReferReq.ProtoReflect.Descriptor instead.
355 410 func (*HeroEquipReferReq) Descriptor() ([]byte, []int) {
356   - return file_game_proto_rawDescGZIP(), []int{6}
  411 + return file_game_proto_rawDescGZIP(), []int{7}
357 412 }
358 413  
359   -func (x *HeroEquipReferReq) GetEquipIds() []*HeroEquipReferReq_EquipInfo {
  414 +func (x *HeroEquipReferReq) GetEquipIds() []*EquipInfo {
360 415 if x != nil {
361 416 return x.EquipIds
362 417 }
... ... @@ -391,7 +446,7 @@ type RoleRsp struct {
391 446 func (x *RoleRsp) Reset() {
392 447 *x = RoleRsp{}
393 448 if protoimpl.UnsafeEnabled {
394   - mi := &file_game_proto_msgTypes[7]
  449 + mi := &file_game_proto_msgTypes[8]
395 450 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
396 451 ms.StoreMessageInfo(mi)
397 452 }
... ... @@ -404,7 +459,7 @@ func (x *RoleRsp) String() string {
404 459 func (*RoleRsp) ProtoMessage() {}
405 460  
406 461 func (x *RoleRsp) ProtoReflect() protoreflect.Message {
407   - mi := &file_game_proto_msgTypes[7]
  462 + mi := &file_game_proto_msgTypes[8]
408 463 if protoimpl.UnsafeEnabled && x != nil {
409 464 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
410 465 if ms.LoadMessageInfo() == nil {
... ... @@ -417,7 +472,7 @@ func (x *RoleRsp) ProtoReflect() protoreflect.Message {
417 472  
418 473 // Deprecated: Use RoleRsp.ProtoReflect.Descriptor instead.
419 474 func (*RoleRsp) Descriptor() ([]byte, []int) {
420   - return file_game_proto_rawDescGZIP(), []int{7}
  475 + return file_game_proto_rawDescGZIP(), []int{8}
421 476 }
422 477  
423 478 func (x *RoleRsp) GetRole() *Role {
... ... @@ -461,7 +516,7 @@ type RoleUpdatePropertyRsp struct {
461 516 func (x *RoleUpdatePropertyRsp) Reset() {
462 517 *x = RoleUpdatePropertyRsp{}
463 518 if protoimpl.UnsafeEnabled {
464   - mi := &file_game_proto_msgTypes[8]
  519 + mi := &file_game_proto_msgTypes[9]
465 520 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
466 521 ms.StoreMessageInfo(mi)
467 522 }
... ... @@ -474,7 +529,7 @@ func (x *RoleUpdatePropertyRsp) String() string {
474 529 func (*RoleUpdatePropertyRsp) ProtoMessage() {}
475 530  
476 531 func (x *RoleUpdatePropertyRsp) ProtoReflect() protoreflect.Message {
477   - mi := &file_game_proto_msgTypes[8]
  532 + mi := &file_game_proto_msgTypes[9]
478 533 if protoimpl.UnsafeEnabled && x != nil {
479 534 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
480 535 if ms.LoadMessageInfo() == nil {
... ... @@ -487,7 +542,7 @@ func (x *RoleUpdatePropertyRsp) ProtoReflect() protoreflect.Message {
487 542  
488 543 // Deprecated: Use RoleUpdatePropertyRsp.ProtoReflect.Descriptor instead.
489 544 func (*RoleUpdatePropertyRsp) Descriptor() ([]byte, []int) {
490   - return file_game_proto_rawDescGZIP(), []int{8}
  545 + return file_game_proto_rawDescGZIP(), []int{9}
491 546 }
492 547  
493 548 func (x *RoleUpdatePropertyRsp) GetId() []int32 {
... ... @@ -516,7 +571,7 @@ type RoleUpdateItemsRsp struct {
516 571 func (x *RoleUpdateItemsRsp) Reset() {
517 572 *x = RoleUpdateItemsRsp{}
518 573 if protoimpl.UnsafeEnabled {
519   - mi := &file_game_proto_msgTypes[9]
  574 + mi := &file_game_proto_msgTypes[10]
520 575 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
521 576 ms.StoreMessageInfo(mi)
522 577 }
... ... @@ -529,7 +584,7 @@ func (x *RoleUpdateItemsRsp) String() string {
529 584 func (*RoleUpdateItemsRsp) ProtoMessage() {}
530 585  
531 586 func (x *RoleUpdateItemsRsp) ProtoReflect() protoreflect.Message {
532   - mi := &file_game_proto_msgTypes[9]
  587 + mi := &file_game_proto_msgTypes[10]
533 588 if protoimpl.UnsafeEnabled && x != nil {
534 589 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
535 590 if ms.LoadMessageInfo() == nil {
... ... @@ -542,7 +597,7 @@ func (x *RoleUpdateItemsRsp) ProtoReflect() protoreflect.Message {
542 597  
543 598 // Deprecated: Use RoleUpdateItemsRsp.ProtoReflect.Descriptor instead.
544 599 func (*RoleUpdateItemsRsp) Descriptor() ([]byte, []int) {
545   - return file_game_proto_rawDescGZIP(), []int{9}
  600 + return file_game_proto_rawDescGZIP(), []int{10}
546 601 }
547 602  
548 603 func (x *RoleUpdateItemsRsp) GetItems() string {
... ... @@ -561,7 +616,7 @@ type RoleUpdateChangeRsp struct {
561 616 func (x *RoleUpdateChangeRsp) Reset() {
562 617 *x = RoleUpdateChangeRsp{}
563 618 if protoimpl.UnsafeEnabled {
564   - mi := &file_game_proto_msgTypes[10]
  619 + mi := &file_game_proto_msgTypes[11]
565 620 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
566 621 ms.StoreMessageInfo(mi)
567 622 }
... ... @@ -574,7 +629,7 @@ func (x *RoleUpdateChangeRsp) String() string {
574 629 func (*RoleUpdateChangeRsp) ProtoMessage() {}
575 630  
576 631 func (x *RoleUpdateChangeRsp) ProtoReflect() protoreflect.Message {
577   - mi := &file_game_proto_msgTypes[10]
  632 + mi := &file_game_proto_msgTypes[11]
578 633 if protoimpl.UnsafeEnabled && x != nil {
579 634 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
580 635 if ms.LoadMessageInfo() == nil {
... ... @@ -587,7 +642,7 @@ func (x *RoleUpdateChangeRsp) ProtoReflect() protoreflect.Message {
587 642  
588 643 // Deprecated: Use RoleUpdateChangeRsp.ProtoReflect.Descriptor instead.
589 644 func (*RoleUpdateChangeRsp) Descriptor() ([]byte, []int) {
590   - return file_game_proto_rawDescGZIP(), []int{10}
  645 + return file_game_proto_rawDescGZIP(), []int{11}
591 646 }
592 647  
593 648 //ResponseCmd RoleClearItemsReq
... ... @@ -602,7 +657,7 @@ type RoleClearItemsReq struct {
602 657 func (x *RoleClearItemsReq) Reset() {
603 658 *x = RoleClearItemsReq{}
604 659 if protoimpl.UnsafeEnabled {
605   - mi := &file_game_proto_msgTypes[11]
  660 + mi := &file_game_proto_msgTypes[12]
606 661 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
607 662 ms.StoreMessageInfo(mi)
608 663 }
... ... @@ -615,7 +670,7 @@ func (x *RoleClearItemsReq) String() string {
615 670 func (*RoleClearItemsReq) ProtoMessage() {}
616 671  
617 672 func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message {
618   - mi := &file_game_proto_msgTypes[11]
  673 + mi := &file_game_proto_msgTypes[12]
619 674 if protoimpl.UnsafeEnabled && x != nil {
620 675 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
621 676 if ms.LoadMessageInfo() == nil {
... ... @@ -628,7 +683,7 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message {
628 683  
629 684 // Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead.
630 685 func (*RoleClearItemsReq) Descriptor() ([]byte, []int) {
631   - return file_game_proto_rawDescGZIP(), []int{11}
  686 + return file_game_proto_rawDescGZIP(), []int{12}
632 687 }
633 688  
634 689 func (x *RoleClearItemsReq) GetItems() []string {
... ... @@ -650,7 +705,7 @@ type RoleStartBattleReq struct {
650 705 func (x *RoleStartBattleReq) Reset() {
651 706 *x = RoleStartBattleReq{}
652 707 if protoimpl.UnsafeEnabled {
653   - mi := &file_game_proto_msgTypes[12]
  708 + mi := &file_game_proto_msgTypes[13]
654 709 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
655 710 ms.StoreMessageInfo(mi)
656 711 }
... ... @@ -663,7 +718,7 @@ func (x *RoleStartBattleReq) String() string {
663 718 func (*RoleStartBattleReq) ProtoMessage() {}
664 719  
665 720 func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message {
666   - mi := &file_game_proto_msgTypes[12]
  721 + mi := &file_game_proto_msgTypes[13]
667 722 if protoimpl.UnsafeEnabled && x != nil {
668 723 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
669 724 if ms.LoadMessageInfo() == nil {
... ... @@ -676,7 +731,7 @@ func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message {
676 731  
677 732 // Deprecated: Use RoleStartBattleReq.ProtoReflect.Descriptor instead.
678 733 func (*RoleStartBattleReq) Descriptor() ([]byte, []int) {
679   - return file_game_proto_rawDescGZIP(), []int{12}
  734 + return file_game_proto_rawDescGZIP(), []int{13}
680 735 }
681 736  
682 737 func (x *RoleStartBattleReq) GetChapterId() int32 {
... ... @@ -708,7 +763,7 @@ type RoleEndBattleReq struct {
708 763 func (x *RoleEndBattleReq) Reset() {
709 764 *x = RoleEndBattleReq{}
710 765 if protoimpl.UnsafeEnabled {
711   - mi := &file_game_proto_msgTypes[13]
  766 + mi := &file_game_proto_msgTypes[14]
712 767 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
713 768 ms.StoreMessageInfo(mi)
714 769 }
... ... @@ -721,7 +776,7 @@ func (x *RoleEndBattleReq) String() string {
721 776 func (*RoleEndBattleReq) ProtoMessage() {}
722 777  
723 778 func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message {
724   - mi := &file_game_proto_msgTypes[13]
  779 + mi := &file_game_proto_msgTypes[14]
725 780 if protoimpl.UnsafeEnabled && x != nil {
726 781 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
727 782 if ms.LoadMessageInfo() == nil {
... ... @@ -734,7 +789,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message {
734 789  
735 790 // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead.
736 791 func (*RoleEndBattleReq) Descriptor() ([]byte, []int) {
737   - return file_game_proto_rawDescGZIP(), []int{13}
  792 + return file_game_proto_rawDescGZIP(), []int{14}
738 793 }
739 794  
740 795 func (x *RoleEndBattleReq) GetChapterId() int32 {
... ... @@ -782,7 +837,7 @@ type RoleEndBattleRsp struct {
782 837 func (x *RoleEndBattleRsp) Reset() {
783 838 *x = RoleEndBattleRsp{}
784 839 if protoimpl.UnsafeEnabled {
785   - mi := &file_game_proto_msgTypes[14]
  840 + mi := &file_game_proto_msgTypes[15]
786 841 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
787 842 ms.StoreMessageInfo(mi)
788 843 }
... ... @@ -795,7 +850,7 @@ func (x *RoleEndBattleRsp) String() string {
795 850 func (*RoleEndBattleRsp) ProtoMessage() {}
796 851  
797 852 func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message {
798   - mi := &file_game_proto_msgTypes[14]
  853 + mi := &file_game_proto_msgTypes[15]
799 854 if protoimpl.UnsafeEnabled && x != nil {
800 855 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
801 856 if ms.LoadMessageInfo() == nil {
... ... @@ -808,7 +863,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message {
808 863  
809 864 // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead.
810 865 func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) {
811   - return file_game_proto_rawDescGZIP(), []int{14}
  866 + return file_game_proto_rawDescGZIP(), []int{15}
812 867 }
813 868  
814 869 func (x *RoleEndBattleRsp) GetRoleLevel() int32 {
... ... @@ -865,7 +920,7 @@ type EquipmentDelReq struct {
865 920 func (x *EquipmentDelReq) Reset() {
866 921 *x = EquipmentDelReq{}
867 922 if protoimpl.UnsafeEnabled {
868   - mi := &file_game_proto_msgTypes[15]
  923 + mi := &file_game_proto_msgTypes[16]
869 924 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
870 925 ms.StoreMessageInfo(mi)
871 926 }
... ... @@ -878,7 +933,7 @@ func (x *EquipmentDelReq) String() string {
878 933 func (*EquipmentDelReq) ProtoMessage() {}
879 934  
880 935 func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message {
881   - mi := &file_game_proto_msgTypes[15]
  936 + mi := &file_game_proto_msgTypes[16]
882 937 if protoimpl.UnsafeEnabled && x != nil {
883 938 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
884 939 if ms.LoadMessageInfo() == nil {
... ... @@ -891,7 +946,7 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message {
891 946  
892 947 // Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead.
893 948 func (*EquipmentDelReq) Descriptor() ([]byte, []int) {
894   - return file_game_proto_rawDescGZIP(), []int{15}
  949 + return file_game_proto_rawDescGZIP(), []int{16}
895 950 }
896 951  
897 952 func (x *EquipmentDelReq) GetId() []string {
... ... @@ -913,7 +968,7 @@ type EquipmentAddRsp struct {
913 968 func (x *EquipmentAddRsp) Reset() {
914 969 *x = EquipmentAddRsp{}
915 970 if protoimpl.UnsafeEnabled {
916   - mi := &file_game_proto_msgTypes[16]
  971 + mi := &file_game_proto_msgTypes[17]
917 972 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
918 973 ms.StoreMessageInfo(mi)
919 974 }
... ... @@ -926,7 +981,7 @@ func (x *EquipmentAddRsp) String() string {
926 981 func (*EquipmentAddRsp) ProtoMessage() {}
927 982  
928 983 func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message {
929   - mi := &file_game_proto_msgTypes[16]
  984 + mi := &file_game_proto_msgTypes[17]
930 985 if protoimpl.UnsafeEnabled && x != nil {
931 986 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
932 987 if ms.LoadMessageInfo() == nil {
... ... @@ -939,7 +994,7 @@ func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message {
939 994  
940 995 // Deprecated: Use EquipmentAddRsp.ProtoReflect.Descriptor instead.
941 996 func (*EquipmentAddRsp) Descriptor() ([]byte, []int) {
942   - return file_game_proto_rawDescGZIP(), []int{16}
  997 + return file_game_proto_rawDescGZIP(), []int{17}
943 998 }
944 999  
945 1000 func (x *EquipmentAddRsp) GetEquip() *Equipment {
... ... @@ -949,61 +1004,6 @@ func (x *EquipmentAddRsp) GetEquip() *Equipment {
949 1004 return nil
950 1005 }
951 1006  
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   -
1007 1007 var File_game_proto protoreflect.FileDescriptor
1008 1008  
1009 1009 var file_game_proto_rawDesc = []byte{
... ... @@ -1024,73 +1024,72 @@ var file_game_proto_rawDesc = []byte{
1024 1024 0x65, 0x63, 0x74, 0x52, 0x73, 0x70, 0x22, 0x31, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
1025 1025 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18,
1026 1026 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54,
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,
1059   - 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14,
1060   - 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69,
1061   - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72,
1062   - 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68,
1063   - 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
1064   - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72,
1065   - 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61,
1066   - 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x7b, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e,
1067   - 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68,
1068   - 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
1069   - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72,
1070   - 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61,
1071   - 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03,
1072   - 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65,
1073   - 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61,
1074   - 0x6d, 0x49, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42,
1075   - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65,
1076   - 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f,
1077   - 0x6c, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f,
1078   - 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45,
1079   - 0x78, 0x70, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d,
1080   - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65,
1081   - 0x45, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77,
1082   - 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
1083   - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
1084   - 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20,
1085   - 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72,
1086   - 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70,
1087   - 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
1088   - 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71,
1089   - 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x27, 0x0a,
1090   - 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d,
1091   - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52,
1092   - 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b,
1093   - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
  1027 + 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x37, 0x0a, 0x09, 0x45, 0x71, 0x75,
  1028 + 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49,
  1029 + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64,
  1030 + 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70,
  1031 + 0x6f, 0x73, 0x22, 0x6f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52,
  1032 + 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x2b, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70,
  1033 + 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x67, 0x61, 0x6d, 0x65,
  1034 + 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69,
  1035 + 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18,
  1036 + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a,
  1037 + 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65,
  1038 + 0x66, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12,
  1039 + 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
  1040 + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c,
  1041 + 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
  1042 + 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68,
  1043 + 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28,
  1044 + 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52,
  1045 + 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
  1046 + 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
  1047 + 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x65, 0x71,
  1048 + 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65,
  1049 + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x73,
  1050 + 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x02, 0x69,
  1051 + 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
  1052 + 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72,
  1053 + 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74,
  1054 + 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65,
  1055 + 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22,
  1056 + 0x15, 0x0a, 0x13, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61,
  1057 + 0x6e, 0x67, 0x65, 0x52, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c,
  1058 + 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69,
  1059 + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d,
  1060 + 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61,
  1061 + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74,
  1062 + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61,
  1063 + 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e,
  1064 + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f,
  1065 + 0x6e, 0x49, 0x64, 0x22, 0x7b, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61,
  1066 + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74,
  1067 + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61,
  1068 + 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e,
  1069 + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f,
  1070 + 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
  1071 + 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f,
  1072 + 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64,
  1073 + 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74,
  1074 + 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x6c, 0x65,
  1075 + 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, 0x6c, 0x65, 0x4c,
  1076 + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70,
  1077 + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x12,
  1078 + 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
  1079 + 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70,
  1080 + 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
  1081 + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12,
  1082 + 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61,
  1083 + 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
  1084 + 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
  1085 + 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
  1086 + 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
  1087 + 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70,
  1088 + 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x71,
  1089 + 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
  1090 + 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71,
  1091 + 0x75, 0x69, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62,
  1092 + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
1094 1093 }
1095 1094  
1096 1095 var (
... ... @@ -1107,32 +1106,32 @@ func file_game_proto_rawDescGZIP() []byte {
1107 1106  
1108 1107 var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
1109 1108 var file_game_proto_goTypes = []interface{}{
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
  1109 + (*HeartReq)(nil), // 0: game.HeartReq
  1110 + (*HeartRsp)(nil), // 1: game.HeartRsp
  1111 + (*LoginReq)(nil), // 2: game.LoginReq
  1112 + (*CreateReq)(nil), // 3: game.CreateReq
  1113 + (*DisConnectRsp)(nil), // 4: game.DisConnectRsp
  1114 + (*ChangeTeamReq)(nil), // 5: game.ChangeTeamReq
  1115 + (*EquipInfo)(nil), // 6: game.EquipInfo
  1116 + (*HeroEquipReferReq)(nil), // 7: game.HeroEquipReferReq
  1117 + (*RoleRsp)(nil), // 8: game.RoleRsp
  1118 + (*RoleUpdatePropertyRsp)(nil), // 9: game.RoleUpdatePropertyRsp
  1119 + (*RoleUpdateItemsRsp)(nil), // 10: game.RoleUpdateItemsRsp
  1120 + (*RoleUpdateChangeRsp)(nil), // 11: game.RoleUpdateChangeRsp
  1121 + (*RoleClearItemsReq)(nil), // 12: game.RoleClearItemsReq
  1122 + (*RoleStartBattleReq)(nil), // 13: game.RoleStartBattleReq
  1123 + (*RoleEndBattleReq)(nil), // 14: game.RoleEndBattleReq
  1124 + (*RoleEndBattleRsp)(nil), // 15: game.RoleEndBattleRsp
  1125 + (*EquipmentDelReq)(nil), // 16: game.EquipmentDelReq
  1126 + (*EquipmentAddRsp)(nil), // 17: game.EquipmentAddRsp
  1127 + (*Team)(nil), // 18: models.Team
  1128 + (*Role)(nil), // 19: models.Role
  1129 + (*Hero)(nil), // 20: models.Hero
  1130 + (*Equipment)(nil), // 21: models.Equipment
1132 1131 }
1133 1132 var file_game_proto_depIdxs = []int32{
1134 1133 18, // 0: game.ChangeTeamReq.team:type_name -> models.Team
1135   - 17, // 1: game.HeroEquipReferReq.equipIds:type_name -> game.HeroEquipReferReq.EquipInfo
  1134 + 6, // 1: game.HeroEquipReferReq.equipIds:type_name -> game.EquipInfo
1136 1135 19, // 2: game.RoleRsp.role:type_name -> models.Role
1137 1136 20, // 3: game.RoleRsp.hero:type_name -> models.Hero
1138 1137 18, // 4: game.RoleRsp.team:type_name -> models.Team
... ... @@ -1227,7 +1226,7 @@ func file_game_proto_init() {
1227 1226 }
1228 1227 }
1229 1228 file_game_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
1230   - switch v := v.(*HeroEquipReferReq); i {
  1229 + switch v := v.(*EquipInfo); i {
1231 1230 case 0:
1232 1231 return &v.state
1233 1232 case 1:
... ... @@ -1239,7 +1238,7 @@ func file_game_proto_init() {
1239 1238 }
1240 1239 }
1241 1240 file_game_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
1242   - switch v := v.(*RoleRsp); i {
  1241 + switch v := v.(*HeroEquipReferReq); i {
1243 1242 case 0:
1244 1243 return &v.state
1245 1244 case 1:
... ... @@ -1251,7 +1250,7 @@ func file_game_proto_init() {
1251 1250 }
1252 1251 }
1253 1252 file_game_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
1254   - switch v := v.(*RoleUpdatePropertyRsp); i {
  1253 + switch v := v.(*RoleRsp); i {
1255 1254 case 0:
1256 1255 return &v.state
1257 1256 case 1:
... ... @@ -1263,7 +1262,7 @@ func file_game_proto_init() {
1263 1262 }
1264 1263 }
1265 1264 file_game_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
1266   - switch v := v.(*RoleUpdateItemsRsp); i {
  1265 + switch v := v.(*RoleUpdatePropertyRsp); i {
1267 1266 case 0:
1268 1267 return &v.state
1269 1268 case 1:
... ... @@ -1275,7 +1274,7 @@ func file_game_proto_init() {
1275 1274 }
1276 1275 }
1277 1276 file_game_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
1278   - switch v := v.(*RoleUpdateChangeRsp); i {
  1277 + switch v := v.(*RoleUpdateItemsRsp); i {
1279 1278 case 0:
1280 1279 return &v.state
1281 1280 case 1:
... ... @@ -1287,7 +1286,7 @@ func file_game_proto_init() {
1287 1286 }
1288 1287 }
1289 1288 file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
1290   - switch v := v.(*RoleClearItemsReq); i {
  1289 + switch v := v.(*RoleUpdateChangeRsp); i {
1291 1290 case 0:
1292 1291 return &v.state
1293 1292 case 1:
... ... @@ -1299,7 +1298,7 @@ func file_game_proto_init() {
1299 1298 }
1300 1299 }
1301 1300 file_game_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
1302   - switch v := v.(*RoleStartBattleReq); i {
  1301 + switch v := v.(*RoleClearItemsReq); i {
1303 1302 case 0:
1304 1303 return &v.state
1305 1304 case 1:
... ... @@ -1311,7 +1310,7 @@ func file_game_proto_init() {
1311 1310 }
1312 1311 }
1313 1312 file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
1314   - switch v := v.(*RoleEndBattleReq); i {
  1313 + switch v := v.(*RoleStartBattleReq); i {
1315 1314 case 0:
1316 1315 return &v.state
1317 1316 case 1:
... ... @@ -1323,7 +1322,7 @@ func file_game_proto_init() {
1323 1322 }
1324 1323 }
1325 1324 file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
1326   - switch v := v.(*RoleEndBattleRsp); i {
  1325 + switch v := v.(*RoleEndBattleReq); i {
1327 1326 case 0:
1328 1327 return &v.state
1329 1328 case 1:
... ... @@ -1335,7 +1334,7 @@ func file_game_proto_init() {
1335 1334 }
1336 1335 }
1337 1336 file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
1338   - switch v := v.(*EquipmentDelReq); i {
  1337 + switch v := v.(*RoleEndBattleRsp); i {
1339 1338 case 0:
1340 1339 return &v.state
1341 1340 case 1:
... ... @@ -1347,7 +1346,7 @@ func file_game_proto_init() {
1347 1346 }
1348 1347 }
1349 1348 file_game_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
1350   - switch v := v.(*EquipmentAddRsp); i {
  1349 + switch v := v.(*EquipmentDelReq); i {
1351 1350 case 0:
1352 1351 return &v.state
1353 1352 case 1:
... ... @@ -1359,7 +1358,7 @@ func file_game_proto_init() {
1359 1358 }
1360 1359 }
1361 1360 file_game_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
1362   - switch v := v.(*HeroEquipReferReq_EquipInfo); i {
  1361 + switch v := v.(*EquipmentAddRsp); i {
1363 1362 case 0:
1364 1363 return &v.state
1365 1364 case 1:
... ...
1   -Subproject commit f9035326a63d3ef7a335953ca56b821ed0ee945a
  1 +Subproject commit 9a1343a1d61885be03b96ecf329f2602ec99c8d1
... ...