zhangqijia / Pro2DServer

Commit f8ce769e9c2d2b8428a194f150f3bd67b23e7544

Authored by zhangqijia
1 parent 23822e2f

fix: rpc = rar + rar / rpc = req + rsp

Showing 14 changed files with 421 additions and 379 deletions   Show diff stats
Inline Side-by-side
cmd/gameserver/action/HeroAction.go
  Show/Hide comments   View file @f8ce769
... ... @@ -19,7 +19,7 @@ EquipmentDelRpc 删除装备
19 19 2 删除失败
20 20 */
21 21 func EquipmentDelRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
22   - req := pb.EquipmentDelReq{}
  22 + req := pb.EquipmentDelRar{}
23 23 if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
24 24 logger.Error("loginRpc err: %v", err)
25 25 return 1, nil
... ...
cmd/gameserver/action/RoleAction.go
  Show/Hide comments   View file @f8ce769
... ... @@ -45,7 +45,7 @@ CreateRpc 创建角色请求
45 45 2: 角色不存在
46 46 */
47 47 func CreateRpc(role1 *models.RoleModel, msg components.IMessage) (int32, interface{}) {
48   - req := pb.CreateReq{}
  48 + req := pb.CreateRar{}
49 49 if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
50 50 logger.Error("CreateRpc err: %v", err)
51 51 return 1, err
... ... @@ -64,7 +64,7 @@ func CreateRpc(role1 *models.RoleModel, msg components.IMessage) (int32, interfa
64 64 role.Data.Uid = req.Token
65 65 role.Data.Level = 1
66 66 role.Data.Nick = getRandomName()
67   - if err := role.Create(); err != nil {
  67 + if err = role.Create(); err != nil {
68 68 logger.Error("CreateRpc role create err: %v", err)
69 69 return 4, nil
70 70 }
... ... @@ -74,7 +74,7 @@ func CreateRpc(role1 *models.RoleModel, msg components.IMessage) (int32, interfa
74 74  
75 75 // ChangeTeamRpc 阵容变换
76 76 func ChangeTeamRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
77   - req := pb.ChangeTeamReq{}
  77 + req := pb.ChangeTeamRar{}
78 78 if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
79 79 logger.Error("loginRpc err: %v", err)
80 80 return 1, nil
... ... @@ -89,7 +89,7 @@ HeroEquipReferRpc 穿戴/脱 装备
89 89 2: 装备不存在
90 90 */
91 91 func HeroEquipReferRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
92   - req := pb.HeroEquipReferReq{}
  92 + req := pb.HeroEquipReferRar{}
93 93 if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
94 94 logger.Error("loginRpc err: %v", err)
95 95 return 1, nil
... ... @@ -109,7 +109,7 @@ RoleClearItemsRpc 删除物品
109 109 2 删除失败
110 110 */
111 111 func RoleClearItemsRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) {
112   - req := pb.RoleClearItemsReq{}
  112 + req := pb.RoleClearItemsRar{}
113 113 if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
114 114 logger.Error("proto rpc err: %v", err)
115 115 return 1, nil
... ...
cmd/gameserver/action/protocode.go
  Show/Hide comments   View file @f8ce769
... ... @@ -9,14 +9,14 @@ func GetActionMap() map[interface{}]interface{} {
9 9 logger.Debug("init protocode...")
10 10 am := make(map[interface{}]interface{})
11 11 am[uint32(pb.ProtoCode_HeartRpc)] = HeartRpc
  12 + am[uint32(pb.ProtoCode_RoleStartBattleRpc)] = RoleStartBattleRpc
  13 + am[uint32(pb.ProtoCode_RoleEndBattleRpc)] = RoleEndBattleRpc
  14 + am[uint32(pb.ProtoCode_HeroUpLevelRpc)] = HeroUpLevelRpc
12 15 am[uint32(pb.ProtoCode_CreateRpc)] = CreateRpc
13 16 am[uint32(pb.ProtoCode_ChangeTeamRpc)] = ChangeTeamRpc
14 17 am[uint32(pb.ProtoCode_HeroEquipReferRpc)] = HeroEquipReferRpc
15 18 am[uint32(pb.ProtoCode_RoleClearItemsRpc)] = RoleClearItemsRpc
16   - am[uint32(pb.ProtoCode_RoleStartBattleRpc)] = RoleStartBattleRpc
17   - am[uint32(pb.ProtoCode_RoleEndBattleRpc)] = RoleEndBattleRpc
18 19 am[uint32(pb.ProtoCode_EquipmentDelRpc)] = EquipmentDelRpc
19   - am[uint32(pb.ProtoCode_HeroUpLevelRpc)] = HeroUpLevelRpc
20 20  
21 21 return am
22 22 }
... ...
cmd/gameserver/plugin/plugin.go
  Show/Hide comments   View file @f8ce769
... ... @@ -16,7 +16,7 @@ func init() {
16 16 func GetActionMap() map[interface{}]interface{} {
17 17 logger.Debug("init protocode...")
18 18 am := make(map[interface{}]interface{})
19   - am[uint32(pb.ProtoCode_LoginRsp)] = LoginRpc
  19 + am[uint32(pb.ProtoCode_LoginRpc)] = LoginRpc
20 20  
21 21 return am
22 22 }
... ...
cmd/gameserver/service/agent.go
  Show/Hide comments   View file @f8ce769
... ... @@ -86,7 +86,7 @@ func (c *Agent) OnLoginQuery(msg components.IMessage) (int32, proto.Message) {
86 86 return 2, nil
87 87 }
88 88 role.SetProperty("Device", req.Device)
89   - protoMsg := &pb.RoleRsp{
  89 + protoMsg := &pb.LoginRsp{
90 90 Role: role.Data,
91 91 Hero: role.GetAllHero(),
92 92 Team: role.GetAllTeam(),
... ...
cmd/httpserver/action/AccountAction.go
  Show/Hide comments   View file @f8ce769
... ... @@ -85,7 +85,7 @@ func (h *AccountAction) Login(c *gin.Context) (int, interface{}) {
85 85 return 3, "password error"
86 86 }
87 87  
88   - rsp := &pb.LoginRsp{
  88 + rsp := &pb.AccountLogin{
89 89 Token: account.Uid,
90 90 GameService: common.GlobalConf.GameService.ServiceInfo,
91 91 }
... ...
cmd/test/action/protocode.go
  Show/Hide comments   View file @f8ce769
... ... @@ -7,14 +7,14 @@ import (
7 7 func GetTestActionMap() map[interface{}]interface{} {
8 8 am := make(map[interface{}]interface{})
9 9 am[uint32(pb.ProtoCode_HeartRpc)] = HeartRsp
  10 + am[uint32(pb.ProtoCode_RoleStartBattleRpc)] = RoleStartBattleRsp
  11 + am[uint32(pb.ProtoCode_RoleEndBattleRpc)] = RoleEndBattleRsp
  12 + am[uint32(pb.ProtoCode_HeroUpLevelRpc)] = HeroUpLevelRsp
10 13 am[uint32(pb.ProtoCode_CreateRpc)] = CreateRsp
11 14 am[uint32(pb.ProtoCode_ChangeTeamRpc)] = ChangeTeamRsp
12 15 am[uint32(pb.ProtoCode_HeroEquipReferRpc)] = HeroEquipReferRsp
13 16 am[uint32(pb.ProtoCode_RoleClearItemsRpc)] = RoleClearItemsRsp
14   - am[uint32(pb.ProtoCode_RoleStartBattleRpc)] = RoleStartBattleRsp
15   - am[uint32(pb.ProtoCode_RoleEndBattleRpc)] = RoleEndBattleRsp
16 17 am[uint32(pb.ProtoCode_EquipmentDelRpc)] = EquipmentDelRsp
17   - am[uint32(pb.ProtoCode_HeroUpLevelRpc)] = HeroUpLevelRsp
18 18 am[uint32(pb.ProtoCode_DisConnectNty)] = DisConnectNty
19 19 am[uint32(pb.ProtoCode_RoleUpdatePropertyNty)] = RoleUpdatePropertyNty
20 20 am[uint32(pb.ProtoCode_RoleUpdateItemsNty)] = RoleUpdateItemsNty
... ...
cmd/test/service/TestClient.go
  Show/Hide comments   View file @f8ce769
... ... @@ -50,17 +50,17 @@ func (t *TestClient) OnLoginQuery(msg components.IMessage) {
50 50 logger.Error("Login errcode: %d", errCode)
51 51  
52 52 if errCode == 2 {
53   - req := &pb.CreateReq{
  53 + req := &pb.CreateRar{
54 54 Token: t.Token,
55 55 Device: "test-create",
56 56 }
57 57 r, _ := proto.Marshal(req)
58   - t.GetConn().SendSuccess(uint32(pb.ProtoCode_CreateReq), r)
  58 + t.GetConn().SendSuccess(uint32(pb.ProtoCode_CreateRpc), r)
59 59 return
60 60 }
61 61 }
62 62  
63   - req := pb.RoleRsp{}
  63 + req := pb.LoginRsp{}
64 64 if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
65 65 logger.Error("loginRpc err: %v", err)
66 66 return
... ... @@ -74,7 +74,7 @@ func (t *TestClient) OnMessage(msg components.IMessage) {
74 74 logger.Debug("rsp errCode:%d, protocolID: %d", msg.GetHeader().GetErrCode(), msg.GetHeader().GetMsgID())
75 75  
76 76 //login rsp
77   - if msg.GetHeader().GetMsgID() == uint32(pb.ProtoCode_LoginReq) {
  77 + if msg.GetHeader().GetMsgID() == uint32(pb.ProtoCode_LoginRpc) {
78 78 t.OnLoginQuery(msg)
79 79 return
80 80 }
... ... @@ -107,7 +107,7 @@ func (t *TestClient) Login(token string) {
107 107 t.Token = token
108 108 head := &components.PBHead{
109 109 Length: 0,
110   - Cmd: uint32(pb.ProtoCode_LoginReq),
  110 + Cmd: uint32(pb.ProtoCode_LoginRpc),
111 111 ErrCode: 0,
112 112 PreField: 0,
113 113 }
... ...
1   -Subproject commit 64026a935d29e4baef757b9ef7548ff2082516d6
  1 +Subproject commit 090af6e8d6d03271341d401ab3e73e9c23ef4709
... ...
models/roleTest.go
  Show/Hide comments   View file @f8ce769
... ... @@ -14,7 +14,7 @@ type RoleTestModel struct {
14 14 Equipment ProtoMap
15 15 }
16 16  
17   -func NewRoleTestModel(rsp pb.RoleRsp) *RoleTestModel {
  17 +func NewRoleTestModel(rsp pb.LoginRsp) *RoleTestModel {
18 18 data := &RoleTestModel{
19 19 Role: rsp.Role,
20 20 Hero: make(ProtoMap),
... ...
pb/account.pb.go
  Show/Hide comments   View file @f8ce769
... ... @@ -99,7 +99,7 @@ func (x *ServiceInfo) GetGmport() int32 {
99 99 return 0
100 100 }
101 101  
102   -type LoginRsp struct {
  102 +type AccountLogin struct {
103 103 state protoimpl.MessageState
104 104 sizeCache protoimpl.SizeCache
105 105 unknownFields protoimpl.UnknownFields
... ... @@ -108,8 +108,8 @@ type LoginRsp struct {
108 108 GameService []*ServiceInfo `protobuf:"bytes,2,rep,name=game_service,json=gameService,proto3" json:"game_service,omitempty"`
109 109 }
110 110  
111   -func (x *LoginRsp) Reset() {
112   - *x = LoginRsp{}
  111 +func (x *AccountLogin) Reset() {
  112 + *x = AccountLogin{}
113 113 if protoimpl.UnsafeEnabled {
114 114 mi := &file_account_proto_msgTypes[1]
115 115 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -117,13 +117,13 @@ func (x *LoginRsp) Reset() {
117 117 }
118 118 }
119 119  
120   -func (x *LoginRsp) String() string {
  120 +func (x *AccountLogin) String() string {
121 121 return protoimpl.X.MessageStringOf(x)
122 122 }
123 123  
124   -func (*LoginRsp) ProtoMessage() {}
  124 +func (*AccountLogin) ProtoMessage() {}
125 125  
126   -func (x *LoginRsp) ProtoReflect() protoreflect.Message {
  126 +func (x *AccountLogin) ProtoReflect() protoreflect.Message {
127 127 mi := &file_account_proto_msgTypes[1]
128 128 if protoimpl.UnsafeEnabled && x != nil {
129 129 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -135,19 +135,19 @@ func (x *LoginRsp) ProtoReflect() protoreflect.Message {
135 135 return mi.MessageOf(x)
136 136 }
137 137  
138   -// Deprecated: Use LoginRsp.ProtoReflect.Descriptor instead.
139   -func (*LoginRsp) Descriptor() ([]byte, []int) {
  138 +// Deprecated: Use AccountLogin.ProtoReflect.Descriptor instead.
  139 +func (*AccountLogin) Descriptor() ([]byte, []int) {
140 140 return file_account_proto_rawDescGZIP(), []int{1}
141 141 }
142 142  
143   -func (x *LoginRsp) GetToken() string {
  143 +func (x *AccountLogin) GetToken() string {
144 144 if x != nil {
145 145 return x.Token
146 146 }
147 147 return ""
148 148 }
149 149  
150   -func (x *LoginRsp) GetGameService() []*ServiceInfo {
  150 +func (x *AccountLogin) GetGameService() []*ServiceInfo {
151 151 if x != nil {
152 152 return x.GameService
153 153 }
... ... @@ -292,23 +292,23 @@ var file_account_proto_rawDesc = []byte{
292 292 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72,
293 293 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72,
294 294 0x74, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
295   - 0x05, 0x52, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x59, 0x0a, 0x08, 0x4c, 0x6f, 0x67,
296   - 0x69, 0x6e, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01,
297   - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x37, 0x0a, 0x0c, 0x67,
298   - 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
299   - 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76,
300   - 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x67, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72,
301   - 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
302   - 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
303   - 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f,
304   - 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f,
305   - 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
306   - 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
307   - 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0c, 0x0a, 0x01, 0x69, 0x18, 0x01, 0x20, 0x01,
308   - 0x28, 0x05, 0x52, 0x01, 0x69, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
309   - 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01,
310   - 0x79, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
311   - 0x72, 0x6f, 0x74, 0x6f, 0x33,
  295 + 0x05, 0x52, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5d, 0x0a, 0x0c, 0x41, 0x63, 0x63,
  296 + 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b,
  297 + 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
  298 + 0x37, 0x0a, 0x0c, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18,
  299 + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e,
  300 + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x67, 0x61, 0x6d,
  301 + 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69,
  302 + 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20,
  303 + 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61,
  304 + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61,
  305 + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03,
  306 + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x55, 0x70,
  307 + 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0c, 0x0a, 0x01, 0x69,
  308 + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x69, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02,
  309 + 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x03, 0x20, 0x01,
  310 + 0x28, 0x05, 0x52, 0x01, 0x79, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70,
  311 + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
312 312 }
313 313  
314 314 var (
... ... @@ -326,12 +326,12 @@ func file_account_proto_rawDescGZIP() []byte {
326 326 var file_account_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
327 327 var file_account_proto_goTypes = []interface{}{
328 328 (*ServiceInfo)(nil), // 0: account.ServiceInfo
329   - (*LoginRsp)(nil), // 1: account.LoginRsp
  329 + (*AccountLogin)(nil), // 1: account.AccountLogin
330 330 (*Register)(nil), // 2: account.Register
331 331 (*UpdateVersion)(nil), // 3: account.UpdateVersion
332 332 }
333 333 var file_account_proto_depIdxs = []int32{
334   - 0, // 0: account.LoginRsp.game_service:type_name -> account.ServiceInfo
  334 + 0, // 0: account.AccountLogin.game_service:type_name -> account.ServiceInfo
335 335 1, // [1:1] is the sub-list for method output_type
336 336 1, // [1:1] is the sub-list for method input_type
337 337 1, // [1:1] is the sub-list for extension type_name
... ... @@ -358,7 +358,7 @@ func file_account_proto_init() {
358 358 }
359 359 }
360 360 file_account_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
361   - switch v := v.(*LoginRsp); i {
  361 + switch v := v.(*AccountLogin); i {
362 362 case 0:
363 363 return &v.state
364 364 case 1:
... ...
pb/game.pb.go
  Show/Hide comments   View file @f8ce769
... ... @@ -20,7 +20,6 @@ const (
20 20 _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
21 21 )
22 22  
23   -//ResponseCmd HeartRsp
24 23 type HeartReq struct {
25 24 state protoimpl.MessageState
26 25 sizeCache protoimpl.SizeCache
... ... @@ -115,7 +114,6 @@ func (x *HeartRsp) GetCode() int64 {
115 114 return 0
116 115 }
117 116  
118   -//ResponseCmd RoleRsp
119 117 type LoginReq struct {
120 118 state protoimpl.MessageState
121 119 sizeCache protoimpl.SizeCache
... ... @@ -171,18 +169,19 @@ func (x *LoginReq) GetDevice() string {
171 169 return ""
172 170 }
173 171  
174   -//ResponseCmd CreateReq
175   -type CreateReq struct {
  172 +type LoginRsp struct {
176 173 state protoimpl.MessageState
177 174 sizeCache protoimpl.SizeCache
178 175 unknownFields protoimpl.UnknownFields
179 176  
180   - Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
181   - Device string `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
  177 + Role *Role `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
  178 + Hero []*Hero `protobuf:"bytes,3,rep,name=hero,proto3" json:"hero,omitempty"`
  179 + Team []*Team `protobuf:"bytes,4,rep,name=team,proto3" json:"team,omitempty"`
  180 + Equipments []*Equipment `protobuf:"bytes,5,rep,name=equipments,proto3" json:"equipments,omitempty"`
182 181 }
183 182  
184   -func (x *CreateReq) Reset() {
185   - *x = CreateReq{}
  183 +func (x *LoginRsp) Reset() {
  184 + *x = LoginRsp{}
186 185 if protoimpl.UnsafeEnabled {
187 186 mi := &file_game_proto_msgTypes[3]
188 187 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -190,13 +189,13 @@ func (x *CreateReq) Reset() {
190 189 }
191 190 }
192 191  
193   -func (x *CreateReq) String() string {
  192 +func (x *LoginRsp) String() string {
194 193 return protoimpl.X.MessageStringOf(x)
195 194 }
196 195  
197   -func (*CreateReq) ProtoMessage() {}
  196 +func (*LoginRsp) ProtoMessage() {}
198 197  
199   -func (x *CreateReq) ProtoReflect() protoreflect.Message {
  198 +func (x *LoginRsp) ProtoReflect() protoreflect.Message {
200 199 mi := &file_game_proto_msgTypes[3]
201 200 if protoimpl.UnsafeEnabled && x != nil {
202 201 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -208,33 +207,50 @@ func (x *CreateReq) ProtoReflect() protoreflect.Message {
208 207 return mi.MessageOf(x)
209 208 }
210 209  
211   -// Deprecated: Use CreateReq.ProtoReflect.Descriptor instead.
212   -func (*CreateReq) Descriptor() ([]byte, []int) {
  210 +// Deprecated: Use LoginRsp.ProtoReflect.Descriptor instead.
  211 +func (*LoginRsp) Descriptor() ([]byte, []int) {
213 212 return file_game_proto_rawDescGZIP(), []int{3}
214 213 }
215 214  
216   -func (x *CreateReq) GetToken() string {
  215 +func (x *LoginRsp) GetRole() *Role {
217 216 if x != nil {
218   - return x.Token
  217 + return x.Role
219 218 }
220   - return ""
  219 + return nil
221 220 }
222 221  
223   -func (x *CreateReq) GetDevice() string {
  222 +func (x *LoginRsp) GetHero() []*Hero {
224 223 if x != nil {
225   - return x.Device
  224 + return x.Hero
226 225 }
227   - return ""
  226 + return nil
228 227 }
229 228  
230   -type DisConnectNty struct {
  229 +func (x *LoginRsp) GetTeam() []*Team {
  230 + if x != nil {
  231 + return x.Team
  232 + }
  233 + return nil
  234 +}
  235 +
  236 +func (x *LoginRsp) GetEquipments() []*Equipment {
  237 + if x != nil {
  238 + return x.Equipments
  239 + }
  240 + return nil
  241 +}
  242 +
  243 +type CreateRar struct {
231 244 state protoimpl.MessageState
232 245 sizeCache protoimpl.SizeCache
233 246 unknownFields protoimpl.UnknownFields
  247 +
  248 + Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
  249 + Device string `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
234 250 }
235 251  
236   -func (x *DisConnectNty) Reset() {
237   - *x = DisConnectNty{}
  252 +func (x *CreateRar) Reset() {
  253 + *x = CreateRar{}
238 254 if protoimpl.UnsafeEnabled {
239 255 mi := &file_game_proto_msgTypes[4]
240 256 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -242,13 +258,13 @@ func (x *DisConnectNty) Reset() {
242 258 }
243 259 }
244 260  
245   -func (x *DisConnectNty) String() string {
  261 +func (x *CreateRar) String() string {
246 262 return protoimpl.X.MessageStringOf(x)
247 263 }
248 264  
249   -func (*DisConnectNty) ProtoMessage() {}
  265 +func (*CreateRar) ProtoMessage() {}
250 266  
251   -func (x *DisConnectNty) ProtoReflect() protoreflect.Message {
  267 +func (x *CreateRar) ProtoReflect() protoreflect.Message {
252 268 mi := &file_game_proto_msgTypes[4]
253 269 if protoimpl.UnsafeEnabled && x != nil {
254 270 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -260,22 +276,33 @@ func (x *DisConnectNty) ProtoReflect() protoreflect.Message {
260 276 return mi.MessageOf(x)
261 277 }
262 278  
263   -// Deprecated: Use DisConnectNty.ProtoReflect.Descriptor instead.
264   -func (*DisConnectNty) Descriptor() ([]byte, []int) {
  279 +// Deprecated: Use CreateRar.ProtoReflect.Descriptor instead.
  280 +func (*CreateRar) Descriptor() ([]byte, []int) {
265 281 return file_game_proto_rawDescGZIP(), []int{4}
266 282 }
267 283  
268   -//ResponseCmd ChangeTeamReq
269   -type ChangeTeamReq struct {
  284 +func (x *CreateRar) GetToken() string {
  285 + if x != nil {
  286 + return x.Token
  287 + }
  288 + return ""
  289 +}
  290 +
  291 +func (x *CreateRar) GetDevice() string {
  292 + if x != nil {
  293 + return x.Device
  294 + }
  295 + return ""
  296 +}
  297 +
  298 +type DisConnectNty struct {
270 299 state protoimpl.MessageState
271 300 sizeCache protoimpl.SizeCache
272 301 unknownFields protoimpl.UnknownFields
273   -
274   - Team []*Team `protobuf:"bytes,1,rep,name=team,proto3" json:"team,omitempty"`
275 302 }
276 303  
277   -func (x *ChangeTeamReq) Reset() {
278   - *x = ChangeTeamReq{}
  304 +func (x *DisConnectNty) Reset() {
  305 + *x = DisConnectNty{}
279 306 if protoimpl.UnsafeEnabled {
280 307 mi := &file_game_proto_msgTypes[5]
281 308 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -283,13 +310,13 @@ func (x *ChangeTeamReq) Reset() {
283 310 }
284 311 }
285 312  
286   -func (x *ChangeTeamReq) String() string {
  313 +func (x *DisConnectNty) String() string {
287 314 return protoimpl.X.MessageStringOf(x)
288 315 }
289 316  
290   -func (*ChangeTeamReq) ProtoMessage() {}
  317 +func (*DisConnectNty) ProtoMessage() {}
291 318  
292   -func (x *ChangeTeamReq) ProtoReflect() protoreflect.Message {
  319 +func (x *DisConnectNty) ProtoReflect() protoreflect.Message {
293 320 mi := &file_game_proto_msgTypes[5]
294 321 if protoimpl.UnsafeEnabled && x != nil {
295 322 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -301,29 +328,21 @@ func (x *ChangeTeamReq) ProtoReflect() protoreflect.Message {
301 328 return mi.MessageOf(x)
302 329 }
303 330  
304   -// Deprecated: Use ChangeTeamReq.ProtoReflect.Descriptor instead.
305   -func (*ChangeTeamReq) Descriptor() ([]byte, []int) {
  331 +// Deprecated: Use DisConnectNty.ProtoReflect.Descriptor instead.
  332 +func (*DisConnectNty) Descriptor() ([]byte, []int) {
306 333 return file_game_proto_rawDescGZIP(), []int{5}
307 334 }
308 335  
309   -func (x *ChangeTeamReq) GetTeam() []*Team {
310   - if x != nil {
311   - return x.Team
312   - }
313   - return nil
314   -}
315   -
316   -type EquipInfo struct {
  336 +type ChangeTeamRar struct {
317 337 state protoimpl.MessageState
318 338 sizeCache protoimpl.SizeCache
319 339 unknownFields protoimpl.UnknownFields
320 340  
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"`
  341 + Team []*Team `protobuf:"bytes,1,rep,name=team,proto3" json:"team,omitempty"`
323 342 }
324 343  
325   -func (x *EquipInfo) Reset() {
326   - *x = EquipInfo{}
  344 +func (x *ChangeTeamRar) Reset() {
  345 + *x = ChangeTeamRar{}
327 346 if protoimpl.UnsafeEnabled {
328 347 mi := &file_game_proto_msgTypes[6]
329 348 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -331,13 +350,13 @@ func (x *EquipInfo) Reset() {
331 350 }
332 351 }
333 352  
334   -func (x *EquipInfo) String() string {
  353 +func (x *ChangeTeamRar) String() string {
335 354 return protoimpl.X.MessageStringOf(x)
336 355 }
337 356  
338   -func (*EquipInfo) ProtoMessage() {}
  357 +func (*ChangeTeamRar) ProtoMessage() {}
339 358  
340   -func (x *EquipInfo) ProtoReflect() protoreflect.Message {
  359 +func (x *ChangeTeamRar) ProtoReflect() protoreflect.Message {
341 360 mi := &file_game_proto_msgTypes[6]
342 361 if protoimpl.UnsafeEnabled && x != nil {
343 362 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -349,38 +368,29 @@ func (x *EquipInfo) ProtoReflect() protoreflect.Message {
349 368 return mi.MessageOf(x)
350 369 }
351 370  
352   -// Deprecated: Use EquipInfo.ProtoReflect.Descriptor instead.
353   -func (*EquipInfo) Descriptor() ([]byte, []int) {
  371 +// Deprecated: Use ChangeTeamRar.ProtoReflect.Descriptor instead.
  372 +func (*ChangeTeamRar) Descriptor() ([]byte, []int) {
354 373 return file_game_proto_rawDescGZIP(), []int{6}
355 374 }
356 375  
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 {
  376 +func (x *ChangeTeamRar) GetTeam() []*Team {
365 377 if x != nil {
366   - return x.Pos
  378 + return x.Team
367 379 }
368   - return 0
  380 + return nil
369 381 }
370 382  
371   -//ResponseCmd HeroEquipReferReq
372   -type HeroEquipReferReq struct {
  383 +type EquipInfo struct {
373 384 state protoimpl.MessageState
374 385 sizeCache protoimpl.SizeCache
375 386 unknownFields protoimpl.UnknownFields
376 387  
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 脱下
  388 + EquipId string `protobuf:"bytes,1,opt,name=equipId,proto3" json:"equipId,omitempty"`
  389 + Pos int32 `protobuf:"varint,2,opt,name=pos,proto3" json:"pos,omitempty"`
380 390 }
381 391  
382   -func (x *HeroEquipReferReq) Reset() {
383   - *x = HeroEquipReferReq{}
  392 +func (x *EquipInfo) Reset() {
  393 + *x = EquipInfo{}
384 394 if protoimpl.UnsafeEnabled {
385 395 mi := &file_game_proto_msgTypes[7]
386 396 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -388,13 +398,13 @@ func (x *HeroEquipReferReq) Reset() {
388 398 }
389 399 }
390 400  
391   -func (x *HeroEquipReferReq) String() string {
  401 +func (x *EquipInfo) String() string {
392 402 return protoimpl.X.MessageStringOf(x)
393 403 }
394 404  
395   -func (*HeroEquipReferReq) ProtoMessage() {}
  405 +func (*EquipInfo) ProtoMessage() {}
396 406  
397   -func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message {
  407 +func (x *EquipInfo) ProtoReflect() protoreflect.Message {
398 408 mi := &file_game_proto_msgTypes[7]
399 409 if protoimpl.UnsafeEnabled && x != nil {
400 410 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -406,45 +416,37 @@ func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message {
406 416 return mi.MessageOf(x)
407 417 }
408 418  
409   -// Deprecated: Use HeroEquipReferReq.ProtoReflect.Descriptor instead.
410   -func (*HeroEquipReferReq) Descriptor() ([]byte, []int) {
  419 +// Deprecated: Use EquipInfo.ProtoReflect.Descriptor instead.
  420 +func (*EquipInfo) Descriptor() ([]byte, []int) {
411 421 return file_game_proto_rawDescGZIP(), []int{7}
412 422 }
413 423  
414   -func (x *HeroEquipReferReq) GetEquipIds() []*EquipInfo {
415   - if x != nil {
416   - return x.EquipIds
417   - }
418   - return nil
419   -}
420   -
421   -func (x *HeroEquipReferReq) GetHeroId() string {
  424 +func (x *EquipInfo) GetEquipId() string {
422 425 if x != nil {
423   - return x.HeroId
  426 + return x.EquipId
424 427 }
425 428 return ""
426 429 }
427 430  
428   -func (x *HeroEquipReferReq) GetRefer() bool {
  431 +func (x *EquipInfo) GetPos() int32 {
429 432 if x != nil {
430   - return x.Refer
  433 + return x.Pos
431 434 }
432   - return false
  435 + return 0
433 436 }
434 437  
435   -type RoleRsp struct {
  438 +type HeroEquipReferRar struct {
436 439 state protoimpl.MessageState
437 440 sizeCache protoimpl.SizeCache
438 441 unknownFields protoimpl.UnknownFields
439 442  
440   - Role *Role `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
441   - Hero []*Hero `protobuf:"bytes,3,rep,name=hero,proto3" json:"hero,omitempty"`
442   - Team []*Team `protobuf:"bytes,4,rep,name=team,proto3" json:"team,omitempty"`
443   - Equipments []*Equipment `protobuf:"bytes,5,rep,name=equipments,proto3" json:"equipments,omitempty"`
  443 + EquipIds []*EquipInfo `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds,omitempty"`
  444 + HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"`
  445 + Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴， false 脱下
444 446 }
445 447  
446   -func (x *RoleRsp) Reset() {
447   - *x = RoleRsp{}
  448 +func (x *HeroEquipReferRar) Reset() {
  449 + *x = HeroEquipReferRar{}
448 450 if protoimpl.UnsafeEnabled {
449 451 mi := &file_game_proto_msgTypes[8]
450 452 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -452,13 +454,13 @@ func (x *RoleRsp) Reset() {
452 454 }
453 455 }
454 456  
455   -func (x *RoleRsp) String() string {
  457 +func (x *HeroEquipReferRar) String() string {
456 458 return protoimpl.X.MessageStringOf(x)
457 459 }
458 460  
459   -func (*RoleRsp) ProtoMessage() {}
  461 +func (*HeroEquipReferRar) ProtoMessage() {}
460 462  
461   -func (x *RoleRsp) ProtoReflect() protoreflect.Message {
  463 +func (x *HeroEquipReferRar) ProtoReflect() protoreflect.Message {
462 464 mi := &file_game_proto_msgTypes[8]
463 465 if protoimpl.UnsafeEnabled && x != nil {
464 466 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -470,40 +472,32 @@ func (x *RoleRsp) ProtoReflect() protoreflect.Message {
470 472 return mi.MessageOf(x)
471 473 }
472 474  
473   -// Deprecated: Use RoleRsp.ProtoReflect.Descriptor instead.
474   -func (*RoleRsp) Descriptor() ([]byte, []int) {
  475 +// Deprecated: Use HeroEquipReferRar.ProtoReflect.Descriptor instead.
  476 +func (*HeroEquipReferRar) Descriptor() ([]byte, []int) {
475 477 return file_game_proto_rawDescGZIP(), []int{8}
476 478 }
477 479  
478   -func (x *RoleRsp) GetRole() *Role {
479   - if x != nil {
480   - return x.Role
481   - }
482   - return nil
483   -}
484   -
485   -func (x *RoleRsp) GetHero() []*Hero {
  480 +func (x *HeroEquipReferRar) GetEquipIds() []*EquipInfo {
486 481 if x != nil {
487   - return x.Hero
  482 + return x.EquipIds
488 483 }
489 484 return nil
490 485 }
491 486  
492   -func (x *RoleRsp) GetTeam() []*Team {
  487 +func (x *HeroEquipReferRar) GetHeroId() string {
493 488 if x != nil {
494   - return x.Team
  489 + return x.HeroId
495 490 }
496   - return nil
  491 + return ""
497 492 }
498 493  
499   -func (x *RoleRsp) GetEquipments() []*Equipment {
  494 +func (x *HeroEquipReferRar) GetRefer() bool {
500 495 if x != nil {
501   - return x.Equipments
  496 + return x.Refer
502 497 }
503   - return nil
  498 + return false
504 499 }
505 500  
506   -//ResponseCmd RoleUpdatePropertyNty
507 501 type RoleUpdatePropertyNty struct {
508 502 state protoimpl.MessageState
509 503 sizeCache protoimpl.SizeCache
... ... @@ -559,7 +553,6 @@ func (x *RoleUpdatePropertyNty) GetRole() *Role {
559 553 return nil
560 554 }
561 555  
562   -//ResponseCmd RoleUpdateItemsNty
563 556 type RoleUpdateItemsNty struct {
564 557 state protoimpl.MessageState
565 558 sizeCache protoimpl.SizeCache
... ... @@ -607,8 +600,7 @@ func (x *RoleUpdateItemsNty) GetItems() string {
607 600 return ""
608 601 }
609 602  
610   -//ResponseCmd RoleClearItemsReq
611   -type RoleClearItemsReq struct {
  603 +type RoleClearItemsRar struct {
612 604 state protoimpl.MessageState
613 605 sizeCache protoimpl.SizeCache
614 606 unknownFields protoimpl.UnknownFields
... ... @@ -616,8 +608,8 @@ type RoleClearItemsReq struct {
616 608 Items []string `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"`
617 609 }
618 610  
619   -func (x *RoleClearItemsReq) Reset() {
620   - *x = RoleClearItemsReq{}
  611 +func (x *RoleClearItemsRar) Reset() {
  612 + *x = RoleClearItemsRar{}
621 613 if protoimpl.UnsafeEnabled {
622 614 mi := &file_game_proto_msgTypes[11]
623 615 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -625,13 +617,13 @@ func (x *RoleClearItemsReq) Reset() {
625 617 }
626 618 }
627 619  
628   -func (x *RoleClearItemsReq) String() string {
  620 +func (x *RoleClearItemsRar) String() string {
629 621 return protoimpl.X.MessageStringOf(x)
630 622 }
631 623  
632   -func (*RoleClearItemsReq) ProtoMessage() {}
  624 +func (*RoleClearItemsRar) ProtoMessage() {}
633 625  
634   -func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message {
  626 +func (x *RoleClearItemsRar) ProtoReflect() protoreflect.Message {
635 627 mi := &file_game_proto_msgTypes[11]
636 628 if protoimpl.UnsafeEnabled && x != nil {
637 629 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
... ... @@ -643,12 +635,12 @@ func (x *RoleClearItemsReq) ProtoReflect() protoreflect.Message {
643 635 return mi.MessageOf(x)
644 636 }
645 637  
646   -// Deprecated: Use RoleClearItemsReq.ProtoReflect.Descriptor instead.
647   -func (*RoleClearItemsReq) Descriptor() ([]byte, []int) {
  638 +// Deprecated: Use RoleClearItemsRar.ProtoReflect.Descriptor instead.
  639 +func (*RoleClearItemsRar) Descriptor() ([]byte, []int) {
648 640 return file_game_proto_rawDescGZIP(), []int{11}
649 641 }
650 642  
651   -func (x *RoleClearItemsReq) GetItems() []string {
  643 +func (x *RoleClearItemsRar) GetItems() []string {
652 644 if x != nil {
653 645 return x.Items
654 646 }
... ... @@ -710,7 +702,44 @@ func (x *RoleStartBattleReq) GetCarbonId() int32 {
710 702 return 0
711 703 }
712 704  
713   -//ResponseCmd RoleEndBattleRsp
  705 +type RoleStartBattleRsp struct {
  706 + state protoimpl.MessageState
  707 + sizeCache protoimpl.SizeCache
  708 + unknownFields protoimpl.UnknownFields
  709 +}
  710 +
  711 +func (x *RoleStartBattleRsp) Reset() {
  712 + *x = RoleStartBattleRsp{}
  713 + if protoimpl.UnsafeEnabled {
  714 + mi := &file_game_proto_msgTypes[13]
  715 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  716 + ms.StoreMessageInfo(mi)
  717 + }
  718 +}
  719 +
  720 +func (x *RoleStartBattleRsp) String() string {
  721 + return protoimpl.X.MessageStringOf(x)
  722 +}
  723 +
  724 +func (*RoleStartBattleRsp) ProtoMessage() {}
  725 +
  726 +func (x *RoleStartBattleRsp) ProtoReflect() protoreflect.Message {
  727 + mi := &file_game_proto_msgTypes[13]
  728 + if protoimpl.UnsafeEnabled && x != nil {
  729 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  730 + if ms.LoadMessageInfo() == nil {
  731 + ms.StoreMessageInfo(mi)
  732 + }
  733 + return ms
  734 + }
  735 + return mi.MessageOf(x)
  736 +}
  737 +
  738 +// Deprecated: Use RoleStartBattleRsp.ProtoReflect.Descriptor instead.
  739 +func (*RoleStartBattleRsp) Descriptor() ([]byte, []int) {
  740 + return file_game_proto_rawDescGZIP(), []int{13}
  741 +}
  742 +
714 743 type RoleEndBattleReq struct {
715 744 state protoimpl.MessageState
716 745 sizeCache protoimpl.SizeCache
... ... @@ -725,7 +754,7 @@ type RoleEndBattleReq struct {
725 754 func (x *RoleEndBattleReq) Reset() {
726 755 *x = RoleEndBattleReq{}
727 756 if protoimpl.UnsafeEnabled {
728   - mi := &file_game_proto_msgTypes[13]
  757 + mi := &file_game_proto_msgTypes[14]
729 758 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
730 759 ms.StoreMessageInfo(mi)
731 760 }
... ... @@ -738,7 +767,7 @@ func (x *RoleEndBattleReq) String() string {
738 767 func (*RoleEndBattleReq) ProtoMessage() {}
739 768  
740 769 func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message {
741   - mi := &file_game_proto_msgTypes[13]
  770 + mi := &file_game_proto_msgTypes[14]
742 771 if protoimpl.UnsafeEnabled && x != nil {
743 772 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
744 773 if ms.LoadMessageInfo() == nil {
... ... @@ -751,7 +780,7 @@ func (x *RoleEndBattleReq) ProtoReflect() protoreflect.Message {
751 780  
752 781 // Deprecated: Use RoleEndBattleReq.ProtoReflect.Descriptor instead.
753 782 func (*RoleEndBattleReq) Descriptor() ([]byte, []int) {
754   - return file_game_proto_rawDescGZIP(), []int{13}
  783 + return file_game_proto_rawDescGZIP(), []int{14}
755 784 }
756 785  
757 786 func (x *RoleEndBattleReq) GetChapterId() int32 {
... ... @@ -782,7 +811,6 @@ func (x *RoleEndBattleReq) GetTeamId() string {
782 811 return ""
783 812 }
784 813  
785   -//ResponseCmd RoleEndBattleRsp
786 814 type RoleEndBattleRsp struct {
787 815 state protoimpl.MessageState
788 816 sizeCache protoimpl.SizeCache
... ... @@ -799,7 +827,7 @@ type RoleEndBattleRsp struct {
799 827 func (x *RoleEndBattleRsp) Reset() {
800 828 *x = RoleEndBattleRsp{}
801 829 if protoimpl.UnsafeEnabled {
802   - mi := &file_game_proto_msgTypes[14]
  830 + mi := &file_game_proto_msgTypes[15]
803 831 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
804 832 ms.StoreMessageInfo(mi)
805 833 }
... ... @@ -812,7 +840,7 @@ func (x *RoleEndBattleRsp) String() string {
812 840 func (*RoleEndBattleRsp) ProtoMessage() {}
813 841  
814 842 func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message {
815   - mi := &file_game_proto_msgTypes[14]
  843 + mi := &file_game_proto_msgTypes[15]
816 844 if protoimpl.UnsafeEnabled && x != nil {
817 845 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
818 846 if ms.LoadMessageInfo() == nil {
... ... @@ -825,7 +853,7 @@ func (x *RoleEndBattleRsp) ProtoReflect() protoreflect.Message {
825 853  
826 854 // Deprecated: Use RoleEndBattleRsp.ProtoReflect.Descriptor instead.
827 855 func (*RoleEndBattleRsp) Descriptor() ([]byte, []int) {
828   - return file_game_proto_rawDescGZIP(), []int{14}
  856 + return file_game_proto_rawDescGZIP(), []int{15}
829 857 }
830 858  
831 859 func (x *RoleEndBattleRsp) GetRoleLevel() int32 {
... ... @@ -870,8 +898,7 @@ func (x *RoleEndBattleRsp) GetHero() []*Hero {
870 898 return nil
871 899 }
872 900  
873   -//ResponseCmd EquipmentDelReq
874   -type EquipmentDelReq struct {
  901 +type EquipmentDelRar struct {
875 902 state protoimpl.MessageState
876 903 sizeCache protoimpl.SizeCache
877 904 unknownFields protoimpl.UnknownFields
... ... @@ -879,23 +906,23 @@ type EquipmentDelReq struct {
879 906 Id []string `protobuf:"bytes,1,rep,name=id,proto3" json:"id,omitempty"`
880 907 }
881 908  
882   -func (x *EquipmentDelReq) Reset() {
883   - *x = EquipmentDelReq{}
  909 +func (x *EquipmentDelRar) Reset() {
  910 + *x = EquipmentDelRar{}
884 911 if protoimpl.UnsafeEnabled {
885   - mi := &file_game_proto_msgTypes[15]
  912 + mi := &file_game_proto_msgTypes[16]
886 913 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
887 914 ms.StoreMessageInfo(mi)
888 915 }
889 916 }
890 917  
891   -func (x *EquipmentDelReq) String() string {
  918 +func (x *EquipmentDelRar) String() string {
892 919 return protoimpl.X.MessageStringOf(x)
893 920 }
894 921  
895   -func (*EquipmentDelReq) ProtoMessage() {}
  922 +func (*EquipmentDelRar) ProtoMessage() {}
896 923  
897   -func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message {
898   - mi := &file_game_proto_msgTypes[15]
  924 +func (x *EquipmentDelRar) ProtoReflect() protoreflect.Message {
  925 + mi := &file_game_proto_msgTypes[16]
899 926 if protoimpl.UnsafeEnabled && x != nil {
900 927 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
901 928 if ms.LoadMessageInfo() == nil {
... ... @@ -906,19 +933,18 @@ func (x *EquipmentDelReq) ProtoReflect() protoreflect.Message {
906 933 return mi.MessageOf(x)
907 934 }
908 935  
909   -// Deprecated: Use EquipmentDelReq.ProtoReflect.Descriptor instead.
910   -func (*EquipmentDelReq) Descriptor() ([]byte, []int) {
911   - return file_game_proto_rawDescGZIP(), []int{15}
  936 +// Deprecated: Use EquipmentDelRar.ProtoReflect.Descriptor instead.
  937 +func (*EquipmentDelRar) Descriptor() ([]byte, []int) {
  938 + return file_game_proto_rawDescGZIP(), []int{16}
912 939 }
913 940  
914   -func (x *EquipmentDelReq) GetId() []string {
  941 +func (x *EquipmentDelRar) GetId() []string {
915 942 if x != nil {
916 943 return x.Id
917 944 }
918 945 return nil
919 946 }
920 947  
921   -//ResponseCmd EquipmentAddRsp
922 948 type EquipmentAddNty struct {
923 949 state protoimpl.MessageState
924 950 sizeCache protoimpl.SizeCache
... ... @@ -930,7 +956,7 @@ type EquipmentAddNty struct {
930 956 func (x *EquipmentAddNty) Reset() {
931 957 *x = EquipmentAddNty{}
932 958 if protoimpl.UnsafeEnabled {
933   - mi := &file_game_proto_msgTypes[16]
  959 + mi := &file_game_proto_msgTypes[17]
934 960 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
935 961 ms.StoreMessageInfo(mi)
936 962 }
... ... @@ -943,7 +969,7 @@ func (x *EquipmentAddNty) String() string {
943 969 func (*EquipmentAddNty) ProtoMessage() {}
944 970  
945 971 func (x *EquipmentAddNty) ProtoReflect() protoreflect.Message {
946   - mi := &file_game_proto_msgTypes[16]
  972 + mi := &file_game_proto_msgTypes[17]
947 973 if protoimpl.UnsafeEnabled && x != nil {
948 974 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
949 975 if ms.LoadMessageInfo() == nil {
... ... @@ -956,7 +982,7 @@ func (x *EquipmentAddNty) ProtoReflect() protoreflect.Message {
956 982  
957 983 // Deprecated: Use EquipmentAddNty.ProtoReflect.Descriptor instead.
958 984 func (*EquipmentAddNty) Descriptor() ([]byte, []int) {
959   - return file_game_proto_rawDescGZIP(), []int{16}
  985 + return file_game_proto_rawDescGZIP(), []int{17}
960 986 }
961 987  
962 988 func (x *EquipmentAddNty) GetEquip() *Equipment {
... ... @@ -966,7 +992,6 @@ func (x *EquipmentAddNty) GetEquip() *Equipment {
966 992 return nil
967 993 }
968 994  
969   -//ResponseCmd HeroUpLevelRsp
970 995 type HeroUpLevelReq struct {
971 996 state protoimpl.MessageState
972 997 sizeCache protoimpl.SizeCache
... ... @@ -979,7 +1004,7 @@ type HeroUpLevelReq struct {
979 1004 func (x *HeroUpLevelReq) Reset() {
980 1005 *x = HeroUpLevelReq{}
981 1006 if protoimpl.UnsafeEnabled {
982   - mi := &file_game_proto_msgTypes[17]
  1007 + mi := &file_game_proto_msgTypes[18]
983 1008 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
984 1009 ms.StoreMessageInfo(mi)
985 1010 }
... ... @@ -992,7 +1017,7 @@ func (x *HeroUpLevelReq) String() string {
992 1017 func (*HeroUpLevelReq) ProtoMessage() {}
993 1018  
994 1019 func (x *HeroUpLevelReq) ProtoReflect() protoreflect.Message {
995   - mi := &file_game_proto_msgTypes[17]
  1020 + mi := &file_game_proto_msgTypes[18]
996 1021 if protoimpl.UnsafeEnabled && x != nil {
997 1022 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
998 1023 if ms.LoadMessageInfo() == nil {
... ... @@ -1005,7 +1030,7 @@ func (x *HeroUpLevelReq) ProtoReflect() protoreflect.Message {
1005 1030  
1006 1031 // Deprecated: Use HeroUpLevelReq.ProtoReflect.Descriptor instead.
1007 1032 func (*HeroUpLevelReq) Descriptor() ([]byte, []int) {
1008   - return file_game_proto_rawDescGZIP(), []int{17}
  1033 + return file_game_proto_rawDescGZIP(), []int{18}
1009 1034 }
1010 1035  
1011 1036 func (x *HeroUpLevelReq) GetHeroId() string {
... ... @@ -1033,7 +1058,7 @@ type HeroUpLevelRsp struct {
1033 1058 func (x *HeroUpLevelRsp) Reset() {
1034 1059 *x = HeroUpLevelRsp{}
1035 1060 if protoimpl.UnsafeEnabled {
1036   - mi := &file_game_proto_msgTypes[18]
  1061 + mi := &file_game_proto_msgTypes[19]
1037 1062 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1038 1063 ms.StoreMessageInfo(mi)
1039 1064 }
... ... @@ -1046,7 +1071,7 @@ func (x *HeroUpLevelRsp) String() string {
1046 1071 func (*HeroUpLevelRsp) ProtoMessage() {}
1047 1072  
1048 1073 func (x *HeroUpLevelRsp) ProtoReflect() protoreflect.Message {
1049   - mi := &file_game_proto_msgTypes[18]
  1074 + mi := &file_game_proto_msgTypes[19]
1050 1075 if protoimpl.UnsafeEnabled && x != nil {
1051 1076 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1052 1077 if ms.LoadMessageInfo() == nil {
... ... @@ -1059,7 +1084,7 @@ func (x *HeroUpLevelRsp) ProtoReflect() protoreflect.Message {
1059 1084  
1060 1085 // Deprecated: Use HeroUpLevelRsp.ProtoReflect.Descriptor instead.
1061 1086 func (*HeroUpLevelRsp) Descriptor() ([]byte, []int) {
1062   - return file_game_proto_rawDescGZIP(), []int{18}
  1087 + return file_game_proto_rawDescGZIP(), []int{19}
1063 1088 }
1064 1089  
1065 1090 func (x *HeroUpLevelRsp) GetHero() *Hero {
... ... @@ -1081,86 +1106,87 @@ var file_game_proto_rawDesc = []byte{
1081 1106 0x22, 0x38, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
1082 1107 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b,
1083 1108 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
1084   - 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x39, 0x0a, 0x09, 0x43, 0x72,
1085   - 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
1086   - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x16, 0x0a,
1087   - 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64,
1088   - 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x44, 0x69, 0x73, 0x43, 0x6f, 0x6e, 0x6e,
1089   - 0x65, 0x63, 0x74, 0x4e, 0x74, 0x79, 0x22, 0x31, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
1090   - 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18,
1091   - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54,
1092   - 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x37, 0x0a, 0x09, 0x45, 0x71, 0x75,
1093   - 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49,
1094   - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64,
1095   - 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70,
1096   - 0x6f, 0x73, 0x22, 0x6f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52,
1097   - 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x2b, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70,
1098   - 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x67, 0x61, 0x6d, 0x65,
1099   - 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69,
1100   - 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18,
1101   - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a,
1102   - 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65,
1103   - 0x66, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12,
1104   - 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
1105   - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c,
1106   - 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
1107   - 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68,
1108   - 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28,
1109   - 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52,
1110   - 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
1111   - 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
1112   - 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x65, 0x71,
1113   - 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65,
1114   - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x4e, 0x74,
1115   - 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x02, 0x69,
1116   - 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
1117   - 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72,
1118   - 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74,
1119   - 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65,
1120   - 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22,
1121   - 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d,
1122   - 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20,
1123   - 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52, 0x6f,
1124   - 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71,
1125   - 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
1126   - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12,
1127   - 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
1128   - 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x7b, 0x0a, 0x10,
1129   - 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71,
1130   - 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01,
1131   - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12,
1132   - 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
1133   - 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04,
1134   - 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73,
1135   - 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
1136   - 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f,
1137   - 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d,
1138   - 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01,
1139   - 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, 0x6c, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a,
1140   - 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
1141   - 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65,
1142   - 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
1143   - 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
1144   - 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
1145   - 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18,
1146   - 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68,
1147   - 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
1148   - 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a,
1149   - 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71,
1150   - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
1151   - 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64,
1152   - 0x4e, 0x74, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01,
1153   - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69,
1154   - 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x22, 0x3e, 0x0a, 0x0e,
1155   - 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x16,
1156   - 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
1157   - 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18,
1158   - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x32, 0x0a, 0x0e,
1159   - 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x20,
1160   - 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d,
1161   - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f,
1162   - 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
1163   - 0x6f, 0x74, 0x6f, 0x33,
  1109 + 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0xa3, 0x01, 0x0a, 0x08, 0x4c,
  1110 + 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18,
  1111 + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52,
  1112 + 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72,
  1113 + 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73,
  1114 + 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74,
  1115 + 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
  1116 + 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a,
  1117 + 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
  1118 + 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70,
  1119 + 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73,
  1120 + 0x22, 0x39, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x61, 0x72, 0x12, 0x14, 0x0a,
  1121 + 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f,
  1122 + 0x6b, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20,
  1123 + 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x44,
  1124 + 0x69, 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4e, 0x74, 0x79, 0x22, 0x31, 0x0a, 0x0d,
  1125 + 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x61, 0x72, 0x12, 0x20, 0x0a,
  1126 + 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f,
  1127 + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22,
  1128 + 0x37, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07,
  1129 + 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65,
  1130 + 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20,
  1131 + 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x6f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f,
  1132 + 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x61, 0x72, 0x12, 0x2b, 0x0a,
  1133 + 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
  1134 + 0x0f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f,
  1135 + 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65,
  1136 + 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72,
  1137 + 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
  1138 + 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x22, 0x49, 0x0a, 0x15, 0x52, 0x6f, 0x6c,
  1139 + 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x4e,
  1140 + 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x02,
  1141 + 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
  1142 + 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04,
  1143 + 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61,
  1144 + 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74,
  1145 + 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
  1146 + 0x22, 0x29, 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65,
  1147 + 0x6d, 0x73, 0x52, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01,
  1148 + 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x50, 0x0a, 0x12, 0x52,
  1149 + 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
  1150 + 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18,
  1151 + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64,
  1152 + 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
  1153 + 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x14, 0x0a,
  1154 + 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
  1155 + 0x52, 0x73, 0x70, 0x22, 0x7b, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61,
  1156 + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x70, 0x74,
  1157 + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61,
  1158 + 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e,
  1159 + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x62, 0x6f,
  1160 + 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
  1161 + 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x5f,
  1162 + 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64,
  1163 + 0x22, 0xc1, 0x01, 0x0a, 0x10, 0x52, 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74,
  1164 + 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x6c, 0x65,
  1165 + 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x6f, 0x6c, 0x65, 0x4c,
  1166 + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70,
  1167 + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70, 0x12,
  1168 + 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
  1169 + 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x6f, 0x6c, 0x65, 0x45, 0x78, 0x70,
  1170 + 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
  1171 + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12,
  1172 + 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61,
  1173 + 0x73, 0x73, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
  1174 + 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
  1175 + 0x68, 0x65, 0x72, 0x6f, 0x22, 0x21, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
  1176 + 0x74, 0x44, 0x65, 0x6c, 0x52, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
  1177 + 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70,
  1178 + 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x4e, 0x74, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x71,
  1179 + 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
  1180 + 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71,
  1181 + 0x75, 0x69, 0x70, 0x22, 0x3e, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76,
  1182 + 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18,
  1183 + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a,
  1184 + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74,
  1185 + 0x65, 0x6d, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76,
  1186 + 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
  1187 + 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72,
  1188 + 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62,
  1189 + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
1164 1190 }
1165 1191  
1166 1192 var (
... ... @@ -1175,42 +1201,43 @@ func file_game_proto_rawDescGZIP() []byte {
1175 1201 return file_game_proto_rawDescData
1176 1202 }
1177 1203  
1178   -var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
  1204 +var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
1179 1205 var file_game_proto_goTypes = []interface{}{
1180 1206 (*HeartReq)(nil), // 0: game.HeartReq
1181 1207 (*HeartRsp)(nil), // 1: game.HeartRsp
1182 1208 (*LoginReq)(nil), // 2: game.LoginReq
1183   - (*CreateReq)(nil), // 3: game.CreateReq
1184   - (*DisConnectNty)(nil), // 4: game.DisConnectNty
1185   - (*ChangeTeamReq)(nil), // 5: game.ChangeTeamReq
1186   - (*EquipInfo)(nil), // 6: game.EquipInfo
1187   - (*HeroEquipReferReq)(nil), // 7: game.HeroEquipReferReq
1188   - (*RoleRsp)(nil), // 8: game.RoleRsp
  1209 + (*LoginRsp)(nil), // 3: game.LoginRsp
  1210 + (*CreateRar)(nil), // 4: game.CreateRar
  1211 + (*DisConnectNty)(nil), // 5: game.DisConnectNty
  1212 + (*ChangeTeamRar)(nil), // 6: game.ChangeTeamRar
  1213 + (*EquipInfo)(nil), // 7: game.EquipInfo
  1214 + (*HeroEquipReferRar)(nil), // 8: game.HeroEquipReferRar
1189 1215 (*RoleUpdatePropertyNty)(nil), // 9: game.RoleUpdatePropertyNty
1190 1216 (*RoleUpdateItemsNty)(nil), // 10: game.RoleUpdateItemsNty
1191   - (*RoleClearItemsReq)(nil), // 11: game.RoleClearItemsReq
  1217 + (*RoleClearItemsRar)(nil), // 11: game.RoleClearItemsRar
1192 1218 (*RoleStartBattleReq)(nil), // 12: game.RoleStartBattleReq
1193   - (*RoleEndBattleReq)(nil), // 13: game.RoleEndBattleReq
1194   - (*RoleEndBattleRsp)(nil), // 14: game.RoleEndBattleRsp
1195   - (*EquipmentDelReq)(nil), // 15: game.EquipmentDelReq
1196   - (*EquipmentAddNty)(nil), // 16: game.EquipmentAddNty
1197   - (*HeroUpLevelReq)(nil), // 17: game.HeroUpLevelReq
1198   - (*HeroUpLevelRsp)(nil), // 18: game.HeroUpLevelRsp
1199   - (*Team)(nil), // 19: models.Team
  1219 + (*RoleStartBattleRsp)(nil), // 13: game.RoleStartBattleRsp
  1220 + (*RoleEndBattleReq)(nil), // 14: game.RoleEndBattleReq
  1221 + (*RoleEndBattleRsp)(nil), // 15: game.RoleEndBattleRsp
  1222 + (*EquipmentDelRar)(nil), // 16: game.EquipmentDelRar
  1223 + (*EquipmentAddNty)(nil), // 17: game.EquipmentAddNty
  1224 + (*HeroUpLevelReq)(nil), // 18: game.HeroUpLevelReq
  1225 + (*HeroUpLevelRsp)(nil), // 19: game.HeroUpLevelRsp
1200 1226 (*Role)(nil), // 20: models.Role
1201 1227 (*Hero)(nil), // 21: models.Hero
1202   - (*Equipment)(nil), // 22: models.Equipment
  1228 + (*Team)(nil), // 22: models.Team
  1229 + (*Equipment)(nil), // 23: models.Equipment
1203 1230 }
1204 1231 var file_game_proto_depIdxs = []int32{
1205   - 19, // 0: game.ChangeTeamReq.team:type_name -> models.Team
1206   - 6, // 1: game.HeroEquipReferReq.equipIds:type_name -> game.EquipInfo
1207   - 20, // 2: game.RoleRsp.role:type_name -> models.Role
1208   - 21, // 3: game.RoleRsp.hero:type_name -> models.Hero
1209   - 19, // 4: game.RoleRsp.team:type_name -> models.Team
1210   - 22, // 5: game.RoleRsp.equipments:type_name -> models.Equipment
  1232 + 20, // 0: game.LoginRsp.role:type_name -> models.Role
  1233 + 21, // 1: game.LoginRsp.hero:type_name -> models.Hero
  1234 + 22, // 2: game.LoginRsp.team:type_name -> models.Team
  1235 + 23, // 3: game.LoginRsp.equipments:type_name -> models.Equipment
  1236 + 22, // 4: game.ChangeTeamRar.team:type_name -> models.Team
  1237 + 7, // 5: game.HeroEquipReferRar.equipIds:type_name -> game.EquipInfo
1211 1238 20, // 6: game.RoleUpdatePropertyNty.role:type_name -> models.Role
1212 1239 21, // 7: game.RoleEndBattleRsp.hero:type_name -> models.Hero
1213   - 22, // 8: game.EquipmentAddNty.equip:type_name -> models.Equipment
  1240 + 23, // 8: game.EquipmentAddNty.equip:type_name -> models.Equipment
1214 1241 21, // 9: game.HeroUpLevelRsp.hero:type_name -> models.Hero
1215 1242 10, // [10:10] is the sub-list for method output_type
1216 1243 10, // [10:10] is the sub-list for method input_type
... ... @@ -1263,7 +1290,7 @@ func file_game_proto_init() {
1263 1290 }
1264 1291 }
1265 1292 file_game_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
1266   - switch v := v.(*CreateReq); i {
  1293 + switch v := v.(*LoginRsp); i {
1267 1294 case 0:
1268 1295 return &v.state
1269 1296 case 1:
... ... @@ -1275,7 +1302,7 @@ func file_game_proto_init() {
1275 1302 }
1276 1303 }
1277 1304 file_game_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
1278   - switch v := v.(*DisConnectNty); i {
  1305 + switch v := v.(*CreateRar); i {
1279 1306 case 0:
1280 1307 return &v.state
1281 1308 case 1:
... ... @@ -1287,7 +1314,7 @@ func file_game_proto_init() {
1287 1314 }
1288 1315 }
1289 1316 file_game_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
1290   - switch v := v.(*ChangeTeamReq); i {
  1317 + switch v := v.(*DisConnectNty); i {
1291 1318 case 0:
1292 1319 return &v.state
1293 1320 case 1:
... ... @@ -1299,7 +1326,7 @@ func file_game_proto_init() {
1299 1326 }
1300 1327 }
1301 1328 file_game_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
1302   - switch v := v.(*EquipInfo); i {
  1329 + switch v := v.(*ChangeTeamRar); i {
1303 1330 case 0:
1304 1331 return &v.state
1305 1332 case 1:
... ... @@ -1311,7 +1338,7 @@ func file_game_proto_init() {
1311 1338 }
1312 1339 }
1313 1340 file_game_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
1314   - switch v := v.(*HeroEquipReferReq); i {
  1341 + switch v := v.(*EquipInfo); i {
1315 1342 case 0:
1316 1343 return &v.state
1317 1344 case 1:
... ... @@ -1323,7 +1350,7 @@ func file_game_proto_init() {
1323 1350 }
1324 1351 }
1325 1352 file_game_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
1326   - switch v := v.(*RoleRsp); i {
  1353 + switch v := v.(*HeroEquipReferRar); i {
1327 1354 case 0:
1328 1355 return &v.state
1329 1356 case 1:
... ... @@ -1359,7 +1386,7 @@ func file_game_proto_init() {
1359 1386 }
1360 1387 }
1361 1388 file_game_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
1362   - switch v := v.(*RoleClearItemsReq); i {
  1389 + switch v := v.(*RoleClearItemsRar); i {
1363 1390 case 0:
1364 1391 return &v.state
1365 1392 case 1:
... ... @@ -1383,7 +1410,7 @@ func file_game_proto_init() {
1383 1410 }
1384 1411 }
1385 1412 file_game_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
1386   - switch v := v.(*RoleEndBattleReq); i {
  1413 + switch v := v.(*RoleStartBattleRsp); i {
1387 1414 case 0:
1388 1415 return &v.state
1389 1416 case 1:
... ... @@ -1395,7 +1422,7 @@ func file_game_proto_init() {
1395 1422 }
1396 1423 }
1397 1424 file_game_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
1398   - switch v := v.(*RoleEndBattleRsp); i {
  1425 + switch v := v.(*RoleEndBattleReq); i {
1399 1426 case 0:
1400 1427 return &v.state
1401 1428 case 1:
... ... @@ -1407,7 +1434,7 @@ func file_game_proto_init() {
1407 1434 }
1408 1435 }
1409 1436 file_game_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
1410   - switch v := v.(*EquipmentDelReq); i {
  1437 + switch v := v.(*RoleEndBattleRsp); i {
1411 1438 case 0:
1412 1439 return &v.state
1413 1440 case 1:
... ... @@ -1419,7 +1446,7 @@ func file_game_proto_init() {
1419 1446 }
1420 1447 }
1421 1448 file_game_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
1422   - switch v := v.(*EquipmentAddNty); i {
  1449 + switch v := v.(*EquipmentDelRar); i {
1423 1450 case 0:
1424 1451 return &v.state
1425 1452 case 1:
... ... @@ -1431,7 +1458,7 @@ func file_game_proto_init() {
1431 1458 }
1432 1459 }
1433 1460 file_game_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
1434   - switch v := v.(*HeroUpLevelReq); i {
  1461 + switch v := v.(*EquipmentAddNty); i {
1435 1462 case 0:
1436 1463 return &v.state
1437 1464 case 1:
... ... @@ -1443,6 +1470,18 @@ func file_game_proto_init() {
1443 1470 }
1444 1471 }
1445 1472 file_game_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
  1473 + switch v := v.(*HeroUpLevelReq); i {
  1474 + case 0:
  1475 + return &v.state
  1476 + case 1:
  1477 + return &v.sizeCache
  1478 + case 2:
  1479 + return &v.unknownFields
  1480 + default:
  1481 + return nil
  1482 + }
  1483 + }
  1484 + file_game_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
1446 1485 switch v := v.(*HeroUpLevelRsp); i {
1447 1486 case 0:
1448 1487 return &v.state
... ... @@ -1461,7 +1500,7 @@ func file_game_proto_init() {
1461 1500 GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
1462 1501 RawDescriptor: file_game_proto_rawDesc,
1463 1502 NumEnums: 0,
1464   - NumMessages: 19,
  1503 + NumMessages: 20,
1465 1504 NumExtensions: 0,
1466 1505 NumServices: 0,
1467 1506 },
... ...
pb/protocode.pb.go
  Show/Hide comments   View file @f8ce769
... ... @@ -26,14 +26,14 @@ const (
26 26 ProtoCode_UNKNOWN ProtoCode = 0
27 27 ProtoCode_HeartRpc ProtoCode = 1
28 28 ProtoCode_LoginRpc ProtoCode = 2
29   - ProtoCode_CreateRpc ProtoCode = 3
30   - ProtoCode_ChangeTeamRpc ProtoCode = 4
31   - ProtoCode_HeroEquipReferRpc ProtoCode = 5
32   - ProtoCode_RoleClearItemsRpc ProtoCode = 6
33   - ProtoCode_RoleStartBattleRpc ProtoCode = 7
34   - ProtoCode_RoleEndBattleRpc ProtoCode = 8
35   - ProtoCode_EquipmentDelRpc ProtoCode = 9
36   - ProtoCode_HeroUpLevelRpc ProtoCode = 10
  29 + ProtoCode_RoleStartBattleRpc ProtoCode = 3
  30 + ProtoCode_RoleEndBattleRpc ProtoCode = 4
  31 + ProtoCode_HeroUpLevelRpc ProtoCode = 5
  32 + ProtoCode_CreateRpc ProtoCode = 6
  33 + ProtoCode_ChangeTeamRpc ProtoCode = 7
  34 + ProtoCode_HeroEquipReferRpc ProtoCode = 8
  35 + ProtoCode_RoleClearItemsRpc ProtoCode = 9
  36 + ProtoCode_EquipmentDelRpc ProtoCode = 10
37 37 ProtoCode_DisConnectNty ProtoCode = 11
38 38 ProtoCode_RoleUpdatePropertyNty ProtoCode = 12
39 39 ProtoCode_RoleUpdateItemsNty ProtoCode = 13
... ... @@ -46,14 +46,14 @@ var (
46 46 0: "UNKNOWN",
47 47 1: "HeartRpc",
48 48 2: "LoginRpc",
49   - 3: "CreateRpc",
50   - 4: "ChangeTeamRpc",
51   - 5: "HeroEquipReferRpc",
52   - 6: "RoleClearItemsRpc",
53   - 7: "RoleStartBattleRpc",
54   - 8: "RoleEndBattleRpc",
55   - 9: "EquipmentDelRpc",
56   - 10: "HeroUpLevelRpc",
  49 + 3: "RoleStartBattleRpc",
  50 + 4: "RoleEndBattleRpc",
  51 + 5: "HeroUpLevelRpc",
  52 + 6: "CreateRpc",
  53 + 7: "ChangeTeamRpc",
  54 + 8: "HeroEquipReferRpc",
  55 + 9: "RoleClearItemsRpc",
  56 + 10: "EquipmentDelRpc",
57 57 11: "DisConnectNty",
58 58 12: "RoleUpdatePropertyNty",
59 59 13: "RoleUpdateItemsNty",
... ... @@ -63,14 +63,14 @@ var (
63 63 "UNKNOWN": 0,
64 64 "HeartRpc": 1,
65 65 "LoginRpc": 2,
66   - "CreateRpc": 3,
67   - "ChangeTeamRpc": 4,
68   - "HeroEquipReferRpc": 5,
69   - "RoleClearItemsRpc": 6,
70   - "RoleStartBattleRpc": 7,
71   - "RoleEndBattleRpc": 8,
72   - "EquipmentDelRpc": 9,
73   - "HeroUpLevelRpc": 10,
  66 + "RoleStartBattleRpc": 3,
  67 + "RoleEndBattleRpc": 4,
  68 + "HeroUpLevelRpc": 5,
  69 + "CreateRpc": 6,
  70 + "ChangeTeamRpc": 7,
  71 + "HeroEquipReferRpc": 8,
  72 + "RoleClearItemsRpc": 9,
  73 + "EquipmentDelRpc": 10,
74 74 "DisConnectNty": 11,
75 75 "RoleUpdatePropertyNty": 12,
76 76 "RoleUpdateItemsNty": 13,
... ... @@ -113,17 +113,17 @@ var file_protocode_proto_rawDesc = []byte{
113 113 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e,
114 114 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x72, 0x74,
115 115 0x52, 0x70, 0x63, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x70,
116   - 0x63, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x70, 0x63,
117   - 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d,
118   - 0x52, 0x70, 0x63, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75,
119   - 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x70, 0x63, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11,
120   - 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x70,
121   - 0x63, 0x10, 0x06, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
122   - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x10, 0x07, 0x12, 0x14, 0x0a, 0x10, 0x52,
  116 + 0x63, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
  117 + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x52,
123 118 0x6f, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x10,
124   - 0x08, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x65,
125   - 0x6c, 0x52, 0x70, 0x63, 0x10, 0x09, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70,
126   - 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x70, 0x63, 0x10, 0x0a, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x69,
  119 + 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x4c, 0x65, 0x76, 0x65, 0x6c,
  120 + 0x52, 0x70, 0x63, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
  121 + 0x70, 0x63, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x65,
  122 + 0x61, 0x6d, 0x52, 0x70, 0x63, 0x10, 0x07, 0x12, 0x15, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x45,
  123 + 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x70, 0x63, 0x10, 0x08, 0x12, 0x15,
  124 + 0x0a, 0x11, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x73,
  125 + 0x52, 0x70, 0x63, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
  126 + 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x52, 0x70, 0x63, 0x10, 0x0a, 0x12, 0x11, 0x0a, 0x0d, 0x44, 0x69,
127 127 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4e, 0x74, 0x79, 0x10, 0x0b, 0x12, 0x19, 0x0a,
128 128 0x15, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65,
129 129 0x72, 0x74, 0x79, 0x4e, 0x74, 0x79, 0x10, 0x0c, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65,
... ...
tools/generator.py
  Show/Hide comments   View file @f8ce769
... ... @@ -61,6 +61,25 @@ def generatorProto(path):
61 61 continue
62 62 GoCodeData += GoProtoCodeLine.format(messageStr[:n1], messageStr[:n1])
63 63 GoCodeTestData += GoProtoCodeTestReqLine.format(messageStr[:n1], messageStr[:n1])
  64 + # rar
  65 + for line in lines:
  66 + if line.find("message") == -1:
  67 + continue
  68 + sline = line.split(' ')
  69 + if len(sline) < 2:
  70 + continue
  71 +
  72 + messageStr = sline[1].replace('\n', '').replace('{', "")
  73 + n2 = messageStr.find('Rar')
  74 + loginReq = messageStr.find('LoginReq')
  75 + if n2 != -1:
  76 + code += 1
  77 + ProtoCodeData += ProtoCodeLineReq.format(messageStr[:n2], code)
  78 + if loginReq != -1:
  79 + continue
  80 + GoCodeData += GoProtoCodeLine.format(messageStr[:n2], messageStr[:n2])
  81 + GoCodeTestData += GoProtoCodeTestReqLine.format(messageStr[:n2], messageStr[:n2])
  82 +
64 83 # nty
65 84 for line in lines:
66 85 if line.find("message") == -1:
... ... @@ -80,23 +99,7 @@ def generatorProto(path):
80 99 continue
81 100 GoCodeTestData += GoProtoCodeTestNtyLine.format(messageStr[:n3], messageStr[:n3])
82 101  
83   - # rsp 满足客户端需要
84   - # for line in lines:
85   - # if line.find("message") == -1:
86   - # continue
87   - # sline = line.split(' ')
88   - # if len(sline) < 2:
89   - # continue
90   - #
91   - # messageStr = sline[1].replace('\n', '').replace('{', "")
92   - # n2 = messageStr.find('Rsp')
93   - # loginReq = messageStr.find('LoginReq')
94   - # if n2 != -1:
95   - # code += 1
96   - # ProtoCodeData += ProtoCodeLineRsp.format(messageStr[:n2], code)
97   - # if loginReq != -1:
98   - # continue
99   - # GoCodeTestData += GoProtoCodeTestRspLine.format(messageStr[:n2], messageStr[:n2])
  102 +
100 103  
101 104  
102 105 # protocode.go
... ...