Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw

2020-11-26 20:05:04 +08:00 · 2020-11-26 20:05:04 +08:00 · 41534fb286
parent 39cc08884d 5946da312a
commit 41534fb286
2 changed files with 5 additions and 0 deletions
--- a/protos/HeroInfoProto.proto
+++ b/protos/HeroInfoProto.proto
@ -134,6 +134,10 @@ import "CommonProto.proto";
 		optional bool isSendFinish =2; //是否发送完成
 	}

+	message GetAllPokemonRequest{
+		optional int32 start = 1;//从哪开始，每次20个
+	}
+	
 	message GetAllPokemonResponse{
 		repeated PokemonInfo pokemonInfo =1;
 		repeated TeamPokemonInfo teamPokemonInfos = 2; // 异妖编队
--- a/protos/PlayerInfoProto.proto
+++ b/protos/PlayerInfoProto.proto
@ -421,6 +421,7 @@ import "CommonProto.proto";
 	message UpdateBagIndication{
 		optional int32 type =1; //更新背包类型 0： 普通背包 1： 临时背包
 		repeated Item item =2;
+		optional int32 isMax = 3;//本次更新是否有物品超过了限制
 	}

 	message ModifyDecorationRequest{