diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs index 6cbb7341fd..1ae167c0d7 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs @@ -315,6 +315,7 @@ public static bool Send(int hostId, int connectionId, int channelId, byte[] buff return UnityEngine.Networking.NetworkTransport.Send(hostId, s_RelayConnectionId, channelId, buffer, size, out error); } +#if !UNITY_WEBGL public static bool QueueMessageForSending(int hostId, int connectionId, int channelId, byte[] buffer, int size, out byte error) { if (!Enabled) @@ -350,6 +351,7 @@ public static bool SendQueuedMessages(int hostId, int connectionId, out byte err return UnityEngine.Networking.NetworkTransport.SendQueuedMessages(hostId, s_RelayConnectionId, out error); } +#endif public static NetworkEventType ReceiveFromHost(int hostId, out int connectionId, out int channelId, byte[] buffer, int bufferSize, out int receivedSize, out byte error) { diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs index ebfff7e243..b7fea06266 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs @@ -6,7 +6,7 @@ using MLAPI.Logging; using MLAPI.Profiling; using MLAPI.Transports.Tasks; -using UnityEngine.Assertions; +using UnityEngine; using UnityEngine.Networking; namespace MLAPI.Transports.UNET @@ -80,6 +80,9 @@ protected void LateUpdate() { if (UnityEngine.Networking.NetworkTransport.IsStarted && MessageSendMode == SendMode.Queued) { +#if UNITY_WEBGL + Debug.LogError("Cannot use queued sending mode for WebGL"); +#else if (NetworkManager.Singleton.IsServer) { for (int i = 0; i < NetworkManager.Singleton.ConnectedClientsList.Count; i++) @@ -91,6 +94,7 @@ protected void LateUpdate() { SendQueued(NetworkManager.Singleton.LocalClientId); } +#endif } } @@ -147,7 +151,11 @@ public override void Send(ulong clientId, ArraySegment data, NetworkChanne if (MessageSendMode == SendMode.Queued) { +#if UNITY_WEBGL + Debug.LogError("Cannot use queued sending mode for WebGL"); +#else RelayTransport.QueueMessageForSending(hostId, connectionId, channelId, buffer, data.Count, out byte error); +#endif } else { @@ -155,7 +163,7 @@ public override void Send(ulong clientId, ArraySegment data, NetworkChanne } } - +#if !UNITY_WEBGL public void SendQueued(ulong clientId) { if (ProfilerEnabled) @@ -167,13 +175,14 @@ public void SendQueued(ulong clientId) RelayTransport.SendQueuedMessages(hostId, connectionId, out byte error); } +#endif public override NetworkEvent PollEvent(out ulong clientId, out NetworkChannel networkChannel, out ArraySegment payload, out float receiveTime) { var eventType = RelayTransport.Receive(out int hostId, out int connectionId, out int channelId, m_MessageBuffer, m_MessageBuffer.Length, out int receivedSize, out byte error); clientId = GetMLAPIClientId((byte)hostId, (ushort)connectionId, false); - receiveTime = UnityEngine.Time.realtimeSinceStartup; + receiveTime = Time.realtimeSinceStartup; var networkError = (NetworkError)error; if (networkError == NetworkError.MessageToLong) diff --git a/testproject/Assets/Scripts.meta b/testproject/Assets/Scripts.meta deleted file mode 100644 index fbdac1c07d..0000000000 --- a/testproject/Assets/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d4cd8efbd22842fb88268393e9d06a2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: