Commit 4e56b6c42888bb09acf0e7c66e98e2dedc454ae1
1 parent
686ff048
fix: update
Showing
2 changed files
with
40 additions
and
20 deletions
Show diff stats
pb/game.pb.go
| @@ -693,10 +693,12 @@ type RoleEndBattleRsp struct { | @@ -693,10 +693,12 @@ type RoleEndBattleRsp struct { | ||
| 693 | sizeCache protoimpl.SizeCache | 693 | sizeCache protoimpl.SizeCache |
| 694 | unknownFields protoimpl.UnknownFields | 694 | unknownFields protoimpl.UnknownFields |
| 695 | 695 | ||
| 696 | - RoleLevel int32 `protobuf:"varint,1,opt,name=role_level,json=roleLevel,proto3" json:"role_level,omitempty"` | ||
| 697 | - RoleExp int32 `protobuf:"varint,2,opt,name=role_exp,json=roleExp,proto3" json:"role_exp,omitempty"` | ||
| 698 | - Hero *Hero `protobuf:"bytes,3,opt,name=hero,proto3" json:"hero,omitempty"` | ||
| 699 | - Reward string `protobuf:"bytes,4,opt,name=reward,proto3" json:"reward,omitempty"` | 696 | + RoleLevel int32 `protobuf:"varint,1,opt,name=role_level,json=roleLevel,proto3" json:"role_level,omitempty"` |
| 697 | + RoleExp int32 `protobuf:"varint,2,opt,name=role_exp,json=roleExp,proto3" json:"role_exp,omitempty"` | ||
| 698 | + RoleExpamount int32 `protobuf:"varint,3,opt,name=role_expamount,json=roleExpamount,proto3" json:"role_expamount,omitempty"` | ||
| 699 | + Reward string `protobuf:"bytes,4,opt,name=reward,proto3" json:"reward,omitempty"` | ||
| 700 | + Pass bool `protobuf:"varint,5,opt,name=pass,proto3" json:"pass,omitempty"` | ||
| 701 | + Hero []*Hero `protobuf:"bytes,6,rep,name=hero,proto3" json:"hero,omitempty"` | ||
| 700 | } | 702 | } |
| 701 | 703 | ||
| 702 | func (x *RoleEndBattleRsp) Reset() { | 704 | func (x *RoleEndBattleRsp) Reset() { |
| @@ -745,11 +747,11 @@ func (x *RoleEndBattleRsp) GetRoleExp() int32 { | @@ -745,11 +747,11 @@ func (x *RoleEndBattleRsp) GetRoleExp() int32 { | ||
| 745 | return 0 | 747 | return 0 |
| 746 | } | 748 | } |
| 747 | 749 | ||
| 748 | -func (x *RoleEndBattleRsp) GetHero() *Hero { | 750 | +func (x *RoleEndBattleRsp) GetRoleExpamount() int32 { |
| 749 | if x != nil { | 751 | if x != nil { |
| 750 | - return x.Hero | 752 | + return x.RoleExpamount |
| 751 | } | 753 | } |
| 752 | - return nil | 754 | + return 0 |
| 753 | } | 755 | } |
| 754 | 756 | ||
| 755 | func (x *RoleEndBattleRsp) GetReward() string { | 757 | func (x *RoleEndBattleRsp) GetReward() string { |
| @@ -759,6 +761,20 @@ func (x *RoleEndBattleRsp) GetReward() string { | @@ -759,6 +761,20 @@ func (x *RoleEndBattleRsp) GetReward() string { | ||
| 759 | return "" | 761 | return "" |
| 760 | } | 762 | } |
| 761 | 763 | ||
| 764 | +func (x *RoleEndBattleRsp) GetPass() bool { | ||
| 765 | + if x != nil { | ||
| 766 | + return x.Pass | ||
| 767 | + } | ||
| 768 | + return false | ||
| 769 | +} | ||
| 770 | + | ||
| 771 | +func (x *RoleEndBattleRsp) GetHero() []*Hero { | ||
| 772 | + if x != nil { | ||
| 773 | + return x.Hero | ||
| 774 | + } | ||
| 775 | + return nil | ||
| 776 | +} | ||
| 777 | + | ||
| 762 | //ResponseCmd EquipmentDelReq | 778 | //ResponseCmd EquipmentDelReq |
| 763 | type EquipmentDelReq struct { | 779 | type EquipmentDelReq struct { |
| 764 | state protoimpl.MessageState | 780 | state protoimpl.MessageState |
| @@ -913,22 +929,26 @@ var file_game_proto_rawDesc = []byte{ | @@ -913,22 +929,26 @@ var file_game_proto_rawDesc = []byte{ | ||
| 913 | 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, | 929 | 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, |
| 914 | 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x12, | 930 | 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x12, |
| 915 | 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, | 931 | 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, |
| 916 | - 0x61, 0x73, 0x73, 0x22, 0x86, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, | 932 | + 0x61, 0x73, 0x73, 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, |
| 917 | 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, | 933 | 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, |
| 918 | 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, | 934 | 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, |
| 919 | 0x6c, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, | 935 | 0x6c, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, |
| 920 | 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, | 936 | 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, |
| 921 | - 0x78, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, | ||
| 922 | - 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, | ||
| 923 | - 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, | ||
| 924 | - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x21, 0x0a, 0x0f, | ||
| 925 | - 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, | ||
| 926 | - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, | ||
| 927 | - 0x3a, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, | ||
| 928 | - 0x73, 0x70, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, | ||
| 929 | - 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, | ||
| 930 | - 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, | ||
| 931 | - 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | 937 | + 0x78, 0x70, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, |
| 938 | + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, | ||
| 939 | + 0x45, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, | ||
| 940 | + 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, | ||
| 941 | + 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, | ||
| 942 | + 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, | ||
| 943 | + 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, | ||
| 944 | + 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, | ||
| 945 | + 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, | ||
| 946 | + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, | ||
| 947 | + 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x27, 0x0a, | ||
| 948 | + 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, | ||
| 949 | + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, | ||
| 950 | + 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, | ||
| 951 | + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||
| 932 | } | 952 | } |
| 933 | 953 | ||
| 934 | var ( | 954 | var ( |