Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol

protos/MessageTypeProto.proto

@@ -456,6 +456,7 @@ enum MessageType{
 	MAP_OUT_INDICATION = 11235;
 
 // N 11300
+    NOTIFY_PAY_SUCCESS_INDICATION = 11300 ; // 通知前端充值成功
 // O 11400
 // P 11500
     POKEMON_COMONPENT_LEVELUP_REQUEST = 11500; //异妖相关 组件放置升级

protos/PlayerInfoProto.proto

@@ -458,9 +458,10 @@ import "CommonProto.proto";
 	message SignInResponse{
 		optional Drop drop  =1 ;
 	}
-	//获取第一编队信息
+	//获取编队信息
 	message GetPlayerOneTeamInfoRequest{
 		optional int32 playerId = 1;
+		optional int32 teamId = 2;
 	}
 	message GetPlayerOneTeamInfoResponse{
 		optional TeamOneInfo teamInfo = 1;
@@ -541,4 +542,8 @@ import "CommonProto.proto";
 	message ExchangeCdkRequest{
 		optional string key = 1;
 	}
+
+	message NotifyPaySuccessfulIndicaiton{
+		optional int32 goodsId =1 ;// 购买商品id
+	}