Commit 18cbcf53ecd8cdca97c578a8519e47bf77254c84

Authored by zhangqijia
1 parent a2d4f770

feat: 英雄升级

1 -Subproject commit 1ec80286186bbff099911043511ea7d59b64ce44 1 +Subproject commit e062c5009b60e14a5d2eca3d1cfef903bce81d4c
cmd/gameserver/action/HeroAction.go 0 → 100644
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
  1 +package action
  2 +
  3 +import (
  4 + "fmt"
  5 + "github.com/golang/protobuf/proto"
  6 + "go.mongodb.org/mongo-driver/bson"
  7 + "pro2d/common/components"
  8 + "pro2d/common/db/mongoproxy"
  9 + "pro2d/common/logger"
  10 + "pro2d/csvdata"
  11 + "pro2d/models"
  12 + "pro2d/pb"
  13 +)
  14 +
  15 +/*
  16 +EquipmentDelRpc 删除装备
  17 + 2 删除失败
  18 +*/
  19 +func EquipmentDelRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
  20 + req := pb.EquipmentDelReq{}
  21 + if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
  22 + logger.Error("loginRpc err: %v", err)
  23 + return 1, nil
  24 + }
  25 + filter := bson.D{{"id", bson.D{{"$in", req.Id}}}}
  26 + if err := mongoproxy.DelMany("equipment", filter); err != nil {
  27 + logger.Error(err.Error())
  28 + return 2, nil
  29 + }
  30 +
  31 + for _, id := range req.Id {
  32 + delete(role.Equipments, id)
  33 + }
  34 +
  35 + return 0, nil
  36 +}
  37 +
  38 +/*
  39 +HeroUpLevelRpc 英雄升级
  40 + 2 item不存在
  41 + 3 itemType错误
  42 + 4 itemExp 不存在
  43 + 5 英雄不存在
  44 + 6 消耗物品失败
  45 +*/
  46 +func HeroUpLevelRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
  47 + req := pb.HeroUpLevelReq{}
  48 + if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
  49 + logger.Error("loginRpc err: %v", err)
  50 + return 1, nil
  51 + }
  52 + if req.Count <= 0 {
  53 + req.Count = 1
  54 + }
  55 +
  56 + item := csvdata.Get().TbItemData.Get(req.ItemId)
  57 + if item == nil {
  58 + return 2, nil
  59 + }
  60 + if item.Type != 2003 {
  61 + return 3, nil
  62 + }
  63 +
  64 + itemExp := csvdata.Get().TbExpItemData.Get(item.ID)
  65 + if itemExp == nil {
  66 + return 4, nil
  67 + }
  68 +
  69 + hero, ok := role.Heros[req.HeroId]
  70 + if !ok {
  71 + return 5, nil
  72 + }
  73 +
  74 + if !role.CostItem(fmt.Sprintf("%d", item.ID), req.Count) {
  75 + return 6, nil
  76 + }
  77 +
  78 + h := hero.(*models.HeroModel)
  79 + level, exp := h.UpLevel(itemExp.Exp)
  80 + h.SetProperty("level", level)
  81 + h.SetProperty("exp", exp)
  82 + return 0, h.Hero
  83 +}
