diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index b15e582c09..419cea02e5 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -35,9 +35,7 @@ run_all_package_tests_{{ validation_editors.default }}: name: Run All Package Tests [{{ validation_editors.default }} only] dependencies: {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} - - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }} -{% endfor -%} + - .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_{{ platform.name }} {% endfor -%} # Runs all package tests on minimal supported editor @@ -71,9 +69,7 @@ run_all_project_tests_{{ validation_editors.default }}: {% for project in projects.all -%} {% if project.has_tests == "true" -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endif -%} {% endfor -%} @@ -97,9 +93,7 @@ run_all_projects_standards: dependencies: {% for platform in test_platforms.default -%} {% for project in projects.all -%} -{% for editor in validation_editors.default -%} - - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }} -{% endfor -%} + - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} @@ -123,9 +117,7 @@ run_all_webgl_builds_{{ validation_editors.default }}: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} @@ -161,10 +153,8 @@ run_all_project_tests_desktop_standalone_{{ validation_editors.default }}: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} {% for backend in scripting_backends -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} -{% endfor -%} + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} {% endfor -%} @@ -200,9 +190,7 @@ run_all_project_tests_mobile_standalone_{{ validation_editors.default }}: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} -{% for editor in validation_editors.default -%} - - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} @@ -236,9 +224,7 @@ run_all_project_tests_console_standalone_{{ validation_editors.default }}: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} -{% for editor in validation_editors.default -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }} {% endfor -%} {% endfor -%} diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 3437cf4050..7867fb2e5a 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -109,11 +109,6 @@ pr_code_changes_checks: cancel_old_ci: true - - - - - # Run all tests on {{ validation_editors.default }} (latest supported editor) on nightly basis. # Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds # Those tests are all running on {{ validation_editors.default }} (latest supported editor) since it's daily and running all of them would add a lot of overhead diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index 6bbf3271f3..3dfcb2b46e 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -45,9 +45,10 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: - dotnet format --version - unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor - - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project - - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check + - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues + - git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting) + - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes {% endfor -%} {% endfor -%} {% endfor -%} \ No newline at end of file diff --git a/.yamato/project.metafile b/.yamato/project.metafile index b271f1e6e3..dd69cb75d3 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -23,7 +23,7 @@ small_agent_platform: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.77.0 + image: package-ci/ubuntu-22.04:v4.81.0 flavor: b1.small @@ -38,13 +38,13 @@ test_platforms: default: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.77.0 + image: package-ci/ubuntu-22.04:v4.81.0 flavor: b1.large standalone: StandaloneLinux64 desktop: - name: ubuntu type: Unity::VM - image: package-ci/ubuntu-22.04:v4.77.0 + image: package-ci/ubuntu-22.04:v4.81.0 flavor: b1.large smaller_flavor: b1.medium standalone: StandaloneLinux64 diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 92c4737d9b..ffeb4924d0 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -11,7 +11,7 @@ }, "InternalOnly": false, "NeverPublish": false, - "MaxEditorVersion": "6000.2", + "MaxEditorVersion": "6000.0", "coverageEnabled": false, "coverageCommands": [ "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;" diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs index f8cfd8ee04..1a25c41b04 100644 --- a/Tools/CI/Settings/NGOSettings.cs +++ b/Tools/CI/Settings/NGOSettings.cs @@ -23,7 +23,7 @@ public class NGOSettings : AnnotatedSettingsBase new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true }, - MaximumEditorVersion = "6000.2", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions + MaximumEditorVersion = "6000.0", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions ValidationOptions = validationOptions } } diff --git a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs index 15918aa401..3869fe9ce4 100644 --- a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs @@ -533,11 +533,8 @@ static AnimationParamEnumWrapper() /// private void SpawnCleanup() { - if (m_NetworkAnimatorStateChangeHandler != null) - { - m_NetworkAnimatorStateChangeHandler.DeregisterUpdate(); - m_NetworkAnimatorStateChangeHandler = null; - } + m_NetworkAnimatorStateChangeHandler?.DeregisterUpdate(); + m_NetworkAnimatorStateChangeHandler = null; } public override void OnDestroy() diff --git a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs index 0e0405cef3..e87293925d 100644 --- a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs @@ -3385,6 +3385,6 @@ private static void DeregisterForTickUpdate(NetworkTransform networkTransform) internal interface INetworkTransformLogStateEntry { - void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false); + public void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false); } } diff --git a/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs b/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs index 8f431f422b..5f41150c5a 100644 --- a/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs +++ b/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs @@ -1,5 +1,6 @@ #pragma warning disable IDE0005 using Unity.Netcode.Components; +#pragma warning restore IDE0005 #if UNITY_UNET_PRESENT using Unity.Netcode.Transports.UNET; #endif diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 242b019ec2..82308337f8 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -608,8 +608,8 @@ internal T Value /// internal interface INetworkManagerHelper { - bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false); - void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false); + public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false); + public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false); } internal delegate void ResetNetworkManagerDelegate(NetworkManager manager); @@ -1255,11 +1255,8 @@ internal void ShutdownInternal() CustomMessagingManager = null; - if (MessageManager != null) - { - MessageManager.Dispose(); - MessageManager = null; - } + MessageManager?.Dispose(); + MessageManager = null; // We need to clean up NetworkObjects before we reset the IsServer // and IsClient properties. This provides consistency of these two diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs index 3b44715d68..bb91d72825 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs @@ -15,7 +15,7 @@ public interface INetworkUpdateSystem /// The update method that is being executed in the context of related . /// /// The that is being executed. - void NetworkUpdate(NetworkUpdateStage updateStage); + public void NetworkUpdate(NetworkUpdateStage updateStage); } /// diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs index 0a9ec917f3..bdd16f151b 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs @@ -17,20 +17,20 @@ internal enum TriggerType /// There is a one second maximum lifetime of triggers to avoid memory leaks. After one second has passed /// without the requested object ID being spawned, the triggers for it are automatically deleted. /// - void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context); + public void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context); /// /// Cleans up any trigger that's existed for more than a second. /// These triggers were probably for situations where a request was received after a despawn rather than before a spawn. /// - void CleanupStaleTriggers(); + public void CleanupStaleTriggers(); - void ProcessTriggers(TriggerType trigger, ulong key); + public void ProcessTriggers(TriggerType trigger, ulong key); /// /// Cleans up any trigger that's existed for more than a second. /// These triggers were probably for situations where a request was received after a despawn rather than before a spawn. /// - void CleanupAllTriggers(); + public void CleanupAllTriggers(); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs index 7543a11255..20789df764 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs @@ -15,7 +15,7 @@ internal interface INetworkHooks /// The destination clientId /// The message being sent /// - void OnBeforeSendMessage(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage; + public void OnBeforeSendMessage(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage; /// /// Called after an individual message is sent. @@ -24,7 +24,7 @@ internal interface INetworkHooks /// The message being sent /// /// Number of bytes in the message, not including the message header - void OnAfterSendMessage(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage; + public void OnAfterSendMessage(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage; /// /// Called before an individual message is received. @@ -32,7 +32,7 @@ internal interface INetworkHooks /// The source clientId /// The type of the message being sent /// Number of bytes in the message, not including the message header - void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); + public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); /// /// Called after an individual message is received. @@ -40,7 +40,7 @@ internal interface INetworkHooks /// The source clientId /// The type of the message being sent /// Number of bytes in the message, not including the message header - void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); + public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes); /// /// Called before a batch of messages is sent @@ -49,7 +49,7 @@ internal interface INetworkHooks /// Number of messages in the batch /// Number of bytes in the batch, including the batch header /// - void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); + public void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); /// /// Called after a batch of messages is sent @@ -58,7 +58,7 @@ internal interface INetworkHooks /// Number of messages in the batch /// Number of bytes in the batch, including the batch header /// - void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); + public void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery); /// /// Called before a batch of messages is received @@ -66,7 +66,7 @@ internal interface INetworkHooks /// The source clientId /// Number of messages in the batch /// Number of bytes in the batch, including the batch header - void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); + public void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); /// /// Called after a batch of messages is received @@ -74,7 +74,7 @@ internal interface INetworkHooks /// The source clientId /// Number of messages in the batch /// Number of bytes in the batch, including the batch header - void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); + public void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes); /// @@ -84,7 +84,7 @@ internal interface INetworkHooks /// The type of the message /// /// - bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery); + public bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery); /// /// Called before a message is received. If this returns false, the message will be discarded. @@ -94,7 +94,7 @@ internal interface INetworkHooks /// The FastBufferReader containing the message /// The NetworkContext the message is being processed in /// - bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context); + public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context); /// /// Called after a message is serialized, but before it's handled. @@ -103,7 +103,7 @@ internal interface INetworkHooks /// The message object /// The network context the message is being ahandled in /// - void OnBeforeHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; + public void OnBeforeHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; /// /// Called after a message is serialized and handled. @@ -112,6 +112,6 @@ internal interface INetworkHooks /// The message object /// The network context the message is being ahandled in /// - void OnAfterHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; + public void OnAfterHandleMessage(ref T message, ref NetworkContext context) where T : INetworkMessage; } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs index 46267d5220..6f6aec3092 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs @@ -39,9 +39,9 @@ namespace Unity.Netcode /// internal interface INetworkMessage { - void Serialize(FastBufferWriter writer, int targetVersion); - bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion); - void Handle(ref NetworkContext context); - int Version { get; } + public void Serialize(FastBufferWriter writer, int targetVersion); + public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion); + public void Handle(ref NetworkContext context); + public int Version { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs index dcd0c1b2aa..bc731fe262 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs @@ -4,6 +4,6 @@ namespace Unity.Netcode { internal interface INetworkMessageProvider { - List GetMessages(); + public List GetMessages(); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs index 5f20746976..f915bb0ced 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs @@ -2,6 +2,6 @@ namespace Unity.Netcode { internal interface INetworkMessageSender { - void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData); + public void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs index 88aac5073e..fadcfe8d42 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs @@ -2,8 +2,8 @@ namespace Unity.Netcode { internal interface IGroupRpcTarget { - void Add(ulong clientId); - void Clear(); - BaseRpcTarget Target { get; } + public void Add(ulong clientId); + public void Clear(); + public BaseRpcTarget Target { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs index 0e654a8328..81bca626c2 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IIndividualRpcTarget.cs @@ -2,7 +2,7 @@ namespace Unity.Netcode { internal interface IIndividualRpcTarget { - void SetClientId(ulong clientId); - BaseRpcTarget Target { get; } + public void SetClientId(ulong clientId); + public BaseRpcTarget Target { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs index 2d948dd87b..349759d553 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs @@ -8,11 +8,8 @@ internal class NotMeRpcTarget : BaseRpcTarget public override void Dispose() { m_ServerRpcTarget.Dispose(); - if (m_GroupSendTarget != null) - { - m_GroupSendTarget.Target.Dispose(); - m_GroupSendTarget = null; - } + m_GroupSendTarget?.Target.Dispose(); + m_GroupSendTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs index 5f31039598..9b3ac4374d 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs @@ -10,11 +10,8 @@ public override void Dispose() { m_ServerRpcTarget.Dispose(); m_LocalSendRpcTarget.Dispose(); - if (m_GroupSendTarget != null) - { - m_GroupSendTarget.Target.Dispose(); - m_GroupSendTarget = null; - } + m_GroupSendTarget?.Target.Dispose(); + m_GroupSendTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs index 316eba4942..b65751655e 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs @@ -8,11 +8,8 @@ internal class NotServerRpcTarget : BaseRpcTarget public override void Dispose() { m_LocalSendRpcTarget.Dispose(); - if (m_GroupSendTarget != null) - { - m_GroupSendTarget.Target.Dispose(); - m_GroupSendTarget = null; - } + m_GroupSendTarget?.Target.Dispose(); + m_GroupSendTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs index 7c7829402d..bd7bafcb54 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs @@ -9,11 +9,8 @@ internal class OwnerRpcTarget : BaseRpcTarget public override void Dispose() { m_LocalRpcTarget.Dispose(); - if (m_UnderlyingTarget != null) - { - m_UnderlyingTarget.Target.Dispose(); - m_UnderlyingTarget = null; - } + m_UnderlyingTarget?.Target.Dispose(); + m_UnderlyingTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs index 09b789ddb9..ce19ddbc34 100644 --- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs @@ -6,11 +6,8 @@ internal class ServerRpcTarget : BaseRpcTarget public override void Dispose() { - if (m_UnderlyingTarget != null) - { - m_UnderlyingTarget.Dispose(); - m_UnderlyingTarget = null; - } + m_UnderlyingTarget?.Dispose(); + m_UnderlyingTarget = null; } internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams) diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs index 96a99b5cef..57f208f432 100644 --- a/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs +++ b/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs @@ -4,97 +4,97 @@ namespace Unity.Netcode { internal interface INetworkMetrics { - void SetConnectionId(ulong connectionId); + public void SetConnectionId(ulong connectionId); - void TrackTransportBytesSent(long bytesCount); + public void TrackTransportBytesSent(long bytesCount); - void TrackTransportBytesReceived(long bytesCount); + public void TrackTransportBytesReceived(long bytesCount); - void TrackNetworkMessageSent(ulong receivedClientId, string messageType, long bytesCount); + public void TrackNetworkMessageSent(ulong receivedClientId, string messageType, long bytesCount); - void TrackNetworkMessageReceived(ulong senderClientId, string messageType, long bytesCount); + public void TrackNetworkMessageReceived(ulong senderClientId, string messageType, long bytesCount); - void TrackNamedMessageSent(ulong receiverClientId, string messageName, long bytesCount); + public void TrackNamedMessageSent(ulong receiverClientId, string messageName, long bytesCount); - void TrackNamedMessageSent(IReadOnlyCollection receiverClientIds, string messageName, long bytesCount); + public void TrackNamedMessageSent(IReadOnlyCollection receiverClientIds, string messageName, long bytesCount); - void TrackNamedMessageReceived(ulong senderClientId, string messageName, long bytesCount); + public void TrackNamedMessageReceived(ulong senderClientId, string messageName, long bytesCount); - void TrackUnnamedMessageSent(ulong receiverClientId, long bytesCount); + public void TrackUnnamedMessageSent(ulong receiverClientId, long bytesCount); - void TrackUnnamedMessageSent(IReadOnlyCollection receiverClientIds, long bytesCount); + public void TrackUnnamedMessageSent(IReadOnlyCollection receiverClientIds, long bytesCount); - void TrackUnnamedMessageReceived(ulong senderClientId, long bytesCount); + public void TrackUnnamedMessageReceived(ulong senderClientId, long bytesCount); - void TrackNetworkVariableDeltaSent( + public void TrackNetworkVariableDeltaSent( ulong receiverClientId, NetworkObject networkObject, string variableName, string networkBehaviourName, long bytesCount); - void TrackNetworkVariableDeltaReceived( + public void TrackNetworkVariableDeltaReceived( ulong senderClientId, NetworkObject networkObject, string variableName, string networkBehaviourName, long bytesCount); - void TrackOwnershipChangeSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); + public void TrackOwnershipChangeSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); - void TrackOwnershipChangeReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); + public void TrackOwnershipChangeReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectSpawnSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectSpawnSent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectSpawnReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectSpawnReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectDestroySent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectDestroySent(ulong receiverClientId, NetworkObject networkObject, long bytesCount); - void TrackObjectDestroyReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); + public void TrackObjectDestroyReceived(ulong senderClientId, NetworkObject networkObject, long bytesCount); - void TrackRpcSent( + public void TrackRpcSent( ulong receiverClientId, NetworkObject networkObject, string rpcName, string networkBehaviourName, long bytesCount); - void TrackRpcSent( + public void TrackRpcSent( ulong[] receiverClientIds, NetworkObject networkObject, string rpcName, string networkBehaviourName, long bytesCount); - void TrackRpcReceived( + public void TrackRpcReceived( ulong senderClientId, NetworkObject networkObject, string rpcName, string networkBehaviourName, long bytesCount); - void TrackServerLogSent(ulong receiverClientId, uint logType, long bytesCount); + public void TrackServerLogSent(ulong receiverClientId, uint logType, long bytesCount); - void TrackServerLogReceived(ulong senderClientId, uint logType, long bytesCount); + public void TrackServerLogReceived(ulong senderClientId, uint logType, long bytesCount); - void TrackSceneEventSent(IReadOnlyList receiverClientIds, uint sceneEventType, string sceneName, long bytesCount); + public void TrackSceneEventSent(IReadOnlyList receiverClientIds, uint sceneEventType, string sceneName, long bytesCount); - void TrackSceneEventSent(ulong receiverClientId, uint sceneEventType, string sceneName, long bytesCount); + public void TrackSceneEventSent(ulong receiverClientId, uint sceneEventType, string sceneName, long bytesCount); - void TrackSceneEventReceived(ulong senderClientId, uint sceneEventType, string sceneName, long bytesCount); + public void TrackSceneEventReceived(ulong senderClientId, uint sceneEventType, string sceneName, long bytesCount); - void TrackPacketSent(uint packetCount); + public void TrackPacketSent(uint packetCount); - void TrackPacketReceived(uint packetCount); + public void TrackPacketReceived(uint packetCount); - void UpdateRttToServer(int rtt); + public void UpdateRttToServer(int rtt); - void UpdateNetworkObjectsCount(int count); + public void UpdateNetworkObjectsCount(int count); - void UpdateConnectionsCount(int count); + public void UpdateConnectionsCount(int count); - void UpdatePacketLoss(float packetLoss); + public void UpdatePacketLoss(float packetLoss); - void DispatchFrame(); + public void DispatchFrame(); } } diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs index 240a5c94f6..c167de2982 100644 --- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs +++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs @@ -10,27 +10,27 @@ namespace Unity.Netcode /// internal interface ISceneManagerHandler { - AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress); + public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress); - AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress); + public AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress); - void PopulateLoadedScenes(ref Dictionary scenesLoaded, NetworkManager networkManager = null); - Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkManager = null); + public void PopulateLoadedScenes(ref Dictionary scenesLoaded, NetworkManager networkManager = null); + public Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkManager = null); - bool DoesSceneHaveUnassignedEntry(string sceneName, NetworkManager networkManager = null); + public bool DoesSceneHaveUnassignedEntry(string sceneName, NetworkManager networkManager = null); - void StopTrackingScene(int handle, string name, NetworkManager networkManager = null); + public void StopTrackingScene(int handle, string name, NetworkManager networkManager = null); - void StartTrackingScene(Scene scene, bool assigned, NetworkManager networkManager = null); + public void StartTrackingScene(Scene scene, bool assigned, NetworkManager networkManager = null); - void ClearSceneTracking(NetworkManager networkManager = null); + public void ClearSceneTracking(NetworkManager networkManager = null); - void UnloadUnassignedScenes(NetworkManager networkManager = null); + public void UnloadUnassignedScenes(NetworkManager networkManager = null); - void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkManager, Scene scene); + public void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkManager, Scene scene); - void SetClientSynchronizationMode(ref NetworkManager networkManager, LoadSceneMode mode); + public void SetClientSynchronizationMode(ref NetworkManager networkManager, LoadSceneMode mode); - bool ClientShouldPassThrough(string sceneName, bool isPrimaryScene, LoadSceneMode clientSynchronizationMode, NetworkManager networkManager); + public bool ClientShouldPassThrough(string sceneName, bool isPrimaryScene, LoadSceneMode clientSynchronizationMode, NetworkManager networkManager); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs index da68a378af..10a51e0673 100644 --- a/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs +++ b/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs @@ -13,6 +13,6 @@ public interface INetworkSerializable /// Either BufferSerializerReader or BufferSerializerWriter, depending whether the serializer /// is in read mode or write mode. /// - void NetworkSerialize(BufferSerializer serializer) where T : IReaderWriter; + public void NetworkSerialize(BufferSerializer serializer) where T : IReaderWriter; } } diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs index 676d09cf69..a4b262567e 100644 --- a/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs +++ b/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs @@ -12,37 +12,37 @@ public interface IReaderWriter /// /// Check whether this implementation is a "reader" - if it's been constructed to deserialize data /// - bool IsReader { get; } + public bool IsReader { get; } /// /// Check whether this implementation is a "writer" - if it's been constructed to serialize data /// - bool IsWriter { get; } + public bool IsWriter { get; } /// /// Get the underlying FastBufferReader struct. /// Only valid when IsReader == true /// /// underlying FastBufferReader - FastBufferReader GetFastBufferReader(); + public FastBufferReader GetFastBufferReader(); /// /// Get the underlying FastBufferWriter struct. /// Only valid when IsWriter == true /// /// underlying FastBufferWriter - FastBufferWriter GetFastBufferWriter(); + public FastBufferWriter GetFastBufferWriter(); /// /// Read or write a string /// /// The value to read/write /// If true, characters will be limited to one-byte ASCII characters - void SerializeValue(ref string s, bool oneByteChars = false); + public void SerializeValue(ref string s, bool oneByteChars = false); /// /// Read or write a single byte /// /// The value to read/write - void SerializeValue(ref byte value); + public void SerializeValue(ref byte value); /// /// Read or write a primitive value (int, bool, etc) @@ -52,7 +52,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValue(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Read or write an array of primitive values (int, bool, etc) @@ -62,7 +62,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValue(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Read or write an enum value @@ -70,7 +70,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValue(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Read or write an array of enum values @@ -78,7 +78,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValue(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Read or write a struct value implementing ISerializeByMemcpy @@ -86,7 +86,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValue(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Read or write an array of struct values implementing ISerializeByMemcpy @@ -94,7 +94,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValue(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Read or write a NativeArray of struct values implementing ISerializeByMemcpy @@ -103,7 +103,7 @@ public interface IReaderWriter /// The allocator to use to construct the resulting NativeArray when reading /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValue(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT /// @@ -112,7 +112,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValue(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #endif /// @@ -121,7 +121,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); + public void SerializeValue(ref T value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); /// /// Read or write an array of struct or class values implementing INetworkSerializable @@ -129,7 +129,7 @@ public interface IReaderWriter /// The values to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T[] value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); + public void SerializeValue(ref T[] value, FastBufferWriter.ForNetworkSerializable unused = default) where T : INetworkSerializable, new(); /// /// Read or write a FixedString value @@ -137,7 +137,7 @@ public interface IReaderWriter /// The value to read/write /// An unused parameter used for enabling overload resolution based on generic constraints /// The type being serialized - void SerializeValue(ref T value, FastBufferWriter.ForFixedStrings unused = default) + public void SerializeValue(ref T value, FastBufferWriter.ForFixedStrings unused = default) where T : unmanaged, INativeList, IUTF8Bytes; /// @@ -146,7 +146,7 @@ void SerializeValue(ref T value, FastBufferWriter.ForFixedStrings unused = de /// The value to read/write /// The allocator to use to construct the resulting NativeArray when reading /// The type being serialized - void SerializeValue(ref NativeArray value, Allocator allocator) + public void SerializeValue(ref NativeArray value, Allocator allocator) where T : unmanaged, INativeList, IUTF8Bytes; #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT @@ -155,7 +155,7 @@ void SerializeValue(ref NativeArray value, Allocator allocator) /// /// The value to read/write /// The type being serialized - void SerializeValue(ref NativeList value) + public void SerializeValue(ref NativeList value) where T : unmanaged, INativeList, IUTF8Bytes; #endif @@ -163,133 +163,133 @@ void SerializeValue(ref NativeList value) /// Read or write a Vector2 value /// /// The value to read/write - void SerializeValue(ref Vector2 value); + public void SerializeValue(ref Vector2 value); /// /// Read or write an array of Vector2 values /// /// The values to read/write - void SerializeValue(ref Vector2[] value); + public void SerializeValue(ref Vector2[] value); /// /// Read or write a Vector3 value /// /// The value to read/write - void SerializeValue(ref Vector3 value); + public void SerializeValue(ref Vector3 value); /// /// Read or write an array of Vector3 values /// /// The values to read/write - void SerializeValue(ref Vector3[] value); + public void SerializeValue(ref Vector3[] value); /// /// Read or write a Vector2Int value /// /// The value to read/write - void SerializeValue(ref Vector2Int value); + public void SerializeValue(ref Vector2Int value); /// /// Read or write an array of Vector2Int values /// /// The values to read/write - void SerializeValue(ref Vector2Int[] value); + public void SerializeValue(ref Vector2Int[] value); /// /// Read or write a Vector3Int value /// /// The value to read/write - void SerializeValue(ref Vector3Int value); + public void SerializeValue(ref Vector3Int value); /// /// Read or write an array of Vector3Int values /// /// The values to read/write - void SerializeValue(ref Vector3Int[] value); + public void SerializeValue(ref Vector3Int[] value); /// /// Read or write a Vector4 value /// /// The value to read/write - void SerializeValue(ref Vector4 value); + public void SerializeValue(ref Vector4 value); /// /// Read or write an array of Vector4 values /// /// The values to read/write - void SerializeValue(ref Vector4[] value); + public void SerializeValue(ref Vector4[] value); /// /// Read or write a Quaternion value /// /// The value to read/write - void SerializeValue(ref Quaternion value); + public void SerializeValue(ref Quaternion value); /// /// Read or write an array of Quaternion values /// /// The values to read/write - void SerializeValue(ref Quaternion[] value); + public void SerializeValue(ref Quaternion[] value); /// /// Read or write a Pose value /// /// The value to read/write - void SerializeValue(ref Pose value); + public void SerializeValue(ref Pose value); /// /// Read or write an array of Pose values /// /// The values to read/write - void SerializeValue(ref Pose[] value); + public void SerializeValue(ref Pose[] value); /// /// Read or write a Color value /// /// The value to read/write - void SerializeValue(ref Color value); + public void SerializeValue(ref Color value); /// /// Read or write an array of Color values /// /// The values to read/write - void SerializeValue(ref Color[] value); + public void SerializeValue(ref Color[] value); /// /// Read or write a Color32 value /// /// The value to read/write - void SerializeValue(ref Color32 value); + public void SerializeValue(ref Color32 value); /// /// Read or write an array of Color32 values /// /// The values to read/write - void SerializeValue(ref Color32[] value); + public void SerializeValue(ref Color32[] value); /// /// Read or write a Ray value /// /// The value to read/write - void SerializeValue(ref Ray value); + public void SerializeValue(ref Ray value); /// /// Read or write an array of Ray values /// /// The values to read/write - void SerializeValue(ref Ray[] value); + public void SerializeValue(ref Ray[] value); /// /// Read or write a Ray2D value /// /// The value to read/write - void SerializeValue(ref Ray2D value); + public void SerializeValue(ref Ray2D value); /// /// Read or write an array of Ray2D values /// /// The values to read/write - void SerializeValue(ref Ray2D[] value); + public void SerializeValue(ref Ray2D[] value); /// /// Read or write a NetworkSerializable value. @@ -297,7 +297,7 @@ void SerializeValue(ref NativeList value) /// /// The value to read/write /// The network serializable type - void SerializeNetworkSerializable(ref T value) where T : INetworkSerializable, new(); + public void SerializeNetworkSerializable(ref T value) where T : INetworkSerializable, new(); /// /// Performs an advance check to ensure space is available to read/write one or more values. @@ -310,7 +310,7 @@ void SerializeValue(ref NativeList value) /// True if there is sufficient space for the specified amount of bytes. /// False if there isn't enough space available. /// - bool PreCheck(int amount); + public bool PreCheck(int amount); /// /// Serialize a string, "pre-checked", which skips buffer checks. @@ -320,7 +320,7 @@ void SerializeValue(ref NativeList value) /// /// The value to read/write /// If true, characters will be limited to one-byte ASCII characters - void SerializeValuePreChecked(ref string s, bool oneByteChars = false); + public void SerializeValuePreChecked(ref string s, bool oneByteChars = false); /// /// Serialize a byte, "pre-checked", which skips buffer checks. @@ -329,7 +329,7 @@ void SerializeValue(ref NativeList value) /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref byte value); + public void SerializeValuePreChecked(ref byte value); /// /// Serialize a primitive, "pre-checked", which skips buffer checks. @@ -340,7 +340,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Serialize an array of primitives, "pre-checked", which skips buffer checks. @@ -351,7 +351,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; + public void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForPrimitives unused = default) where T : unmanaged, IComparable, IConvertible, IComparable, IEquatable; /// /// Serialize an enum, "pre-checked", which skips buffer checks. @@ -362,7 +362,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Serialize an array of enums, "pre-checked", which skips buffer checks. @@ -373,7 +373,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; + public void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForEnums unused = default) where T : unmanaged, Enum; /// /// Serialize a struct, "pre-checked", which skips buffer checks. @@ -384,7 +384,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Serialize an array of structs, "pre-checked", which skips buffer checks. @@ -395,7 +395,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; + public void SerializeValuePreChecked(ref T[] value, FastBufferWriter.ForStructs unused = default) where T : unmanaged, INetworkSerializeByMemcpy; /// /// Serialize a NativeArray of structs, "pre-checked", which skips buffer checks. @@ -407,7 +407,7 @@ void SerializeValue(ref NativeList value) /// The values to read/write /// The allocator to use to construct the resulting NativeArray when reading /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValuePreChecked(ref NativeArray value, Allocator allocator, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT /// @@ -419,7 +419,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The values to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; + public void SerializeValuePreChecked(ref NativeList value, FastBufferWriter.ForGeneric unused = default) where T : unmanaged; #endif /// @@ -431,7 +431,7 @@ void SerializeValue(ref NativeList value) /// The type being serialized /// The value to read/write /// An unused parameter that can be used for enabling overload resolution based on generic constraints - void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings unused = default) + public void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings unused = default) where T : unmanaged, INativeList, IUTF8Bytes; /// @@ -441,7 +441,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector2 value); + public void SerializeValuePreChecked(ref Vector2 value); /// /// Serialize a Vector2 array, "pre-checked", which skips buffer checks. @@ -450,7 +450,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The values to read/write - void SerializeValuePreChecked(ref Vector2[] value); + public void SerializeValuePreChecked(ref Vector2[] value); /// /// Serialize a Vector3, "pre-checked", which skips buffer checks. @@ -459,7 +459,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector3 value); + public void SerializeValuePreChecked(ref Vector3 value); /// /// Serialize a Vector3 array, "pre-checked", which skips buffer checks. @@ -468,7 +468,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The values to read/write - void SerializeValuePreChecked(ref Vector3[] value); + public void SerializeValuePreChecked(ref Vector3[] value); /// /// Serialize a Vector2Int, "pre-checked", which skips buffer checks. @@ -477,7 +477,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector2Int value); + public void SerializeValuePreChecked(ref Vector2Int value); /// /// Serialize a Vector2Int array, "pre-checked", which skips buffer checks. @@ -486,7 +486,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The values to read/write - void SerializeValuePreChecked(ref Vector2Int[] value); + public void SerializeValuePreChecked(ref Vector2Int[] value); /// /// Serialize a Vector3Int, "pre-checked", which skips buffer checks. @@ -495,7 +495,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector3Int value); + public void SerializeValuePreChecked(ref Vector3Int value); /// /// Serialize a Vector3Int array, "pre-checked", which skips buffer checks. @@ -504,7 +504,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector3Int[] value); + public void SerializeValuePreChecked(ref Vector3Int[] value); /// /// Serialize a Vector4, "pre-checked", which skips buffer checks. @@ -513,7 +513,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector4 value); + public void SerializeValuePreChecked(ref Vector4 value); /// /// Serialize a Vector4 array, "pre-checked", which skips buffer checks. @@ -522,7 +522,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Vector4[] value); + public void SerializeValuePreChecked(ref Vector4[] value); /// /// Serialize a Quaternion, "pre-checked", which skips buffer checks. @@ -531,7 +531,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Quaternion value); + public void SerializeValuePreChecked(ref Quaternion value); /// /// Serialize a Quaternion array, "pre-checked", which skips buffer checks. @@ -540,7 +540,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Quaternion[] value); + public void SerializeValuePreChecked(ref Quaternion[] value); /// /// Serialize a Pose, "pre-checked", which skips buffer checks. @@ -549,7 +549,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Pose value); + public void SerializeValuePreChecked(ref Pose value); /// /// Serialize a Pose array, "pre-checked", which skips buffer checks. @@ -558,7 +558,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Pose[] value); + public void SerializeValuePreChecked(ref Pose[] value); /// /// Serialize a Color, "pre-checked", which skips buffer checks. @@ -567,7 +567,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color value); + public void SerializeValuePreChecked(ref Color value); /// /// Serialize a Color array, "pre-checked", which skips buffer checks. @@ -576,7 +576,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color[] value); + public void SerializeValuePreChecked(ref Color[] value); /// /// Serialize a Color32, "pre-checked", which skips buffer checks. @@ -585,7 +585,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color32 value); + public void SerializeValuePreChecked(ref Color32 value); /// /// Serialize a Color32 array, "pre-checked", which skips buffer checks. @@ -594,7 +594,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Color32[] value); + public void SerializeValuePreChecked(ref Color32[] value); /// /// Serialize a Ray, "pre-checked", which skips buffer checks. @@ -603,7 +603,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray value); + public void SerializeValuePreChecked(ref Ray value); /// /// Serialize a Ray array, "pre-checked", which skips buffer checks. @@ -612,7 +612,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray[] value); + public void SerializeValuePreChecked(ref Ray[] value); /// /// Serialize a Ray2D, "pre-checked", which skips buffer checks. @@ -621,7 +621,7 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray2D value); + public void SerializeValuePreChecked(ref Ray2D value); /// /// Serialize a Ray2D array, "pre-checked", which skips buffer checks. @@ -630,6 +630,6 @@ void SerializeValuePreChecked(ref T value, FastBufferWriter.ForFixedStrings u /// past the end of the buffer, which will cause memory corruption and undefined behavior. /// /// The value to read/write - void SerializeValuePreChecked(ref Ray2D[] value); + public void SerializeValuePreChecked(ref Ray2D[] value); } } diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs index fe0dd270e9..db2678822c 100644 --- a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs +++ b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs @@ -25,7 +25,7 @@ public interface INetworkPrefabInstanceHandler /// the initial/default position for the to be instantiated /// the initial/default rotation for the to be instantiated /// The instantiated NetworkObject instance. Returns null if instantiation fails. - NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation); + public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation); /// /// Invoked on Client and Server @@ -41,7 +41,7 @@ public interface INetworkPrefabInstanceHandler /// The most common approach is to make the inactive by calling . /// /// The being destroyed - void Destroy(NetworkObject networkObject); + public void Destroy(NetworkObject networkObject); } /// diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs b/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs index 07740c8702..109f52d070 100644 --- a/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs +++ b/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs @@ -2,9 +2,9 @@ namespace Unity.Netcode { internal interface IRealTimeProvider { - float RealTimeSinceStartup { get; } - float UnscaledTime { get; } - float UnscaledDeltaTime { get; } - float DeltaTime { get; } + public float RealTimeSinceStartup { get; } + public float UnscaledTime { get; } + public float UnscaledDeltaTime { get; } + public float DeltaTime { get; } } } diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index c3ca650418..a9f20dae73 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -44,7 +44,7 @@ public interface INetworkStreamDriverConstructor /// The UnreliableFragmented NetworkPipeline /// The UnreliableSequencedFragmented NetworkPipeline /// The ReliableSequenced NetworkPipeline - void CreateDriver( + public void CreateDriver( UnityTransport transport, out NetworkDriver driver, out NetworkPipeline unreliableFragmentedPipeline, diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs index 6745ae78a4..f9cfd6601d 100644 --- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs +++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/ConditionalPredicate.cs @@ -43,18 +43,18 @@ public interface IConditionalPredicate /// /// Test the conditions of the test to be reached /// - bool HasConditionBeenReached(); + public bool HasConditionBeenReached(); /// /// Wait for condition has started /// - void Started(); + public void Started(); /// /// Wait for condition has finished: /// Condition(s) met or timed out /// - void Finished(bool timedOut); + public void Finished(bool timedOut); } } diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs index 81cc7e7bb2..8a779bbd2b 100644 --- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs @@ -333,11 +333,8 @@ private class TestNoHandlerMessageProvider : INetworkMessageProvider public void WhenReceivingAMessageWithoutAHandler_ExceptionIsLogged() { // If a NetworkMessageManager already exists then dispose of it before creating a new NetworkMessageManager (otherwise memory leak) - if (m_MessageManager != null) - { - m_MessageManager.Dispose(); - m_MessageManager = null; - } + m_MessageManager?.Dispose(); + m_MessageManager = null; // Since m_MessageManager is disposed during teardown we don't need to worry about that here. m_MessageManager = new NetworkMessageManager(new NopMessageSender(), this, new TestNoHandlerMessageProvider()); diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics.meta index 11b63dac9f..851f941aba 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4cd7fa97c73f3674b9cce18b1e0a6874 +guid: 2a159c96963f067c98cd7dbc598d25b9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs.meta index bc0d812e3f..b05af1d7d1 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 1845aef61dbb4f2b9d2be9145262ab90 +guid: c1ec538b8c99e0874973e4d0850d5d00 timeCreated: 1647023529 \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs.meta index 7910ff22ff..e9036cb2b2 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2490ed51138306e4d92f8e9dcfc34462 +guid: 07bb68611b0aa4a1bb2c0c66be98938c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs.meta index 9a1994022a..817f4bfe94 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 4833f15c8a59407abbb8532ea64b5683 +guid: 7a6f74be65c8744afb154f4cb1ee680c timeCreated: 1633451646 \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs.meta index d09dcacf56..85a53b90ae 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c4cb56c442bed164da4908e54590dfeb +guid: 26ac0a41c91dd1c8980120ae46dc30d1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs.meta index 690106bf91..1de84994df 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: abbea688505c90d4f82bfa5ea3ee1cd9 +guid: c77e2ef0d26411d6e9199679ab602049 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs.meta index a227871bc5..b2ab4da687 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86daf1dbe91c9ad40818743a805d0052 +guid: 14ac3cc8ad5d40b658e5830be69ab843 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs.meta index d48f305665..c6ead16ed7 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 12e64da4670d49a4a89da38d18e64396 +guid: c7cf886a2774f6beca4e5d991eeec70f timeCreated: 1648133968 \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs.meta index d55ef2fa73..aa3fe40008 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 84a4884f4ea744a9944284d56b29531b +guid: e8786f1151603308bb463f6b22f9fe1a timeCreated: 1644269306 \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs.meta index 38427d5e46..820941db07 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02a31cf8be00f8b46b65477d648b297d +guid: 666b0840d4b1b9c19907261381fe9ace MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs.meta index 704d1b4b6d..ba6931e05c 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 452fbcb436d24291ba7db3a68e3e50ac +guid: d674b9de0e86e1922a33adb0eacc8a8a timeCreated: 1644269321 \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs.meta index 8eccb56ef7..54ea993ea7 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5ba082aac78de5d488f621a0cbaf16a6 +guid: 9f65f3f96947cb540aa132f961870017 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/TransportBytesMetricsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/TransportBytesMetricsTests.cs.meta index 2cfb1f3a0b..e2efc67866 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/TransportBytesMetricsTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/TransportBytesMetricsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8be98b50d230114f853054c479341ee +guid: 1506de41e9eb352bea64025345842974 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/testproject/Assets/DefaultNetworkPrefabs.asset b/testproject/Assets/DefaultNetworkPrefabs.asset index 88f490d092..2047c7f49d 100644 --- a/testproject/Assets/DefaultNetworkPrefabs.asset +++ b/testproject/Assets/DefaultNetworkPrefabs.asset @@ -230,3 +230,121 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 6994329648695279756, guid: 5c4a10e01b6668147ba4ccda6a584181, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 479369275288778692, guid: 4d47e418fec779e4eb616d66d61c3231, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 296612175404815451, guid: 61e89146f864ef2478af3da9d7dda1e2, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 8188135024827620138, guid: 15696ae0708d1394e921578ccf65dcf9, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 1488386875393216933, guid: e4e9fd3d93a158244a79608314400ff9, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 296612175404815451, guid: 280da53b37f0d2546ab4d7b7da446545, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5507278367988661157, guid: c2db148a1fac379449a31b5430f4c6ac, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5911443254905569495, guid: 1e7fa5aea121ba0459459b497c2f03e8, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5911443254905569495, guid: d88eb84e4c4e82b4b81d577a6c8e818e, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 6958138586392507362, guid: dfba1c6e3f2aa7344ac8a0626301deb0, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 3830151999068797299, guid: 3a2af202b2ff8534994ecd7ad7eac25e, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 296612175404815451, guid: fda785b5a15c5a94f9f3e93e635827a7, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5911443254905569495, guid: 67daf9621f0d6d74c9a9bb4f81438061, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5911443254905569495, guid: 12cead04031f30a4aaae7427341502fa, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 1923233254652950715, guid: d166e48a59e24924199f3ec3b2bc3b64, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 479369275288778692, guid: ce3279d5e4f8e0342acdb2ce118f2be5, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 6307603743893504780, guid: 0a46b240b37c5b74786b1938e8fd2eae, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 6994329648695279756, guid: a67d0c2ee5d39fb4f9f0667f244d9e58, + type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 771575417923360811, guid: d7447e326e807754d81428939a14058f, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 296612175404815451, guid: 9501b2f26df3884488e1699035fd634b, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 771575417923360811, guid: 44d487c39a833b445beef6e9e39a5731, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/testproject/Assets/Scripts/MenuManagement/SceneReference.cs b/testproject/Assets/Scripts/MenuManagement/SceneReference.cs index 7fed48716f..85e466d34a 100644 --- a/testproject/Assets/Scripts/MenuManagement/SceneReference.cs +++ b/testproject/Assets/Scripts/MenuManagement/SceneReference.cs @@ -64,6 +64,6 @@ public List GetReferencedScenes() public interface ISceneReference { - string GetDisplayName(); - List GetReferencedScenes(); + public string GetDisplayName(); + public List GetReferencedScenes(); } diff --git a/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs b/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs index 7c7b6499f9..4385b82fde 100644 --- a/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs +++ b/testproject/Assets/Tests/Manual/Scripts/IPlayerMovement.cs @@ -2,6 +2,6 @@ namespace TestProject.ManualTests { public interface IPlayerMovement { - void Move(int speed); + public void Move(int speed); } }