com.unity.netcode.gameobjects@1.0.0-pre.10
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). ## [1.0.0-pre.10] - 2022-06-21 ### Added - Added a new `OnTransportFailure` callback to `NetworkManager`. This callback is invoked when the manager's `NetworkTransport` encounters an unrecoverable error. Transport failures also cause the `NetworkManager` to shut down. Currently, this is only used by `UnityTransport` to signal a timeout of its connection to the Unity Relay servers. (#1994) - Added `NetworkEvent.TransportFailure`, which can be used by implementations of `NetworkTransport` to signal to `NetworkManager` that an unrecoverable error was encountered. (#1994) - Added test to ensure a warning occurs when nesting NetworkObjects in a NetworkPrefab (#1969) - Added `NetworkManager.RemoveNetworkPrefab(...)` to remove a prefab from the prefabs list (#1950) ### Changed - Updated `UnityTransport` dependency on `com.unity.transport` to 1.1.0. (#2025) - (API Breaking) `ConnectionApprovalCallback` is no longer an `event` and will not allow more than 1 handler registered at a time. Also, `ConnectionApprovalCallback` is now a `Func<>` taking `ConnectionApprovalRequest` in and returning `ConnectionApprovalResponse` back out (#1972) ### Removed ### Fixed - Fixed issue where dynamically spawned `NetworkObject`s could throw an exception if the scene of origin handle was zero (0) and the `NetworkObject` was already spawned. (#2017) - Fixed issue where `NetworkObject.Observers` was not being cleared when despawned. (#2009) - Fixed `NetworkAnimator` could not run in the server authoritative mode. (#2003) - Fixed issue where late joining clients would get a soft synchronization error if any in-scene placed NetworkObjects were parented under another `NetworkObject`. (#1985) - Fixed issue where `NetworkBehaviourReference` would throw a type cast exception if using `NetworkBehaviourReference.TryGet` and the component type was not found. (#1984) - Fixed `NetworkSceneManager` was not sending scene event notifications for the currently active scene and any additively loaded scenes when loading a new scene in `LoadSceneMode.Single` mode. (#1975) - Fixed issue where one or more clients disconnecting during a scene event would cause `LoadEventCompleted` or `UnloadEventCompleted` to wait until the `NetworkConfig.LoadSceneTimeOut` period before being triggered. (#1973) - Fixed issues when multiple `ConnectionApprovalCallback`s were registered (#1972) - Fixed a regression in serialization support: `FixedString`, `Vector2Int`, and `Vector3Int` types can now be used in NetworkVariables and RPCs again without requiring a `ForceNetworkSerializeByMemcpy<>` wrapper. (#1961) - Fixed generic types that inherit from NetworkBehaviour causing crashes at compile time. (#1976) - Fixed endless dialog boxes when adding a `NetworkBehaviour` to a `NetworkManager` or vice-versa. (#1947) - Fixed `NetworkAnimator` issue where it was only synchronizing parameters if the layer or state changed or was transitioning between states. (#1946) - Fixed `NetworkAnimator` issue where when it did detect a parameter had changed it would send all parameters as opposed to only the parameters that changed. (#1946) - Fixed `NetworkAnimator` issue where it was not always disposing the `NativeArray` that is allocated when spawned. (#1946) - Fixed `NetworkAnimator` issue where it was not taking the animation speed or state speed multiplier into consideration. (#1946) - Fixed `NetworkAnimator` issue where it was not properly synchronizing late joining clients if they joined while `Animator` was transitioning between states. (#1946) - Fixed `NetworkAnimator` issue where the server was not relaying changes to non-owner clients when a client was the owner. (#1946) - Fixed issue where the `PacketLoss` metric for tools would return the packet loss over a connection lifetime instead of a single frame. (#2004)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
@@ -8,13 +8,46 @@ using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
public class NetworkShowHideTest : NetworkBehaviour
|
||||
public class NetworkShowHideTestComponent : NetworkBehaviour
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public class ShowHideObject : NetworkBehaviour
|
||||
{
|
||||
public static List<ShowHideObject> ClientTargetedNetworkObjects = new List<ShowHideObject>();
|
||||
public static ulong ClientIdToTarget;
|
||||
|
||||
public static NetworkObject GetNetworkObjectById(ulong networkObjectId)
|
||||
{
|
||||
foreach (var entry in ClientTargetedNetworkObjects)
|
||||
{
|
||||
if (entry.NetworkObjectId == networkObjectId)
|
||||
{
|
||||
return entry.NetworkObject;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public override void OnNetworkSpawn()
|
||||
{
|
||||
if (NetworkManager.LocalClientId == ClientIdToTarget)
|
||||
{
|
||||
ClientTargetedNetworkObjects.Add(this);
|
||||
}
|
||||
base.OnNetworkSpawn();
|
||||
}
|
||||
|
||||
public override void OnNetworkDespawn()
|
||||
{
|
||||
if (ClientTargetedNetworkObjects.Contains(this))
|
||||
{
|
||||
ClientTargetedNetworkObjects.Remove(this);
|
||||
}
|
||||
base.OnNetworkDespawn();
|
||||
}
|
||||
|
||||
public NetworkVariable<int> MyNetworkVariable;
|
||||
|
||||
private void Start()
|
||||
@@ -27,7 +60,6 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
Debug.Log($"Value changed from {before} to {after}");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class NetworkShowHideTests : NetcodeIntegrationTest
|
||||
@@ -46,30 +78,17 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
protected override void OnCreatePlayerPrefab()
|
||||
{
|
||||
var networkTransform = m_PlayerPrefab.AddComponent<NetworkShowHideTest>();
|
||||
var networkTransform = m_PlayerPrefab.AddComponent<NetworkShowHideTestComponent>();
|
||||
}
|
||||
|
||||
protected override void OnServerAndClientsCreated()
|
||||
{
|
||||
m_PrefabToSpawn = PreparePrefab(typeof(ShowHideObject));
|
||||
}
|
||||
|
||||
public GameObject PreparePrefab(Type type)
|
||||
{
|
||||
var prefabToSpawn = new GameObject();
|
||||
prefabToSpawn.AddComponent(type);
|
||||
var networkObjectPrefab = prefabToSpawn.AddComponent<NetworkObject>();
|
||||
NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObjectPrefab);
|
||||
m_ServerNetworkManager.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab() { Prefab = prefabToSpawn });
|
||||
foreach (var clientNetworkManager in m_ClientNetworkManagers)
|
||||
{
|
||||
clientNetworkManager.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab() { Prefab = prefabToSpawn });
|
||||
}
|
||||
return prefabToSpawn;
|
||||
m_PrefabToSpawn = CreateNetworkObjectPrefab("ShowHideObject");
|
||||
m_PrefabToSpawn.AddComponent<ShowHideObject>();
|
||||
}
|
||||
|
||||
// Check that the first client see them, or not, as expected
|
||||
private IEnumerator CheckVisible(bool target)
|
||||
private IEnumerator CheckVisible(bool isVisible)
|
||||
{
|
||||
int count = 0;
|
||||
do
|
||||
@@ -83,21 +102,31 @@ namespace Unity.Netcode.RuntimeTests
|
||||
Assert.Fail("timeout waiting for object to reach the expect visibility");
|
||||
break;
|
||||
}
|
||||
} while (m_NetSpawnedObject1.IsNetworkVisibleTo(m_ClientId0) != target ||
|
||||
m_NetSpawnedObject2.IsNetworkVisibleTo(m_ClientId0) != target ||
|
||||
m_NetSpawnedObject3.IsNetworkVisibleTo(m_ClientId0) != target ||
|
||||
m_Object1OnClient0.IsSpawned != target ||
|
||||
m_Object2OnClient0.IsSpawned != target ||
|
||||
m_Object3OnClient0.IsSpawned != target
|
||||
} while (m_NetSpawnedObject1.IsNetworkVisibleTo(m_ClientId0) != isVisible ||
|
||||
m_NetSpawnedObject2.IsNetworkVisibleTo(m_ClientId0) != isVisible ||
|
||||
m_NetSpawnedObject3.IsNetworkVisibleTo(m_ClientId0) != isVisible ||
|
||||
m_Object1OnClient0.IsSpawned != isVisible ||
|
||||
m_Object2OnClient0.IsSpawned != isVisible ||
|
||||
m_Object3OnClient0.IsSpawned != isVisible
|
||||
);
|
||||
|
||||
Debug.Assert(m_NetSpawnedObject1.IsNetworkVisibleTo(m_ClientId0) == target);
|
||||
Debug.Assert(m_NetSpawnedObject2.IsNetworkVisibleTo(m_ClientId0) == target);
|
||||
Debug.Assert(m_NetSpawnedObject3.IsNetworkVisibleTo(m_ClientId0) == target);
|
||||
Debug.Assert(m_NetSpawnedObject1.IsNetworkVisibleTo(m_ClientId0) == isVisible);
|
||||
Debug.Assert(m_NetSpawnedObject2.IsNetworkVisibleTo(m_ClientId0) == isVisible);
|
||||
Debug.Assert(m_NetSpawnedObject3.IsNetworkVisibleTo(m_ClientId0) == isVisible);
|
||||
|
||||
Debug.Assert(m_Object1OnClient0.IsSpawned == target);
|
||||
Debug.Assert(m_Object2OnClient0.IsSpawned == target);
|
||||
Debug.Assert(m_Object3OnClient0.IsSpawned == target);
|
||||
Debug.Assert(m_Object1OnClient0.IsSpawned == isVisible);
|
||||
Debug.Assert(m_Object2OnClient0.IsSpawned == isVisible);
|
||||
Debug.Assert(m_Object3OnClient0.IsSpawned == isVisible);
|
||||
|
||||
var clientNetworkManager = m_ClientNetworkManagers.Where((c) => c.LocalClientId == m_ClientId0).First();
|
||||
if (isVisible)
|
||||
{
|
||||
Assert.True(ShowHideObject.ClientTargetedNetworkObjects.Count == 3, $"Client-{clientNetworkManager.LocalClientId} should have 3 instances visible but only has {ShowHideObject.ClientTargetedNetworkObjects.Count}!");
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.True(ShowHideObject.ClientTargetedNetworkObjects.Count == 0, $"Client-{clientNetworkManager.LocalClientId} should have no visible instances but still has {ShowHideObject.ClientTargetedNetworkObjects.Count}!");
|
||||
}
|
||||
}
|
||||
|
||||
// Set the 3 objects visibility
|
||||
@@ -136,30 +165,19 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerator RefreshNetworkObjects()
|
||||
private bool RefreshNetworkObjects()
|
||||
{
|
||||
var serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(
|
||||
x => x.NetworkObjectId == m_NetSpawnedObject1.NetworkObjectId && x.IsSpawned,
|
||||
m_ClientNetworkManagers[0],
|
||||
serverClientPlayerResult);
|
||||
m_Object1OnClient0 = serverClientPlayerResult.Result;
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(
|
||||
x => x.NetworkObjectId == m_NetSpawnedObject2.NetworkObjectId && x.IsSpawned,
|
||||
m_ClientNetworkManagers[0],
|
||||
serverClientPlayerResult);
|
||||
m_Object2OnClient0 = serverClientPlayerResult.Result;
|
||||
serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(
|
||||
x => x.NetworkObjectId == m_NetSpawnedObject3.NetworkObjectId && x.IsSpawned,
|
||||
m_ClientNetworkManagers[0],
|
||||
serverClientPlayerResult);
|
||||
m_Object3OnClient0 = serverClientPlayerResult.Result;
|
||||
|
||||
// make sure the objects are set with the right network manager
|
||||
m_Object1OnClient0.NetworkManagerOwner = m_ClientNetworkManagers[0];
|
||||
m_Object2OnClient0.NetworkManagerOwner = m_ClientNetworkManagers[0];
|
||||
m_Object3OnClient0.NetworkManagerOwner = m_ClientNetworkManagers[0];
|
||||
m_Object1OnClient0 = ShowHideObject.GetNetworkObjectById(m_NetSpawnedObject1.NetworkObjectId);
|
||||
m_Object2OnClient0 = ShowHideObject.GetNetworkObjectById(m_NetSpawnedObject2.NetworkObjectId);
|
||||
m_Object3OnClient0 = ShowHideObject.GetNetworkObjectById(m_NetSpawnedObject3.NetworkObjectId);
|
||||
if (m_Object1OnClient0 == null || m_Object2OnClient0 == null || m_Object3OnClient0 == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
Assert.True(m_Object1OnClient0.NetworkManagerOwner == m_ClientNetworkManagers[0]);
|
||||
Assert.True(m_Object2OnClient0.NetworkManagerOwner == m_ClientNetworkManagers[0]);
|
||||
Assert.True(m_Object3OnClient0.NetworkManagerOwner == m_ClientNetworkManagers[0]);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -167,28 +185,23 @@ namespace Unity.Netcode.RuntimeTests
|
||||
public IEnumerator NetworkShowHideTest()
|
||||
{
|
||||
m_ClientId0 = m_ClientNetworkManagers[0].LocalClientId;
|
||||
ShowHideObject.ClientTargetedNetworkObjects.Clear();
|
||||
ShowHideObject.ClientIdToTarget = m_ClientId0;
|
||||
|
||||
|
||||
// create 3 objects
|
||||
|
||||
|
||||
var spawnedObject1 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
|
||||
var spawnedObject2 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
|
||||
var spawnedObject3 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
|
||||
var spawnedObject1 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
|
||||
var spawnedObject2 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
|
||||
var spawnedObject3 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
|
||||
m_NetSpawnedObject1 = spawnedObject1.GetComponent<NetworkObject>();
|
||||
m_NetSpawnedObject2 = spawnedObject2.GetComponent<NetworkObject>();
|
||||
m_NetSpawnedObject3 = spawnedObject3.GetComponent<NetworkObject>();
|
||||
m_NetSpawnedObject1.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
m_NetSpawnedObject2.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
m_NetSpawnedObject3.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
m_NetSpawnedObject1.Spawn();
|
||||
m_NetSpawnedObject2.Spawn();
|
||||
m_NetSpawnedObject3.Spawn();
|
||||
|
||||
|
||||
for (int mode = 0; mode < 2; mode++)
|
||||
{
|
||||
// get the NetworkObject on a client instance
|
||||
yield return RefreshNetworkObjects();
|
||||
yield return WaitForConditionOrTimeOut(RefreshNetworkObjects);
|
||||
AssertOnTimeout($"Could not refresh all NetworkObjects!");
|
||||
|
||||
// check object start visible
|
||||
yield return CheckVisible(true);
|
||||
@@ -207,7 +220,8 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
// show them to that client
|
||||
Show(mode == 0, true);
|
||||
yield return RefreshNetworkObjects();
|
||||
yield return WaitForConditionOrTimeOut(RefreshNetworkObjects);
|
||||
AssertOnTimeout($"Could not refresh all NetworkObjects!");
|
||||
|
||||
// verify they become visible
|
||||
yield return CheckVisible(true);
|
||||
@@ -218,24 +232,21 @@ namespace Unity.Netcode.RuntimeTests
|
||||
public IEnumerator NetworkShowHideQuickTest()
|
||||
{
|
||||
m_ClientId0 = m_ClientNetworkManagers[0].LocalClientId;
|
||||
ShowHideObject.ClientTargetedNetworkObjects.Clear();
|
||||
ShowHideObject.ClientIdToTarget = m_ClientId0;
|
||||
|
||||
var spawnedObject1 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
|
||||
var spawnedObject2 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
|
||||
var spawnedObject3 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
|
||||
var spawnedObject1 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
|
||||
var spawnedObject2 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
|
||||
var spawnedObject3 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
|
||||
m_NetSpawnedObject1 = spawnedObject1.GetComponent<NetworkObject>();
|
||||
m_NetSpawnedObject2 = spawnedObject2.GetComponent<NetworkObject>();
|
||||
m_NetSpawnedObject3 = spawnedObject3.GetComponent<NetworkObject>();
|
||||
m_NetSpawnedObject1.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
m_NetSpawnedObject2.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
m_NetSpawnedObject3.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
m_NetSpawnedObject1.Spawn();
|
||||
m_NetSpawnedObject2.Spawn();
|
||||
m_NetSpawnedObject3.Spawn();
|
||||
|
||||
for (int mode = 0; mode < 2; mode++)
|
||||
{
|
||||
// get the NetworkObject on a client instance
|
||||
yield return RefreshNetworkObjects();
|
||||
yield return WaitForConditionOrTimeOut(RefreshNetworkObjects);
|
||||
AssertOnTimeout($"Could not refresh all NetworkObjects!");
|
||||
|
||||
// check object start visible
|
||||
yield return CheckVisible(true);
|
||||
@@ -245,7 +256,8 @@ namespace Unity.Netcode.RuntimeTests
|
||||
Show(mode == 0, true);
|
||||
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 5);
|
||||
yield return RefreshNetworkObjects();
|
||||
yield return WaitForConditionOrTimeOut(RefreshNetworkObjects);
|
||||
AssertOnTimeout($"Could not refresh all NetworkObjects!");
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 5);
|
||||
|
||||
// verify they become visible
|
||||
|
||||
Reference in New Issue
Block a user