com.unity.netcode.gameobjects@1.0.0-pre.6
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.6] - 2022-03-02 ### Added - NetworkAnimator now properly synchrhonizes all animation layers as well as runtime-adjusted weighting between them (#1765) - Added first set of tests for NetworkAnimator - parameter syncing, trigger set / reset, override network animator (#1735) ### Changed ### Fixed - Fixed an issue where sometimes the first client to connect to the server could see messages from the server as coming from itself. (#1683) - Fixed an issue where clients seemed to be able to send messages to ClientId 1, but these messages would actually still go to the server (id 0) instead of that client. (#1683) - Improved clarity of error messaging when a client attempts to send a message to a destination other than the server, which isn't allowed. (#1683) - Disallowed async keyword in RPCs (#1681) - Fixed an issue where Alpha release versions of Unity (version 2022.2.0a5 and later) will not compile due to the UNet Transport no longer existing (#1678) - Fixed messages larger than 64k being written with incorrectly truncated message size in header (#1686) (credit: @kaen) - Fixed overloading RPC methods causing collisions and failing on IL2CPP targets. (#1694) - Fixed spawn flow to propagate `IsSceneObject` down to children NetworkObjects, decouple implicit relationship between object spawning & `IsSceneObject` flag (#1685) - Fixed error when serializing ConnectionApprovalMessage with scene management disabled when one or more objects is hidden via the CheckObjectVisibility delegate (#1720) - Fixed CheckObjectVisibility delegate not being properly invoked for connecting clients when Scene Management is enabled. (#1680) - Fixed NetworkList to properly call INetworkSerializable's NetworkSerialize() method (#1682) - Fixed NetworkVariables containing more than 1300 bytes of data (such as large NetworkLists) no longer cause an OverflowException (the limit on data size is now whatever limit the chosen transport imposes on fragmented NetworkDelivery mechanisms) (#1725) - Fixed ServerRpcParams and ClientRpcParams must be the last parameter of an RPC in order to function properly. Added a compile-time check to ensure this is the case and trigger an error if they're placed elsewhere (#1721) - Fixed FastBufferReader being created with a length of 1 if provided an input of length 0 (#1724) - Fixed The NetworkConfig's checksum hash includes the NetworkTick so that clients with a different tickrate than the server are identified and not allowed to connect (#1728) - Fixed OwnedObjects not being properly modified when using ChangeOwnership (#1731) - Improved performance in NetworkAnimator (#1735) - Removed the "always sync" network animator (aka "autosend") parameters (#1746)
This commit is contained in:
@@ -2,6 +2,7 @@ using System.Collections;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
using Object = UnityEngine.Object;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
@@ -12,18 +13,9 @@ namespace Unity.Netcode.RuntimeTests
|
||||
/// - Server destroy spawned => Object gets destroyed and despawned/destroyed on all clients. Server does not run <see cref="NetworkPrefaInstanceHandler.HandleNetworkPrefabDestroy"/>. Client runs it.
|
||||
/// - Client destroy spawned => throw exception.
|
||||
/// </summary>
|
||||
public class NetworkObjectDestroyTests : BaseMultiInstanceTest
|
||||
public class NetworkObjectDestroyTests : NetcodeIntegrationTest
|
||||
{
|
||||
protected override int NbClients => 1;
|
||||
|
||||
[UnitySetUp]
|
||||
public override IEnumerator Setup()
|
||||
{
|
||||
yield return StartSomeClientsAndServerWithPlayers(true, NbClients, playerPrefab =>
|
||||
{
|
||||
// playerPrefab.AddComponent<TestDestroy>();
|
||||
});
|
||||
}
|
||||
protected override int NumberOfClients => 1;
|
||||
|
||||
/// <summary>
|
||||
/// Tests that a server can destroy a NetworkObject and that it gets despawned correctly.
|
||||
@@ -33,12 +25,12 @@ namespace Unity.Netcode.RuntimeTests
|
||||
public IEnumerator TestNetworkObjectServerDestroy()
|
||||
{
|
||||
// This is the *SERVER VERSION* of the *CLIENT PLAYER*
|
||||
var serverClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ServerNetworkManager, serverClientPlayerResult));
|
||||
var serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, m_ServerNetworkManager, serverClientPlayerResult);
|
||||
|
||||
// This is the *CLIENT VERSION* of the *CLIENT PLAYER*
|
||||
var clientClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ClientNetworkManagers[0], clientClientPlayerResult));
|
||||
var clientClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, m_ClientNetworkManagers[0], clientClientPlayerResult);
|
||||
|
||||
Assert.IsNotNull(serverClientPlayerResult.Result.gameObject);
|
||||
Assert.IsNotNull(clientClientPlayerResult.Result.gameObject);
|
||||
@@ -46,12 +38,9 @@ namespace Unity.Netcode.RuntimeTests
|
||||
// destroy the server player
|
||||
Object.Destroy(serverClientPlayerResult.Result.gameObject);
|
||||
|
||||
yield return null;
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForMessageOfType<DestroyObjectMessage>(m_ClientNetworkManagers[0]);
|
||||
|
||||
Assert.IsTrue(serverClientPlayerResult.Result == null); // Assert.IsNull doesn't work here
|
||||
|
||||
yield return null; // wait one frame more until we receive on client
|
||||
|
||||
Assert.IsTrue(clientClientPlayerResult.Result == null);
|
||||
|
||||
// create an unspawned networkobject and destroy it
|
||||
@@ -71,12 +60,12 @@ namespace Unity.Netcode.RuntimeTests
|
||||
public IEnumerator TestNetworkObjectClientDestroy()
|
||||
{
|
||||
// This is the *SERVER VERSION* of the *CLIENT PLAYER*
|
||||
var serverClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ServerNetworkManager, serverClientPlayerResult));
|
||||
var serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, m_ServerNetworkManager, serverClientPlayerResult);
|
||||
|
||||
// This is the *CLIENT VERSION* of the *CLIENT PLAYER*
|
||||
var clientClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ClientNetworkManagers[0], clientClientPlayerResult));
|
||||
var clientClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, m_ClientNetworkManagers[0], clientClientPlayerResult);
|
||||
|
||||
// destroy the client player, this is not allowed
|
||||
LogAssert.Expect(LogType.Exception, "NotServerException: Destroy a spawned NetworkObject on a non-host client is not valid. Call Destroy or Despawn on the server/host instead.");
|
||||
|
||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
using Object = UnityEngine.Object;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
@@ -13,13 +14,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
public IEnumerator DontDestroyWithOwnerTest()
|
||||
{
|
||||
// create server and client instances
|
||||
MultiInstanceHelpers.Create(1, out NetworkManager server, out NetworkManager[] clients);
|
||||
NetcodeIntegrationTestHelpers.Create(1, out NetworkManager server, out NetworkManager[] clients);
|
||||
|
||||
// create prefab
|
||||
var gameObject = new GameObject("ClientOwnedObject");
|
||||
var networkObject = gameObject.AddComponent<NetworkObject>();
|
||||
networkObject.DontDestroyWithOwner = true;
|
||||
MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObject);
|
||||
NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
|
||||
|
||||
server.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab()
|
||||
{
|
||||
@@ -35,13 +36,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
// start server and connect clients
|
||||
MultiInstanceHelpers.Start(false, server, clients);
|
||||
NetcodeIntegrationTestHelpers.Start(false, server, clients);
|
||||
|
||||
// wait for connection on client side
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientsConnected(clients));
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForClientsConnected(clients);
|
||||
|
||||
// wait for connection on server side
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientConnectedToServer(server));
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForClientConnectedToServer(server);
|
||||
|
||||
// network objects
|
||||
var networkObjects = new List<NetworkObject>();
|
||||
@@ -56,13 +57,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
// wait for object spawn on client
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForCondition(() => clients[0].SpawnManager.SpawnedObjects.Count == 32));
|
||||
yield return NetcodeIntegrationTest.WaitForConditionOrTimeOut(() => clients[0].SpawnManager.SpawnedObjects.Count == 32);
|
||||
|
||||
// disconnect the client that owns all the clients
|
||||
MultiInstanceHelpers.StopOneClient(clients[0]);
|
||||
NetcodeIntegrationTestHelpers.StopOneClient(clients[0]);
|
||||
|
||||
// wait for disconnect
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForCondition(() => server.ConnectedClients.Count == 0));
|
||||
yield return NetcodeIntegrationTest.WaitForConditionOrTimeOut(() => server.ConnectedClients.Count == 0);
|
||||
|
||||
for (int i = 0; i < networkObjects.Count; i++)
|
||||
{
|
||||
@@ -71,7 +72,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
// cleanup
|
||||
MultiInstanceHelpers.Destroy();
|
||||
NetcodeIntegrationTestHelpers.Destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
using System.Collections;
|
||||
using System.Linq;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
public class NetworkObjectNetworkClientOwnedObjectsTests : NetcodeIntegrationTest
|
||||
{
|
||||
protected override int NumberOfClients => 1;
|
||||
private NetworkPrefab m_NetworkPrefab;
|
||||
protected override void OnServerAndClientsCreated()
|
||||
{
|
||||
// create prefab
|
||||
var gameObject = new GameObject("ClientOwnedObject");
|
||||
var networkObject = gameObject.AddComponent<NetworkObject>();
|
||||
NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
|
||||
|
||||
m_NetworkPrefab = (new NetworkPrefab()
|
||||
{
|
||||
Prefab = gameObject
|
||||
});
|
||||
|
||||
m_ServerNetworkManager.NetworkConfig.NetworkPrefabs.Add(m_NetworkPrefab);
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
client.NetworkConfig.NetworkPrefabs.Add(m_NetworkPrefab);
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator ChangeOwnershipOwnedObjectsAddTest()
|
||||
{
|
||||
NetworkObject serverObject = Object.Instantiate(m_NetworkPrefab.Prefab).GetComponent<NetworkObject>();
|
||||
serverObject.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.Spawn();
|
||||
|
||||
// Provide enough time for the client to receive and process the spawned message.
|
||||
yield return s_DefaultWaitForTick;
|
||||
|
||||
// The object is owned by server
|
||||
Assert.False(m_ServerNetworkManager.ConnectedClients[m_ClientNetworkManagers[0].LocalClientId].OwnedObjects.Any(x => x.NetworkObjectId == serverObject.NetworkObjectId));
|
||||
|
||||
// Change the ownership
|
||||
serverObject.ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
// Provide enough time for the client to receive and process the change in ownership message.
|
||||
yield return s_DefaultWaitForTick;
|
||||
|
||||
// Ensure it's now added to the list
|
||||
Assert.True(m_ServerNetworkManager.ConnectedClients[m_ClientNetworkManagers[0].LocalClientId].OwnedObjects.Any(x => x.NetworkObjectId == serverObject.NetworkObjectId));
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 067d53283c8fa4c31b638b830473c5b7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -2,6 +2,7 @@ using System.Collections;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
@@ -37,14 +38,14 @@ namespace Unity.Netcode.RuntimeTests
|
||||
[UnitySetUp]
|
||||
public IEnumerator Setup()
|
||||
{
|
||||
Assert.IsTrue(MultiInstanceHelpers.Create(1, out m_ServerHost, out m_Clients));
|
||||
Assert.IsTrue(NetcodeIntegrationTestHelpers.Create(1, out m_ServerHost, out m_Clients));
|
||||
|
||||
m_ObjectToSpawn = new GameObject();
|
||||
m_NetworkObject = m_ObjectToSpawn.AddComponent<NetworkObject>();
|
||||
m_ObjectToSpawn.AddComponent<OnNetworkDespawnTestComponent>();
|
||||
|
||||
// Make it a prefab
|
||||
MultiInstanceHelpers.MakeNetworkObjectTestPrefab(m_NetworkObject);
|
||||
NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(m_NetworkObject);
|
||||
|
||||
var networkPrefab = new NetworkPrefab();
|
||||
networkPrefab.Prefab = m_ObjectToSpawn;
|
||||
@@ -67,7 +68,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
Object.Destroy(m_ObjectToSpawn);
|
||||
m_ObjectToSpawn = null;
|
||||
}
|
||||
MultiInstanceHelpers.Destroy();
|
||||
NetcodeIntegrationTestHelpers.Destroy();
|
||||
yield return null;
|
||||
}
|
||||
|
||||
@@ -85,22 +86,22 @@ namespace Unity.Netcode.RuntimeTests
|
||||
[UnityTest]
|
||||
public IEnumerator TestNetworkObjectDespawnOnShutdown([Values(InstanceType.Server, InstanceType.Host, InstanceType.Client)] InstanceType despawnCheck)
|
||||
{
|
||||
var useHost = despawnCheck == InstanceType.Server ? false : true;
|
||||
var useHost = despawnCheck != InstanceType.Server;
|
||||
var networkManager = despawnCheck == InstanceType.Host || despawnCheck == InstanceType.Server ? m_ServerHost : m_Clients[0];
|
||||
|
||||
// Start the instances
|
||||
if (!MultiInstanceHelpers.Start(useHost, m_ServerHost, m_Clients))
|
||||
if (!NetcodeIntegrationTestHelpers.Start(useHost, m_ServerHost, m_Clients))
|
||||
{
|
||||
Debug.LogError("Failed to start instances");
|
||||
Assert.Fail("Failed to start instances");
|
||||
}
|
||||
|
||||
// [Client-Side] Wait for a connection to the server
|
||||
yield return MultiInstanceHelpers.WaitForClientsConnected(m_Clients, null, 512);
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForClientsConnected(m_Clients, null, 512);
|
||||
|
||||
// [Host-Server-Side] Check to make sure all clients are connected
|
||||
var clientCount = useHost ? m_Clients.Length + 1 : m_Clients.Length;
|
||||
yield return MultiInstanceHelpers.WaitForClientsConnectedToServer(m_ServerHost, clientCount, null, 512);
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForClientsConnectedToServer(m_ServerHost, clientCount, null, 512);
|
||||
|
||||
// Spawn the test object
|
||||
var spawnedObject = Object.Instantiate(m_NetworkObject);
|
||||
@@ -109,8 +110,8 @@ namespace Unity.Netcode.RuntimeTests
|
||||
spawnedNetworkObject.Spawn(true);
|
||||
|
||||
// Get the spawned object relative to which NetworkManager instance we are testing.
|
||||
var relativeSpawnedObject = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.GetComponent<OnNetworkDespawnTestComponent>() != null), networkManager, relativeSpawnedObject));
|
||||
var relativeSpawnedObject = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
|
||||
yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.GetComponent<OnNetworkDespawnTestComponent>() != null), networkManager, relativeSpawnedObject);
|
||||
var onNetworkDespawnTestComponent = relativeSpawnedObject.Result.GetComponent<OnNetworkDespawnTestComponent>();
|
||||
|
||||
// Confirm it is not set before shutting down the NetworkManager
|
||||
|
||||
@@ -3,22 +3,21 @@ using System.Collections.Generic;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
public class NetworkObjectOnSpawnTests : BaseMultiInstanceTest
|
||||
public class NetworkObjectOnSpawnTests : NetcodeIntegrationTest
|
||||
{
|
||||
private GameObject m_TestNetworkObjectPrefab;
|
||||
private GameObject m_TestNetworkObjectInstance;
|
||||
|
||||
protected override int NbClients => 2;
|
||||
|
||||
protected override int NumberOfClients => 2;
|
||||
|
||||
/// <summary>
|
||||
/// Tests that instantiating a <see cref="NetworkObject"/> and destroying without spawning it
|
||||
/// does not run <see cref="NetworkBehaviour.OnNetworkSpawn"/> or <see cref="NetworkBehaviour.OnNetworkSpawn"/>.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[UnityTest]
|
||||
public IEnumerator InstantiateDestroySpawnNotCalled()
|
||||
{
|
||||
@@ -29,6 +28,8 @@ namespace Unity.Netcode.RuntimeTests
|
||||
// instantiate
|
||||
m_TestNetworkObjectInstance = Object.Instantiate(m_TestNetworkObjectPrefab);
|
||||
yield return null;
|
||||
Object.Destroy(m_TestNetworkObjectInstance);
|
||||
|
||||
}
|
||||
|
||||
private class FailWhenSpawned : NetworkBehaviour
|
||||
@@ -44,20 +45,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnitySetUp]
|
||||
public override IEnumerator Setup()
|
||||
protected override void OnCreatePlayerPrefab()
|
||||
{
|
||||
yield return StartSomeClientsAndServerWithPlayers(true, NbClients, playerPrefab =>
|
||||
{
|
||||
// add test component
|
||||
playerPrefab.AddComponent<TrackOnSpawnFunctions>();
|
||||
});
|
||||
m_PlayerPrefab.AddComponent<TrackOnSpawnFunctions>();
|
||||
}
|
||||
|
||||
[UnityTearDown]
|
||||
public override IEnumerator Teardown()
|
||||
protected override IEnumerator OnTearDown()
|
||||
{
|
||||
|
||||
if (m_TestNetworkObjectPrefab != null)
|
||||
{
|
||||
Object.Destroy(m_TestNetworkObjectPrefab);
|
||||
@@ -67,10 +61,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
Object.Destroy(m_TestNetworkObjectInstance);
|
||||
}
|
||||
yield return base.Teardown();
|
||||
|
||||
yield return base.OnTearDown();
|
||||
}
|
||||
|
||||
private List<TrackOnSpawnFunctions> m_ClientTrackOnSpawnInstances = new List<TrackOnSpawnFunctions>();
|
||||
|
||||
/// <summary>
|
||||
/// Test that callbacks are run for playerobject spawn, despawn, regular spawn, destroy on server.
|
||||
/// </summary>
|
||||
@@ -79,19 +74,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
public IEnumerator TestOnNetworkSpawnCallbacks()
|
||||
{
|
||||
// [Host-Side] Get the Host owned instance
|
||||
var serverClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ServerNetworkManager, serverClientPlayerResult));
|
||||
var serverInstance = m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId][m_ServerNetworkManager.LocalClientId].GetComponent<TrackOnSpawnFunctions>();
|
||||
|
||||
var serverInstance = serverClientPlayerResult.Result.GetComponent<TrackOnSpawnFunctions>();
|
||||
|
||||
var clientInstances = new List<TrackOnSpawnFunctions>();
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
var clientClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), client, clientClientPlayerResult));
|
||||
var clientRpcTests = clientClientPlayerResult.Result.GetComponent<TrackOnSpawnFunctions>();
|
||||
var clientRpcTests = m_PlayerNetworkObjects[client.LocalClientId][m_ServerNetworkManager.LocalClientId].gameObject.GetComponent<TrackOnSpawnFunctions>();
|
||||
Assert.IsNotNull(clientRpcTests);
|
||||
clientInstances.Add(clientRpcTests);
|
||||
m_ClientTrackOnSpawnInstances.Add(clientRpcTests);
|
||||
}
|
||||
|
||||
// -------------- step 1 check player spawn despawn
|
||||
@@ -99,69 +88,84 @@ namespace Unity.Netcode.RuntimeTests
|
||||
// check spawned on server
|
||||
Assert.AreEqual(1, serverInstance.OnNetworkSpawnCalledCount);
|
||||
|
||||
// safety check despawned
|
||||
// safety check server despawned
|
||||
Assert.AreEqual(0, serverInstance.OnNetworkDespawnCalledCount);
|
||||
|
||||
// check spawned on client
|
||||
foreach (var clientInstance in clientInstances)
|
||||
// Conditional check for clients spawning or despawning
|
||||
var checkSpawnCondition = false;
|
||||
var expectedSpawnCount = 1;
|
||||
var expectedDespawnCount = 0;
|
||||
bool HasConditionBeenMet()
|
||||
{
|
||||
Assert.AreEqual(1, clientInstance.OnNetworkSpawnCalledCount);
|
||||
|
||||
// safety check despawned
|
||||
Assert.AreEqual(0, clientInstance.OnNetworkDespawnCalledCount);
|
||||
var clientsCompleted = 0;
|
||||
// check spawned on client
|
||||
foreach (var clientInstance in m_ClientTrackOnSpawnInstances)
|
||||
{
|
||||
if (checkSpawnCondition)
|
||||
{
|
||||
if (clientInstance.OnNetworkSpawnCalledCount == expectedSpawnCount)
|
||||
{
|
||||
clientsCompleted++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (clientInstance.OnNetworkDespawnCalledCount == expectedDespawnCount)
|
||||
{
|
||||
clientsCompleted++;
|
||||
}
|
||||
}
|
||||
}
|
||||
return clientsCompleted >= NumberOfClients;
|
||||
}
|
||||
|
||||
// despawn on server. However, since we'll be using this object later in the test, don't delete it (false)
|
||||
// safety check that all clients have not been despawned yet
|
||||
Assert.True(HasConditionBeenMet(), "Failed condition that all clients not despawned yet!");
|
||||
|
||||
// now verify that all clients have been spawned
|
||||
checkSpawnCondition = true;
|
||||
yield return WaitForConditionOrTimeOut(HasConditionBeenMet);
|
||||
Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side spawns!");
|
||||
|
||||
// despawn on server. However, since we'll be using this object later in the test, don't delete it
|
||||
serverInstance.GetComponent<NetworkObject>().Despawn(false);
|
||||
|
||||
// check despawned on server
|
||||
Assert.AreEqual(1, serverInstance.OnNetworkDespawnCalledCount);
|
||||
// we now expect the clients to each have despawned once
|
||||
expectedDespawnCount = 1;
|
||||
|
||||
// wait long enough for player object to be despawned
|
||||
int nextFrameNumber = Time.frameCount + 2;
|
||||
yield return new WaitUntil(() => Time.frameCount >= nextFrameNumber);
|
||||
yield return s_DefaultWaitForTick;
|
||||
// verify that all client-side instances are despawned
|
||||
checkSpawnCondition = false;
|
||||
yield return WaitForConditionOrTimeOut(HasConditionBeenMet);
|
||||
|
||||
// check despawned on clients
|
||||
foreach (var clientInstance in clientInstances)
|
||||
{
|
||||
Assert.AreEqual(1, clientInstance.OnNetworkDespawnCalledCount);
|
||||
}
|
||||
|
||||
//----------- step 2 check spawn again and destroy
|
||||
Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side despawns!");
|
||||
|
||||
//----------- step 2 check spawn and destroy again
|
||||
serverInstance.GetComponent<NetworkObject>().Spawn();
|
||||
|
||||
// wait long enough for player object to be spawned
|
||||
nextFrameNumber = Time.frameCount + 2;
|
||||
yield return new WaitUntil(() => Time.frameCount >= nextFrameNumber);
|
||||
|
||||
// wait a tick
|
||||
yield return s_DefaultWaitForTick;
|
||||
// check spawned again on server this is 2 because we are reusing the object which was already spawned once.
|
||||
Assert.AreEqual(2, serverInstance.OnNetworkSpawnCalledCount);
|
||||
|
||||
// check spawned on client
|
||||
foreach (var clientInstance in clientInstances)
|
||||
{
|
||||
Assert.AreEqual(1, clientInstance.OnNetworkSpawnCalledCount);
|
||||
}
|
||||
checkSpawnCondition = true;
|
||||
yield return WaitForConditionOrTimeOut(HasConditionBeenMet);
|
||||
|
||||
Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side spawns! (2nd pass)");
|
||||
|
||||
// destroy the server object
|
||||
Object.Destroy(serverInstance.gameObject);
|
||||
|
||||
// wait one frame for destroy to kick in
|
||||
yield return null;
|
||||
yield return s_DefaultWaitForTick;
|
||||
|
||||
// check whether despawned was called again on server instance
|
||||
Assert.AreEqual(2, serverInstance.OnNetworkDespawnCalledCount);
|
||||
|
||||
// wait long enough for player object to be despawned on client
|
||||
nextFrameNumber = Time.frameCount + 2;
|
||||
yield return new WaitUntil(() => Time.frameCount >= nextFrameNumber);
|
||||
checkSpawnCondition = false;
|
||||
yield return WaitForConditionOrTimeOut(HasConditionBeenMet);
|
||||
|
||||
// check despawned on clients
|
||||
foreach (var clientInstance in clientInstances)
|
||||
{
|
||||
Assert.AreEqual(1, clientInstance.OnNetworkDespawnCalledCount);
|
||||
}
|
||||
Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side despawns! (2nd pass)");
|
||||
}
|
||||
|
||||
private class TrackOnSpawnFunctions : NetworkBehaviour
|
||||
|
||||
@@ -2,6 +2,7 @@ using System.Collections;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
@@ -52,7 +53,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
Assert.That(k_ClientInstanceCount, Is.GreaterThan(0));
|
||||
|
||||
// create NetworkManager instances
|
||||
Assert.That(MultiInstanceHelpers.Create(k_ClientInstanceCount, out m_ServerNetworkManager, out m_ClientNetworkManagers));
|
||||
Assert.That(NetcodeIntegrationTestHelpers.Create(k_ClientInstanceCount, out m_ServerNetworkManager, out m_ClientNetworkManagers));
|
||||
Assert.That(m_ServerNetworkManager, Is.Not.Null);
|
||||
Assert.That(m_ClientNetworkManagers, Is.Not.Null);
|
||||
Assert.That(m_ClientNetworkManagers.Length, Is.EqualTo(k_ClientInstanceCount));
|
||||
@@ -61,7 +62,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
m_DummyPrefab = new GameObject("DummyPrefabPrototype");
|
||||
m_DummyPrefab.AddComponent<NetworkObject>();
|
||||
m_DummyPrefab.AddComponent<NetworkObjectOwnershipComponent>();
|
||||
MultiInstanceHelpers.MakeNetworkObjectTestPrefab(m_DummyPrefab.GetComponent<NetworkObject>());
|
||||
NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(m_DummyPrefab.GetComponent<NetworkObject>());
|
||||
m_ServerNetworkManager.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab { Prefab = m_DummyPrefab });
|
||||
foreach (var clientNetworkManager in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -69,19 +70,19 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
// start server and client NetworkManager instances
|
||||
Assert.That(MultiInstanceHelpers.Start(m_IsHost, m_ServerNetworkManager, m_ClientNetworkManagers));
|
||||
Assert.That(NetcodeIntegrationTestHelpers.Start(m_IsHost, m_ServerNetworkManager, m_ClientNetworkManagers));
|
||||
|
||||
// wait for connection on client side
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientsConnected(m_ClientNetworkManagers));
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForClientsConnected(m_ClientNetworkManagers);
|
||||
|
||||
// wait for connection on server side
|
||||
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientConnectedToServer(m_ServerNetworkManager));
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForClientConnectedToServer(m_ServerNetworkManager);
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public void Teardown()
|
||||
{
|
||||
MultiInstanceHelpers.Destroy();
|
||||
NetcodeIntegrationTestHelpers.Destroy();
|
||||
|
||||
if (m_DummyGameObject != null)
|
||||
{
|
||||
@@ -106,8 +107,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
var dummyNetworkObjectId = dummyNetworkObject.NetworkObjectId;
|
||||
Assert.That(dummyNetworkObjectId, Is.GreaterThan(0));
|
||||
|
||||
int nextFrameNumber = Time.frameCount + 2;
|
||||
yield return new WaitUntil(() => Time.frameCount >= nextFrameNumber);
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForMessageOfType<CreateObjectMessage>(m_ClientNetworkManagers[0]);
|
||||
|
||||
Assert.That(m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(dummyNetworkObjectId));
|
||||
foreach (var clientNetworkManager in m_ClientNetworkManagers)
|
||||
@@ -136,17 +136,14 @@ namespace Unity.Netcode.RuntimeTests
|
||||
Assert.That(m_ServerNetworkManager.ConnectedClients.ContainsKey(m_ClientNetworkManagers[0].LocalClientId));
|
||||
serverObject.ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
nextFrameNumber = Time.frameCount + 2;
|
||||
yield return new WaitUntil(() => Time.frameCount >= nextFrameNumber);
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForMessageOfType<ChangeOwnershipMessage>(m_ClientNetworkManagers[0]);
|
||||
|
||||
|
||||
Assert.That(clientComponent.OnGainedOwnershipFired);
|
||||
Assert.That(clientComponent.CachedOwnerIdOnGainedOwnership, Is.EqualTo(m_ClientNetworkManagers[0].LocalClientId));
|
||||
serverObject.ChangeOwnership(m_ServerNetworkManager.ServerClientId);
|
||||
|
||||
nextFrameNumber = Time.frameCount + 2;
|
||||
yield return new WaitUntil(() => Time.frameCount >= nextFrameNumber);
|
||||
|
||||
yield return NetcodeIntegrationTestHelpers.WaitForMessageOfType<ChangeOwnershipMessage>(m_ClientNetworkManagers[0]);
|
||||
|
||||
Assert.That(serverObject.OwnerClientId, Is.EqualTo(m_ServerNetworkManager.LocalClientId));
|
||||
Assert.That(clientComponent.OnLostOwnershipFired);
|
||||
|
||||
@@ -3,6 +3,7 @@ using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using NUnit.Framework;
|
||||
using Unity.Collections;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
using System.Collections;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
public class NetworkObjectSpawnManyObjectsTests : NetcodeIntegrationTest
|
||||
{
|
||||
protected override int NumberOfClients => 1;
|
||||
// "many" in this case means enough to exceed a ushort_max message size written in the header
|
||||
// 1500 is not a magic number except that it's big enough to trigger a failure
|
||||
private const int k_SpawnedObjects = 1500;
|
||||
|
||||
private NetworkPrefab m_PrefabToSpawn;
|
||||
|
||||
// Using this component assures we will know precisely how many prefabs were spawned on the client
|
||||
public class SpawnObjecTrackingComponent : NetworkBehaviour
|
||||
{
|
||||
public static int SpawnedObjects;
|
||||
public override void OnNetworkSpawn()
|
||||
{
|
||||
if (!IsServer)
|
||||
{
|
||||
SpawnedObjects++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnServerAndClientsCreated()
|
||||
{
|
||||
SpawnObjecTrackingComponent.SpawnedObjects = 0;
|
||||
// create prefab
|
||||
var gameObject = new GameObject("TestObject");
|
||||
var networkObject = gameObject.AddComponent<NetworkObject>();
|
||||
NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
|
||||
gameObject.AddComponent<SpawnObjecTrackingComponent>();
|
||||
|
||||
m_PrefabToSpawn = new NetworkPrefab() { Prefab = gameObject };
|
||||
|
||||
m_ServerNetworkManager.NetworkConfig.NetworkPrefabs.Add(m_PrefabToSpawn);
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
client.NetworkConfig.NetworkPrefabs.Add(m_PrefabToSpawn);
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
// When this test fails it does so without an exception and will wait the default ~6 minutes
|
||||
[Timeout(10000)]
|
||||
public IEnumerator WhenManyObjectsAreSpawnedAtOnce_AllAreReceived()
|
||||
{
|
||||
for (int x = 0; x < k_SpawnedObjects; x++)
|
||||
{
|
||||
NetworkObject serverObject = Object.Instantiate(m_PrefabToSpawn.Prefab).GetComponent<NetworkObject>();
|
||||
serverObject.NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.Spawn();
|
||||
}
|
||||
// ensure all objects are replicated before spawning more
|
||||
yield return WaitForConditionOrTimeOut(() => SpawnObjecTrackingComponent.SpawnedObjects < k_SpawnedObjects);
|
||||
Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for the client to spawn {k_SpawnedObjects} objects!");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4e0439aa2d2a72e4aa42b051d26af366
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user