cmd/gameserver/action/RoleAction.go
@@ -4,10 +4,8 @@ package action @@ -4,10 +4,8 @@ package action
4 import ( 4 import (
5 "fmt" 5 "fmt"
6 "github.com/golang/protobuf/proto" 6 "github.com/golang/protobuf/proto"
7 - "go.mongodb.org/mongo-driver/bson"  
8 "pro2d/common" 7 "pro2d/common"
9 "pro2d/common/components" 8 "pro2d/common/components"
10 - "pro2d/common/db/mongoproxy"  
11 "pro2d/common/db/redisproxy" 9 "pro2d/common/db/redisproxy"
12 "pro2d/common/logger" 10 "pro2d/common/logger"
13 "pro2d/csvdata" 11 "pro2d/csvdata"
@@ -136,29 +134,6 @@ func RoleClearItemsRpc(role *models.RoleModel, msg components.IMessage) (int32, @@ -136,29 +134,6 @@ func RoleClearItemsRpc(role *models.RoleModel, msg components.IMessage) (int32,
136 } 134 }
137 135
138 /* 136 /*
139 -EquipmentDelRpc 删除装备  
140 - 2 删除失败  
141 -*/  
142 -func EquipmentDelRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {  
143 - req := pb.EquipmentDelReq{}  
144 - if err := proto.Unmarshal(msg.GetData(), &req); err != nil {  
145 - logger.Error("loginRpc err: %v", err)  
146 - return 1, nil  
147 - }  
148 - filter := bson.D{{"id", bson.D{{"$in", req.Id}}}}  
149 - if err := mongoproxy.DelMany("equipment", filter); err != nil {  
150 - logger.Error(err.Error())  
151 - return 2, nil  
152 - }  
153 -  
154 - for _, id := range req.Id {  
155 - delete(role.Equipments, id)  
156 - }  
157 -  
158 - return 0, nil  
159 -}  
160 -  
161 -/*  
162 RoleStartBattleRpc 开始战斗 137 RoleStartBattleRpc 开始战斗
163 */ 138 */
164 func RoleStartBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) { 139 func RoleStartBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
cmd/gameserver/action/protocode.go
@@ -16,6 +16,7 @@ func GetActionMap() map[interface{}]interface{} { @@ -16,6 +16,7 @@ func GetActionMap() map[interface{}]interface{} {
16 am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRpc 16 am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRpc
17 am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRpc 17 am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRpc
18 am[uint32(pb.ProtoCode_EquipmentDelReq)] = EquipmentDelRpc 18 am[uint32(pb.ProtoCode_EquipmentDelReq)] = EquipmentDelRpc
  19 + am[uint32(pb.ProtoCode_HeroUpLevelReq)] = HeroUpLevelRpc
19 20
20 return am 21 return am
21 -}  
22 \ No newline at end of file 22 \ No newline at end of file
  23 +}
cmd/test/action/protocode.go
@@ -16,13 +16,13 @@ func GetTestActionMap() map[interface{}]interface{} { @@ -16,13 +16,13 @@ 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  
20 am[uint32(pb.ProtoCode_RoleClearItemsReq)] = RoleClearItemsRsp 19 am[uint32(pb.ProtoCode_RoleClearItemsReq)] = RoleClearItemsRsp
21 am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRsp 20 am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRsp
22 am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRsp 21 am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRsp
23 am[uint32(pb.ProtoCode_RoleEndBattleRsp)] = RoleEndBattleRsp 22 am[uint32(pb.ProtoCode_RoleEndBattleRsp)] = RoleEndBattleRsp
24 am[uint32(pb.ProtoCode_EquipmentDelReq)] = EquipmentDelRsp 23 am[uint32(pb.ProtoCode_EquipmentDelReq)] = EquipmentDelRsp
25 am[uint32(pb.ProtoCode_EquipmentAddRsp)] = EquipmentAddRsp 24 am[uint32(pb.ProtoCode_EquipmentAddRsp)] = EquipmentAddRsp
  25 + am[uint32(pb.ProtoCode_HeroUpLevelReq)] = HeroUpLevelRsp
26 26
27 return am 27 return am
28 } 28 }
@@ -607,44 +607,6 @@ func (x *RoleUpdateItemsRsp) GetItems() string { @@ -607,44 +607,6 @@ func (x *RoleUpdateItemsRsp) GetItems() string {
607 return "" 607 return ""
608 } 608 }
609 609
610 -type RoleUpdateChangeRsp struct {  
611 - state protoimpl.MessageState  
612 - sizeCache protoimpl.SizeCache  
613 - unknownFields protoimpl.UnknownFields  
614 -}  
615 -  
616 -func (x *RoleUpdateChangeRsp) Reset() {  
617 - *x = RoleUpdateChangeRsp{}  
618 - if protoimpl.UnsafeEnabled {  
619 - mi := &file_game_proto_msgTypes[11]  
620 - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))  
621 - ms.StoreMessageInfo(mi)  
622 - }  
623 -}  
624 -  
625 -func (x *RoleUpdateChangeRsp) String() string {  
626 - return protoimpl.X.MessageStringOf(x)  
627 -}  
628 -  
629 -func (*RoleUpdateChangeRsp) ProtoMessage() {}  
630 -  
631 -func (x *RoleUpdateChangeRsp) ProtoReflect() protoreflect.Message {  
632 - mi := &file_game_proto_msgTypes[11]  
633 - if protoimpl.UnsafeEnabled && x != nil {  
634 - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))  
635 - if ms.LoadMessageInfo() == nil {  
636 - ms.StoreMessageInfo(mi)  
637 - }  
638 - return ms  
639 - }  
640 - return mi.MessageOf(x)  
641 -}  
642 -  
643 -// Deprecated: Use RoleUpdateChangeRsp.ProtoReflect.Descriptor instead.  
644 -func (*RoleUpdateChangeRsp) Descriptor() ([]byte, []int) {  
645 - return file_game_proto_rawDescGZIP(), []int{11}  
646 -}  
647 -  
648 //ResponseCmd RoleClearItemsReq 610 //ResponseCmd RoleClearItemsReq
649 type RoleClearItemsReq struct { 611 type RoleClearItemsReq struct {
650 state protoimpl.MessageState 612 state protoimpl.MessageState
@@ -657,7 +619,7 @@ type RoleClearItemsReq struct { @@ -657,7 +619,7 @@ type RoleClearItemsReq struct {
657 func (x *RoleClearItemsReq) Reset() { 619 func (x *RoleClearItemsReq) Reset() {
658 *x = RoleClearItemsReq{} 620 *x = RoleClearItemsReq{}
659 if protoimpl.UnsafeEnabled { 621 if protoimpl.UnsafeEnabled {
660 - mi := &file_game_proto_msgTypes[12] 622 + mi := &file_game_proto_msgTypes[11]
661 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 623 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
662 ms.StoreMessageInfo(mi) 624 ms.StoreMessageInfo(mi)
663 } 625 }
@@ -670,7 +632,7 @@ func (x *RoleClearItemsReq) String() string { @@ -670,7 +632,7 @@ func (x *RoleClearItemsReq) String() string {
670 func (*RoleClearItemsReq) ProtoMessage() {} 632 func (*RoleClearItemsReq) ProtoMessage() {}
671 633
672 func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { 634 func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message {
673 - mi := &file_game_proto_msgTypes[12] 635 + mi := &file_game_proto_msgTypes[11]
674 if protoimpl.UnsafeEnabled && x != nil { 636 if protoimpl.UnsafeEnabled && x != nil {
675 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 637 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
676 if ms.LoadMessageInfo() == nil { 638 if ms.LoadMessageInfo() == nil {
@@ -683,7 +645,7 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message { @@ -683,7 +645,7 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message {
683 645
684 // Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead. 646 // Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead.
685 func (*RoleClearItemsReq) Descriptor() ([]byte, []int) { 647 func (*RoleClearItemsReq) Descriptor() ([]byte, []int) {
686 - return file_game_proto_rawDescGZIP(), []int{12} 648 + return file_game_proto_rawDescGZIP(), []int{11}
687 } 649 }
688 650
689 func (x *RoleClearItemsReq) GetItems() []string { 651 func (x *RoleClearItemsReq) GetItems() []string {
@@ -705,7 +667,7 @@ type RoleStartBattleReq struct { @@ -705,7 +667,7 @@ type RoleStartBattleReq struct {
705 func (x *RoleStartBattleReq) Reset() { 667 func (x *RoleStartBattleReq) Reset() {
706 *x = RoleStartBattleReq{} 668 *x = RoleStartBattleReq{}
707 if protoimpl.UnsafeEnabled { 669 if protoimpl.UnsafeEnabled {
708 - mi := &file_game_proto_msgTypes[13] 670 + mi := &file_game_proto_msgTypes[12]
709 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 671 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
710 ms.StoreMessageInfo(mi) 672 ms.StoreMessageInfo(mi)
711 } 673 }
@@ -718,7 +680,7 @@ func (x *RoleStartBattleReq) String() string { @@ -718,7 +680,7 @@ func (x *RoleStartBattleReq) String() string {
718 func (*RoleStartBattleReq) ProtoMessage() {} 680 func (*RoleStartBattleReq) ProtoMessage() {}
719 681
720 func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { 682 func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message {
721 - mi := &file_game_proto_msgTypes[13] 683 + mi := &file_game_proto_msgTypes[12]
722 if protoimpl.UnsafeEnabled && x != nil { 684 if protoimpl.UnsafeEnabled && x != nil {
723 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 685 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
724 if ms.LoadMessageInfo() == nil { 686 if ms.LoadMessageInfo() == nil {
@@ -731,7 +693,7 @@ func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message { @@ -731,7 +693,7 @@ func (x *RoleStartBattleReq) ProtoReflect() protoreflect.Message {
731 693
732 // Deprecated: Use RoleStartBattleReq.ProtoReflect.Descriptor instead. 694 // Deprecated: Use RoleStartBattleReq.ProtoReflect.Descriptor instead.
733 func (*RoleStartBattleReq) Descriptor() ([]byte, []int) { 695 func (*RoleStartBattleReq) Descriptor() ([]byte, []int) {
734 - return file_game_proto_rawDescGZIP(), []int{13} 696 + return file_game_proto_rawDescGZIP(), []int{12}
735 } 697 }
736 698
737 func (x *RoleStartBattleReq) GetChapterId() int32 { 699 func (x *RoleStartBattleReq) GetChapterId() int32 {
@@ -763,7 +725,7 @@ type RoleEndBattleReq struct { @@ -763,7 +725,7 @@ type RoleEndBattleReq struct {
763 func (x *RoleEndBattleReq) Reset() { 725 func (x *RoleEndBattleReq) Reset() {
764 *x = RoleEndBattleReq{} 726 *x = RoleEndBattleReq{}
765 if protoimpl.UnsafeEnabled { 727 if protoimpl.UnsafeEnabled {
766 - mi := &file_game_proto_msgTypes[14] 728 + mi := &file_game_proto_msgTypes[13]
767 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 729 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
768 ms.StoreMessageInfo(mi) 730 ms.StoreMessageInfo(mi)
769 } 731 }
@@ -776,7 +738,7 @@ func (x *RoleEndBattleReq) String() string { @@ -776,7 +738,7 @@ func (x *RoleEndBattleReq) String() string {
776 func (*RoleEndBattleReq) ProtoMessage() {} 738 func (*RoleEndBattleReq) ProtoMessage() {}
777 739
778 func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { 740 func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message {
779 - mi := &file_game_proto_msgTypes[14] 741 + mi := &file_game_proto_msgTypes[13]
780 if protoimpl.UnsafeEnabled && x != nil { 742 if protoimpl.UnsafeEnabled && x != nil {
781 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 743 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
782 if ms.LoadMessageInfo() == nil { 744 if ms.LoadMessageInfo() == nil {
@@ -789,7 +751,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message { @@ -789,7 +751,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message {
789 751
790 // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead. 752 // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead.
791 func (*RoleEndBattleReq) Descriptor() ([]byte, []int) { 753 func (*RoleEndBattleReq) Descriptor() ([]byte, []int) {
792 - return file_game_proto_rawDescGZIP(), []int{14} 754 + return file_game_proto_rawDescGZIP(), []int{13}
793 } 755 }
794 756
795 func (x *RoleEndBattleReq) GetChapterId() int32 { 757 func (x *RoleEndBattleReq) GetChapterId() int32 {
@@ -837,7 +799,7 @@ type RoleEndBattleRsp struct { @@ -837,7 +799,7 @@ type RoleEndBattleRsp struct {
837 func (x *RoleEndBattleRsp) Reset() { 799 func (x *RoleEndBattleRsp) Reset() {
838 *x = RoleEndBattleRsp{} 800 *x = RoleEndBattleRsp{}
839 if protoimpl.UnsafeEnabled { 801 if protoimpl.UnsafeEnabled {
840 - mi := &file_game_proto_msgTypes[15] 802 + mi := &file_game_proto_msgTypes[14]
841 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 803 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
842 ms.StoreMessageInfo(mi) 804 ms.StoreMessageInfo(mi)
843 } 805 }
@@ -850,7 +812,7 @@ func (x *RoleEndBattleRsp) String() string { @@ -850,7 +812,7 @@ func (x *RoleEndBattleRsp) String() string {
850 func (*RoleEndBattleRsp) ProtoMessage() {} 812 func (*RoleEndBattleRsp) ProtoMessage() {}
851 813
852 func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { 814 func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message {
853 - mi := &file_game_proto_msgTypes[15] 815 + mi := &file_game_proto_msgTypes[14]
854 if protoimpl.UnsafeEnabled && x != nil { 816 if protoimpl.UnsafeEnabled && x != nil {
855 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 817 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
856 if ms.LoadMessageInfo() == nil { 818 if ms.LoadMessageInfo() == nil {
@@ -863,7 +825,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message { @@ -863,7 +825,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message {
863 825
864 // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead. 826 // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead.
865 func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) { 827 func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) {
866 - return file_game_proto_rawDescGZIP(), []int{15} 828 + return file_game_proto_rawDescGZIP(), []int{14}
867 } 829 }
868 830
869 func (x *RoleEndBattleRsp) GetRoleLevel() int32 { 831 func (x *RoleEndBattleRsp) GetRoleLevel() int32 {
@@ -920,7 +882,7 @@ type EquipmentDelReq struct { @@ -920,7 +882,7 @@ type EquipmentDelReq struct {
920 func (x *EquipmentDelReq) Reset() { 882 func (x *EquipmentDelReq) Reset() {
921 *x = EquipmentDelReq{} 883 *x = EquipmentDelReq{}
922 if protoimpl.UnsafeEnabled { 884 if protoimpl.UnsafeEnabled {
923 - mi := &file_game_proto_msgTypes[16] 885 + mi := &file_game_proto_msgTypes[15]
924 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 886 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
925 ms.StoreMessageInfo(mi) 887 ms.StoreMessageInfo(mi)
926 } 888 }
@@ -933,7 +895,7 @@ func (x *EquipmentDelReq) String() string { @@ -933,7 +895,7 @@ func (x *EquipmentDelReq) String() string {
933 func (*EquipmentDelReq) ProtoMessage() {} 895 func (*EquipmentDelReq) ProtoMessage() {}
934 896
935 func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { 897 func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message {
936 - mi := &file_game_proto_msgTypes[16] 898 + mi := &file_game_proto_msgTypes[15]
937 if protoimpl.UnsafeEnabled && x != nil { 899 if protoimpl.UnsafeEnabled && x != nil {
938 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 900 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
939 if ms.LoadMessageInfo() == nil { 901 if ms.LoadMessageInfo() == nil {
@@ -946,7 +908,7 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message { @@ -946,7 +908,7 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message {
946 908
947 // Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead. 909 // Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead.
948 func (*EquipmentDelReq) Descriptor() ([]byte, []int) { 910 func (*EquipmentDelReq) Descriptor() ([]byte, []int) {
949 - return file_game_proto_rawDescGZIP(), []int{16} 911 + return file_game_proto_rawDescGZIP(), []int{15}
950 } 912 }
951 913
952 func (x *EquipmentDelReq) GetId() []string { 914 func (x *EquipmentDelReq) GetId() []string {
@@ -968,7 +930,7 @@ type EquipmentAddRsp struct { @@ -968,7 +930,7 @@ type EquipmentAddRsp struct {
968 func (x *EquipmentAddRsp) Reset() { 930 func (x *EquipmentAddRsp) Reset() {
969 *x = EquipmentAddRsp{} 931 *x = EquipmentAddRsp{}
970 if protoimpl.UnsafeEnabled { 932 if protoimpl.UnsafeEnabled {
971 - mi := &file_game_proto_msgTypes[17] 933 + mi := &file_game_proto_msgTypes[16]
972 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 934 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
973 ms.StoreMessageInfo(mi) 935 ms.StoreMessageInfo(mi)
974 } 936 }
@@ -981,7 +943,7 @@ func (x *EquipmentAddRsp) String() string { @@ -981,7 +943,7 @@ func (x *EquipmentAddRsp) String() string {
981 func (*EquipmentAddRsp) ProtoMessage() {} 943 func (*EquipmentAddRsp) ProtoMessage() {}
982 944
983 func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { 945 func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message {
984 - mi := &file_game_proto_msgTypes[17] 946 + mi := &file_game_proto_msgTypes[16]
985 if protoimpl.UnsafeEnabled && x != nil { 947 if protoimpl.UnsafeEnabled && x != nil {
986 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 948 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
987 if ms.LoadMessageInfo() == nil { 949 if ms.LoadMessageInfo() == nil {
@@ -994,7 +956,7 @@ func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message { @@ -994,7 +956,7 @@ func (x *EquipmentAddRsp) ProtoReflect() protoreflect.Message {
994 956
995 // Deprecated: Use EquipmentAddRsp.ProtoReflect.Descriptor instead. 957 // Deprecated: Use EquipmentAddRsp.ProtoReflect.Descriptor instead.
996 func (*EquipmentAddRsp) Descriptor() ([]byte, []int) { 958 func (*EquipmentAddRsp) Descriptor() ([]byte, []int) {
997 - return file_game_proto_rawDescGZIP(), []int{17} 959 + return file_game_proto_rawDescGZIP(), []int{16}
998 } 960 }
999 961
1000 func (x *EquipmentAddRsp) GetEquip() *Equipment { 962 func (x *EquipmentAddRsp) GetEquip() *Equipment {
@@ -1004,6 +966,69 @@ func (x *EquipmentAddRsp) GetEquip() *Equipment { @@ -1004,6 +966,69 @@ func (x *EquipmentAddRsp) GetEquip() *Equipment {
1004 return nil 966 return nil
1005 } 967 }
1006 968
  969 +type HeroUpLevelReq struct {
  970 + state protoimpl.MessageState
  971 + sizeCache protoimpl.SizeCache
  972 + unknownFields protoimpl.UnknownFields
  973 +
  974 + HeroId string `protobuf:"bytes,1,opt,name=heroId,proto3" json:"heroId,omitempty"`
  975 + ItemId int32 `protobuf:"varint,2,opt,name=itemId,proto3" json:"itemId,omitempty"`
  976 + Count int32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"`
  977 +}
  978 +
  979 +func (x *HeroUpLevelReq) Reset() {
  980 + *x = HeroUpLevelReq{}
  981 + if protoimpl.UnsafeEnabled {
  982 + mi := &file_game_proto_msgTypes[17]
  983 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  984 + ms.StoreMessageInfo(mi)
  985 + }
  986 +}
  987 +
  988 +func (x *HeroUpLevelReq) String() string {
  989 + return protoimpl.X.MessageStringOf(x)
  990 +}
  991 +
  992 +func (*HeroUpLevelReq) ProtoMessage() {}
  993 +
  994 +func (x *HeroUpLevelReq) ProtoReflect() protoreflect.Message {
  995 + mi := &file_game_proto_msgTypes[17]
  996 + if protoimpl.UnsafeEnabled && x != nil {
  997 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  998 + if ms.LoadMessageInfo() == nil {
  999 + ms.StoreMessageInfo(mi)
  1000 + }
  1001 + return ms
  1002 + }
  1003 + return mi.MessageOf(x)
  1004 +}
  1005 +
  1006 +// Deprecated: Use HeroUpLevelReq.ProtoReflect.Descriptor instead.
  1007 +func (*HeroUpLevelReq) Descriptor() ([]byte, []int) {
  1008 + return file_game_proto_rawDescGZIP(), []int{17}
  1009 +}
  1010 +
  1011 +func (x *HeroUpLevelReq) GetHeroId() string {
  1012 + if x != nil {
  1013 + return x.HeroId
  1014 + }
  1015 + return ""
  1016 +}
  1017 +
  1018 +func (x *HeroUpLevelReq) GetItemId() int32 {
  1019 + if x != nil {
  1020 + return x.ItemId
  1021 + }
  1022 + return 0
  1023 +}
  1024 +
  1025 +func (x *HeroUpLevelReq) GetCount() int32 {
  1026 + if x != nil {
  1027 + return x.Count
  1028 + }
  1029 + return 0
  1030 +}
  1031 +
1007 var File_game_proto protoreflect.FileDescriptor 1032 var File_game_proto protoreflect.FileDescriptor
1008 1033
1009 var file_game_proto_rawDesc = []byte{ 1034 var file_game_proto_rawDesc = []byte{
@@ -1053,43 +1078,47 @@ var file_game_proto_rawDesc = []byte{ @@ -1053,43 +1078,47 @@ var file_game_proto_rawDesc = []byte{
1053 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 1078 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, 1079 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, 1080 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, 1081 + 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d,
  1082 + 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20,
  1083 + 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f,
  1084 + 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71,
  1085 + 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
  1086 + 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12,
  1087 + 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
  1088 + 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x7b, 0x0a, 0x10,
  1089 + 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71,
  1090 + 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
  1091 + 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12,
  1092 + 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
  1093 + 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04,
  1094 + 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73,
  1095 + 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
  1096 + 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f,
  1097 + 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d,
  1098 + 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01,
  1099 + 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, 0x6c, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a,
  1100 + 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
  1101 + 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65,
  1102 + 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
  1103 + 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
  1104 + 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
  1105 + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18,
  1106 + 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68,
  1107 + 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
  1108 + 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a,
  1109 + 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71,
  1110 + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
  1111 + 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64,
  1112 + 0x52, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01,
  1113 + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69,
  1114 + 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x22, 0x56, 0x0a, 0x0e,
  1115 + 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x16,
  1116 + 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
  1117 + 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64,
  1118 + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14,
  1119 + 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63,
  1120 + 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62,
  1121 + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
1093 } 1122 }
1094 1123
1095 var ( 1124 var (
@@ -1117,13 +1146,13 @@ var file_game_proto_goTypes = []interface{}{ @@ -1117,13 +1146,13 @@ var file_game_proto_goTypes = []interface{}{
1117 (*RoleRsp)(nil), // 8: game.RoleRsp 1146 (*RoleRsp)(nil), // 8: game.RoleRsp
1118 (*RoleUpdatePropertyRsp)(nil), // 9: game.RoleUpdatePropertyRsp 1147 (*RoleUpdatePropertyRsp)(nil), // 9: game.RoleUpdatePropertyRsp
1119 (*RoleUpdateItemsRsp)(nil), // 10: game.RoleUpdateItemsRsp 1148 (*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 1149 + (*RoleClearItemsReq)(nil), // 11: game.RoleClearItemsReq
  1150 + (*RoleStartBattleReq)(nil), // 12: game.RoleStartBattleReq
  1151 + (*RoleEndBattleReq)(nil), // 13: game.RoleEndBattleReq
  1152 + (*RoleEndBattleRsp)(nil), // 14: game.RoleEndBattleRsp
  1153 + (*EquipmentDelReq)(nil), // 15: game.EquipmentDelReq
  1154 + (*EquipmentAddRsp)(nil), // 16: game.EquipmentAddRsp
  1155 + (*HeroUpLevelReq)(nil), // 17: game.HeroUpLevelReq
1127 (*Team)(nil), // 18: models.Team 1156 (*Team)(nil), // 18: models.Team
1128 (*Role)(nil), // 19: models.Role 1157 (*Role)(nil), // 19: models.Role
1129 (*Hero)(nil), // 20: models.Hero 1158 (*Hero)(nil), // 20: models.Hero
@@ -1286,7 +1315,7 @@ func file_game_proto_init() { @@ -1286,7 +1315,7 @@ func file_game_proto_init() {
1286 } 1315 }
1287 } 1316 }
1288 file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { 1317 file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
1289 - switch v := v.(*RoleUpdateChangeRsp); i { 1318 + switch v := v.(*RoleClearItemsReq); i {
1290 case 0: 1319 case 0:
1291 return &v.state 1320 return &v.state
1292 case 1: 1321 case 1:
@@ -1298,7 +1327,7 @@ func file_game_proto_init() { @@ -1298,7 +1327,7 @@ func file_game_proto_init() {
1298 } 1327 }
1299 } 1328 }
1300 file_game_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { 1329 file_game_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
1301 - switch v := v.(*RoleClearItemsReq); i { 1330 + switch v := v.(*RoleStartBattleReq); i {
1302 case 0: 1331 case 0:
1303 return &v.state 1332 return &v.state
1304 case 1: 1333 case 1:
@@ -1310,7 +1339,7 @@ func file_game_proto_init() { @@ -1310,7 +1339,7 @@ func file_game_proto_init() {
1310 } 1339 }
1311 } 1340 }
1312 file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { 1341 file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
1313 - switch v := v.(*RoleStartBattleReq); i { 1342 + switch v := v.(*RoleEndBattleReq); i {
1314 case 0: 1343 case 0:
1315 return &v.state 1344 return &v.state
1316 case 1: 1345 case 1:
@@ -1322,7 +1351,7 @@ func file_game_proto_init() { @@ -1322,7 +1351,7 @@ func file_game_proto_init() {
1322 } 1351 }
1323 } 1352 }
1324 file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { 1353 file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
1325 - switch v := v.(*RoleEndBattleReq); i { 1354 + switch v := v.(*RoleEndBattleRsp); i {
1326 case 0: 1355 case 0:
1327 return &v.state 1356 return &v.state
1328 case 1: 1357 case 1:
@@ -1334,7 +1363,7 @@ func file_game_proto_init() { @@ -1334,7 +1363,7 @@ func file_game_proto_init() {
1334 } 1363 }
1335 } 1364 }
1336 file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { 1365 file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
1337 - switch v := v.(*RoleEndBattleRsp); i { 1366 + switch v := v.(*EquipmentDelReq); i {
1338 case 0: 1367 case 0:
1339 return &v.state 1368 return &v.state
1340 case 1: 1369 case 1:
@@ -1346,7 +1375,7 @@ func file_game_proto_init() { @@ -1346,7 +1375,7 @@ func file_game_proto_init() {
1346 } 1375 }
1347 } 1376 }
1348 file_game_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { 1377 file_game_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
1349 - switch v := v.(*EquipmentDelReq); i { 1378 + switch v := v.(*EquipmentAddRsp); i {
1350 case 0: 1379 case 0:
1351 return &v.state 1380 return &v.state
1352 case 1: 1381 case 1:
@@ -1358,7 +1387,7 @@ func file_game_proto_init() { @@ -1358,7 +1387,7 @@ func file_game_proto_init() {
1358 } 1387 }
1359 } 1388 }
1360 file_game_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { 1389 file_game_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
1361 - switch v := v.(*EquipmentAddRsp); i { 1390 + switch v := v.(*HeroUpLevelReq); i {
1362 case 0: 1391 case 0:
1363 return &v.state 1392 return &v.state
1364 case 1: 1393 case 1:
pb/protocode.pb.go
@@ -35,13 +35,13 @@ const ( @@ -35,13 +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_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 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
  44 + ProtoCode_HeroUpLevelReq ProtoCode = 18
45 ) 45 )
46 46
47 // Enum value maps for ProtoCode. 47 // Enum value maps for ProtoCode.
@@ -59,13 +59,13 @@ var ( @@ -59,13 +59,13 @@ var (
59 9: "RoleRsp", 59 9: "RoleRsp",
60 10: "RoleUpdatePropertyRsp", 60 10: "RoleUpdatePropertyRsp",
61 11: "RoleUpdateItemsRsp", 61 11: "RoleUpdateItemsRsp",
62 - 12: "RoleUpdateChangeRsp",  
63 - 13: "RoleClearItemsReq",  
64 - 14: "RoleStartBattleReq",  
65 - 15: "RoleEndBattleReq",  
66 - 16: "RoleEndBattleRsp",  
67 - 17: "EquipmentDelReq",  
68 - 18: "EquipmentAddRsp", 62 + 12: "RoleClearItemsReq",
  63 + 13: "RoleStartBattleReq",
  64 + 14: "RoleEndBattleReq",
  65 + 15: "RoleEndBattleRsp",
  66 + 16: "EquipmentDelReq",
  67 + 17: "EquipmentAddRsp",
  68 + 18: "HeroUpLevelReq",
69 } 69 }
70 ProtoCode_value = map[string]int32{ 70 ProtoCode_value = map[string]int32{
71 "UNKNOWN": 0, 71 "UNKNOWN": 0,
@@ -80,13 +80,13 @@ var ( @@ -80,13 +80,13 @@ var (
80 "RoleRsp": 9, 80 "RoleRsp": 9,
81 "RoleUpdatePropertyRsp": 10, 81 "RoleUpdatePropertyRsp": 10,
82 "RoleUpdateItemsRsp": 11, 82 "RoleUpdateItemsRsp": 11,
83 - "RoleUpdateChangeRsp": 12,  
84 - "RoleClearItemsReq": 13,  
85 - "RoleStartBattleReq": 14,  
86 - "RoleEndBattleReq": 15,  
87 - "RoleEndBattleRsp": 16,  
88 - "EquipmentDelReq": 17,  
89 - "EquipmentAddRsp": 18, 83 + "RoleClearItemsReq": 12,
  84 + "RoleStartBattleReq": 13,
  85 + "RoleEndBattleReq": 14,
  86 + "RoleEndBattleRsp": 15,
  87 + "EquipmentDelReq": 16,
  88 + "EquipmentAddRsp": 17,
  89 + "HeroUpLevelReq": 18,
90 } 90 }
91 ) 91 )
92 92
@@ -121,7 +121,7 @@ var File_protocode_proto protoreflect.FileDescriptor @@ -121,7 +121,7 @@ var File_protocode_proto protoreflect.FileDescriptor
121 121
122 var file_protocode_proto_rawDesc = []byte{ 122 var file_protocode_proto_rawDesc = []byte{
123 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,
124 - 0x6f, 0x12, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xfa, 0x02, 0x0a, 124 + 0x6f, 0x12, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xf5, 0x02, 0x0a,
125 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,
126 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,
127 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,
@@ -135,18 +135,18 @@ var file_protocode_proto_rawDesc = []byte{ @@ -135,18 +135,18 @@ var file_protocode_proto_rawDesc = []byte{
135 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,
136 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,
137 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,
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, 138 + 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x10, 0x0b, 0x12, 0x15, 0x0a, 0x11, 0x52,
  139 + 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71,
  140 + 0x10, 0x0c, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42,
  141 + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x10, 0x0d, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x6f,
  142 + 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x10, 0x0e,
  143 + 0x12, 0x14, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c,
  144 + 0x65, 0x52, 0x73, 0x70, 0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d,
  145 + 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x45,
  146 + 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x10, 0x11,
  147 + 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52,
  148 + 0x65, 0x71, 0x10, 0x12, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62,
  149 + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
150 } 150 }
151 151
152 var ( 152 var (
1 -Subproject commit 9a1343a1d61885be03b96ecf329f2602ec99c8d1 1 +Subproject commit 753495c6eff899239365191a19507c564f161d37