Commit d9a4f5a801c3aabcd3859644f1554e9a3f91fb7d
Merge branch 'master' of 120.26.43.151:zhangqijia/Pro2dProtoBuffers
# Conflicts: # account.proto
Showing
2 changed files
with
11 additions
and
8 deletions
Show diff stats
game.proto
protocode.proto
... | ... | @@ -8,14 +8,14 @@ enum ProtoCode |
8 | 8 | UNKNOWN = 0; |
9 | 9 | HeartRpc = 1; |
10 | 10 | LoginRpc = 2; |
11 | - CreateRpc = 3; | |
12 | - ChangeTeamRpc = 4; | |
13 | - HeroEquipReferRpc = 5; | |
14 | - RoleClearItemsRpc = 6; | |
15 | - RoleStartBattleRpc = 7; | |
16 | - RoleEndBattleRpc = 8; | |
17 | - EquipmentDelRpc = 9; | |
18 | - HeroUpLevelRpc = 10; | |
11 | + RoleStartBattleRpc = 3; | |
12 | + RoleEndBattleRpc = 4; | |
13 | + HeroUpLevelRpc = 5; | |
14 | + CreateRpc = 6; | |
15 | + ChangeTeamRpc = 7; | |
16 | + HeroEquipReferRpc = 8; | |
17 | + RoleClearItemsRpc = 9; | |
18 | + EquipmentDelRpc = 10; | |
19 | 19 | DisConnectNty = 11; |
20 | 20 | RoleUpdatePropertyNty = 12; |
21 | 21 | RoleUpdateItemsNty = 13; | ... | ... |