From ceaa7e7a30dd0885f3e7d99f213e5e6bf4a1dec2 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:25:40 +0100 Subject: [PATCH 1/7] Moving comand line options to unity transport --- .../Runtime/Core/NetworkManager.cs | 92 ++-- .../Runtime/Transports/UTP/UnityTransport.cs | 71 ++- .../Scenes/CommandLineOverrideTest.unity | 435 ++++++++++++++++++ .../Scenes/CommandLineOverrideTest.unity.meta | 7 + testproject/Assets/Scripts/ServerTest.cs | 24 + testproject/Assets/Scripts/ServerTest.cs.meta | 2 + testproject/Assets/Scripts/testproject.asmdef | 15 +- 7 files changed, 594 insertions(+), 52 deletions(-) create mode 100644 testproject/Assets/Scenes/CommandLineOverrideTest.unity create mode 100644 testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta create mode 100644 testproject/Assets/Scripts/ServerTest.cs create mode 100644 testproject/Assets/Scripts/ServerTest.cs.meta diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 50a6304f52..43a57e5641 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -976,18 +976,18 @@ public NetworkPrefabHandler PrefabHandler internal NetworkConnectionManager ConnectionManager = new NetworkConnectionManager(); internal NetworkMessageManager MessageManager = null; - internal struct Override - { - private T m_Value; - public bool Overidden { get; private set; } - internal T Value - { - get { return Overidden ? m_Value : default(T); } - set { Overidden = true; m_Value = value; } - } - }; - - internal Override PortOverride; + // internal struct Override + // { + // private T m_Value; + // public bool Overidden { get; private set; } + // internal T Value + // { + // get { return Overidden ? m_Value : default(T); } + // set { Overidden = true; m_Value = value; } + // } + // }; + // + // internal Override PortOverride; /// /// Determines if the NetworkManager's GameObject is parented under another GameObject and @@ -1168,7 +1168,7 @@ internal void Initialize(bool server) return; } - ParseCommandLineOptions(); + //ParseCommandLineOptions(); if (NetworkConfig.NetworkTransport == null) { @@ -1740,39 +1740,39 @@ private void OnDestroy() #endif } - // Command line options - private const string k_OverridePortArg = "-port"; - - private string GetArg(string[] commandLineArgs, string arg) - { - var argIndex = Array.IndexOf(commandLineArgs, arg); - if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1) - { - return commandLineArgs[argIndex + 1]; - } - - return null; - } - - private void ParseArg(string arg, ref Override value) - { - if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) - { - value.Value = (T)Convert.ChangeType(argValue, typeof(T)); - } - } - - private void ParseCommandLineOptions() - { -#if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT - if ( UnityEngine.DedicatedServer.Arguments.Port != null) - { - PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; - } -#else - ParseArg(k_OverridePortArg, ref PortOverride); -#endif - } +// // Command line options +// private const string k_OverridePortArg = "-port"; +// +// private string GetArg(string[] commandLineArgs, string arg) +// { +// var argIndex = Array.IndexOf(commandLineArgs, arg); +// if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1) +// { +// return commandLineArgs[argIndex + 1]; +// } +// +// return null; +// } +// +// private void ParseArg(string arg, ref Override value) +// { +// if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) +// { +// value.Value = (T)Convert.ChangeType(argValue, typeof(T)); +// } +// } +// +// private void ParseCommandLineOptions() +// { +// #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT +// if ( UnityEngine.DedicatedServer.Arguments.Port != null) +// { +// PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; +// } +// #else +// ParseArg(k_OverridePortArg, ref PortOverride); +// #endif +// } #if UNITY_EDITOR internal static INetworkManagerHelper NetworkManagerHelper; diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index 5b71fcadbe..7a63be889e 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -785,14 +785,79 @@ public void SetClientRelayData(string ipAddress, ushort port, byte[] allocationI SetRelayServerData(ipAddress, port, allocationId, key, connectionData, hostConnectionData, isSecure); } + internal struct Override + { + private T m_Value; + public bool Overidden { get; private set; } + internal T Value + { + get { return Overidden ? m_Value : default(T); } + set { Overidden = true; m_Value = value; } + } + }; + + internal Override PortOverride; + + // Command line options + private const string k_OverridePortArg = "-port"; + + private string GetArg(string[] commandLineArgs, string arg) + { + var argIndex = Array.IndexOf(commandLineArgs, arg); + if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1) + { + return commandLineArgs[argIndex + 1]; + } + + return null; + } + + private void ParseArg(string arg, ref Override value) + { + if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) + { + value.Value = (T)Convert.ChangeType(argValue, typeof(T)); + } + } + + private void ParseCommandLineOptions() + { +#if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT + + Debug.Log("This is happening 1"); + if ( UnityEngine.DedicatedServer.Arguments.Port != null) + { + Debug.Log("This is happening 2"); + PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; + } +#else + ParseArg(k_OverridePortArg, ref PortOverride); +#endif + } + /// /// Sets IP and Port information. This will be ignored if using the Unity Relay and you should call /// /// The remote IP address (despite the name, can be an IPv6 address or a domain name) /// The remote port /// The local listen address - public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null) + /// Should override port value + public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool overrideCommandLineArgs = false) { + if (overrideCommandLineArgs) + { + if (m_NetworkManager.LogLevel <= LogLevel.Developer) + { + Debug.Log($"Already has command line option set. Using connection data set to {ipv4Address}:{port}"); + } + + ConnectionData.Port = port; + } + else + { + ParseCommandLineOptions(); + } + ConnectionData = new ConnectionAddressData { Address = ipv4Address, @@ -1561,9 +1626,9 @@ public override void Initialize(NetworkManager networkManager = null) m_NetworkManager = networkManager; - if (m_NetworkManager && m_NetworkManager.PortOverride.Overidden) + if (m_NetworkManager && PortOverride.Overidden) { - ConnectionData.Port = m_NetworkManager.PortOverride.Value; + ConnectionData.Port = PortOverride.Value; } m_RealTimeProvider = m_NetworkManager ? m_NetworkManager.RealTimeProvider : new RealTimeProvider(); diff --git a/testproject/Assets/Scenes/CommandLineOverrideTest.unity b/testproject/Assets/Scenes/CommandLineOverrideTest.unity new file mode 100644 index 0000000000..995ce813ce --- /dev/null +++ b/testproject/Assets/Scenes/CommandLineOverrideTest.unity @@ -0,0 +1,435 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &147840364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147840367} + - component: {fileID: 147840366} + - component: {fileID: 147840365} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &147840365 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147840364} + m_Enabled: 1 +--- !u!20 &147840366 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147840364} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &147840367 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147840364} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1031598569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1031598571} + - component: {fileID: 1031598570} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1031598570 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031598569} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &1031598571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031598569} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1303218803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1303218806} + - component: {fileID: 1303218805} + - component: {fileID: 1303218804} + - component: {fileID: 1303218807} + m_Layer: 0 + m_Name: Network + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1303218804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303218803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ProtocolType: 0 + m_UseWebSockets: 0 + m_UseEncryption: 0 + m_MaxPacketQueueSize: 128 + m_MaxPayloadSize: 6144 + m_HeartbeatTimeoutMS: 500 + m_ConnectTimeoutMS: 1000 + m_MaxConnectAttempts: 60 + m_DisconnectTimeoutMS: 30000 + ConnectionData: + Address: 127.0.0.1 + Port: 7777 + ServerListenAddress: 127.0.0.1 + DebugSimulator: + PacketDelayMS: 0 + PacketJitterMS: 0 + PacketDropRate: 0 +--- !u!114 &1303218805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303218803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkManagerExpanded: 0 + NetworkConfig: + ProtocolVersion: 0 + NetworkTransport: {fileID: 1303218804} + PlayerPrefab: {fileID: 0} + Prefabs: + NetworkPrefabsLists: + - {fileID: 11400000, guid: f443b39d7640d4c75a178a9b03d0b669, type: 2} + TickRate: 30 + ClientConnectionBufferTimeout: 10 + ConnectionApproval: 0 + ConnectionData: + EnableTimeResync: 0 + TimeResyncInterval: 30 + EnsureNetworkVariableLengthSafety: 0 + EnableSceneManagement: 1 + ForceSamePrefabs: 1 + RecycleNetworkIds: 1 + NetworkIdRecycleDelay: 120 + RpcHashSize: 0 + LoadSceneTimeOut: 120 + SpawnTimeout: 10 + EnableNetworkLogs: 1 + NetworkTopology: 0 + UseCMBService: 0 + AutoSpawnPlayerPrefabClientSide: 1 + NetworkMessageMetrics: 1 + NetworkProfilingMetrics: 1 + OldPrefabList: [] + RunInBackground: 1 + LogLevel: 1 +--- !u!4 &1303218806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303218803} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1303218807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303218803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c6424f91fc70544190684bfc288041c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 147840367} + - {fileID: 1031598571} + - {fileID: 1303218806} diff --git a/testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta b/testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta new file mode 100644 index 0000000000..0dba3089af --- /dev/null +++ b/testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a4c20895a6e8e4458ac97be10fc7ffd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/testproject/Assets/Scripts/ServerTest.cs b/testproject/Assets/Scripts/ServerTest.cs new file mode 100644 index 0000000000..98cc914475 --- /dev/null +++ b/testproject/Assets/Scripts/ServerTest.cs @@ -0,0 +1,24 @@ +using Unity.Netcode; +using Unity.Netcode.Transports.UTP; +using UnityEngine; + +public class ServerTest : MonoBehaviour +{ + private NetworkManager m_Network; + private UnityTransport m_Transport; + + private void Awake() + { + m_Network = GetComponent(); + m_Transport = GetComponent(); + } + + private void Start() + { + ushort port = 8889; + Debug.Log("Start Server Port " + port); // <---- Start Server Port 8888 + m_Transport.SetConnectionData("0.0.0.0", port); // <---- Port set to 8888 + m_Network.StartServer(); + Debug.Log("Server listening on port: " + m_Transport.ConnectionData.Port); // <---- Shows Server listening on port: 7777 + } +} diff --git a/testproject/Assets/Scripts/ServerTest.cs.meta b/testproject/Assets/Scripts/ServerTest.cs.meta new file mode 100644 index 0000000000..b68ae8038d --- /dev/null +++ b/testproject/Assets/Scripts/ServerTest.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9c6424f91fc70544190684bfc288041c \ No newline at end of file diff --git a/testproject/Assets/Scripts/testproject.asmdef b/testproject/Assets/Scripts/testproject.asmdef index 942bddd1f0..760ab39aaa 100644 --- a/testproject/Assets/Scripts/testproject.asmdef +++ b/testproject/Assets/Scripts/testproject.asmdef @@ -9,8 +9,16 @@ "Unity.Services.Authentication", "Unity.Services.Core", "Unity.Services.Relay", - "Unity.Addressables.Editor" + "Unity.Addressables.Editor", + "Unity.Networking.Transport" ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], "versionDefines": [ { "name": "com.unity.services.relay", @@ -22,5 +30,6 @@ "expression": "", "define": "TESTPROJECT_USE_ADDRESSABLES" } - ] -} + ], + "noEngineReferences": false +} \ No newline at end of file From b94624ce021bf0a444c123a0b1053c9d44a3daa2 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:26:28 +0100 Subject: [PATCH 2/7] Updating project version (can be reverted) --- testproject/Packages/manifest.json | 3 +- testproject/Packages/packages-lock.json | 45 +++++++++++++++---- .../ProjectSettings/MultiplayerManager.asset | 4 +- .../ContentSelectionSettings.asset | 22 +++++++++ .../MultiplayerRolesSettings.asset | 17 +++++++ .../ProjectSettings/ProjectVersion.txt | 4 +- 6 files changed, 82 insertions(+), 13 deletions(-) create mode 100644 testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset create mode 100644 testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index efee7216f2..0b1c4a8530 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -13,8 +13,9 @@ "com.unity.services.authentication": "3.5.2", "com.unity.services.multiplayer": "1.2.0", "com.unity.test-framework": "1.6.0", - "com.unity.test-framework.performance": "3.1.0", + "com.unity.test-framework.performance": "3.2.0", "com.unity.timeline": "1.8.9", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.ugui": "2.0.0", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index fba8ef0b75..39161e8620 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -26,8 +26,8 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.24", - "depth": 2, + "version": "1.8.25", + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -43,13 +43,14 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.6.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.burst": "1.8.23", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" @@ -110,7 +111,7 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 1, "source": "registry", "dependencies": {}, @@ -230,8 +231,24 @@ }, "url": "https://packages.unity.com" }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { - "version": "1.5.1", + "version": "1.6.0", "depth": 0, "source": "builtin", "dependencies": { @@ -241,7 +258,7 @@ } }, "com.unity.test-framework.performance": { - "version": "3.1.0", + "version": "3.2.0", "depth": 0, "source": "registry", "dependencies": { @@ -262,6 +279,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.transport": { "version": "2.6.0", "depth": 1, diff --git a/testproject/ProjectSettings/MultiplayerManager.asset b/testproject/ProjectSettings/MultiplayerManager.asset index 2a936644e0..f1d03dfbac 100644 --- a/testproject/ProjectSettings/MultiplayerManager.asset +++ b/testproject/ProjectSettings/MultiplayerManager.asset @@ -4,4 +4,6 @@ MultiplayerManager: m_ObjectHideFlags: 0 m_EnableMultiplayerRoles: 0 - m_StrippingTypes: {} + m_StrippingTypes: + 1: [] + 2: [] diff --git a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset new file mode 100644 index 0000000000..6af50aac8d --- /dev/null +++ b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3c63bcbf0c7c4315b6f985026440942, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EnableSafetyChecks: 1 + m_AutomaticSelectionOptions: + m_StripRenderComponents: 0 + m_StripUIComponents: 0 + m_StripAudioComponents: 0 + m_CustomComponentsList: + m_Keys: [] + m_Values: diff --git a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset new file mode 100644 index 0000000000..977913f644 --- /dev/null +++ b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d10b65e3c306d4012b52f19dca31ac8d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MultiplayerRoleForClassicProfile: + m_Keys: [] + m_Values: diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt index fd1456820c..ea02f79eaf 100644 --- a/testproject/ProjectSettings/ProjectVersion.txt +++ b/testproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.51f1 -m_EditorVersionWithRevision: 6000.0.51f1 (01c3ff5872c5) +m_EditorVersion: 6000.0.60f1 +m_EditorVersionWithRevision: 6000.0.60f1 (61dfb374e36f) From 31b985dcdb4717b9aaa748b3c9462b32aa5cc1d3 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:27:18 +0100 Subject: [PATCH 3/7] Disable build scenes + add CommandLineOverrideTest --- .../ProjectSettings/EditorBuildSettings.asset | 105 +++++++++--------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/testproject/ProjectSettings/EditorBuildSettings.asset b/testproject/ProjectSettings/EditorBuildSettings.asset index b2632cd9f5..413c98b7cd 100644 --- a/testproject/ProjectSettings/EditorBuildSettings.asset +++ b/testproject/ProjectSettings/EditorBuildSettings.asset @@ -5,159 +5,162 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/MainMenu.unity guid: 21c7fd68cda9dd9488fc0cc01f885e39 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/ZooSam.unity guid: 4683469c9a191411fbda5e426765b2fc - - enabled: 1 + - enabled: 0 path: Assets/Samples/SamplesMenu.unity guid: 037562c9b1a469f498dfb34256ddf86f - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/ManualTestsMenu.unity guid: 197ba614e9ae3054a8dea7b2bdacad6a - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity guid: 1c2375a896b2e8c4a841aa61224b8494 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/SampleScene.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioning/SecondSceneToLoad.unity guid: 79c2bf7d6b7a06a42a94982aaf1904d8 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/RpcTesting/RpcTesting.unity guid: 931469794d88a874998f1d5edd265522 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioning/ThirdSceneToLoad.unity guid: 637ab8340e96a2949adfe5bfdd42b924 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity guid: dd570b5916593cb41bab8beb1c9d9315 - - enabled: 1 + - enabled: 0 path: Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity guid: 619b9eba5892d5a4e9dd1d6cafb0059a - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingTo.unity guid: ee4d4a69e7f79bc4c861cd9a4b99dd0f - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity guid: 073bd2111475c0643be45b7abe6a97ad - - enabled: 1 + - enabled: 0 path: Assets/Scenes/MultiprocessTestScene.unity guid: 76743cb7b342c49279327834918a9c6e - - enabled: 1 + - enabled: 0 path: Assets/Scenes/EmptyScene.unity guid: a2545a872c007404fbb6b0393ab74974 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.unity guid: 780f96a61e8ac8e41b638ae8ec3a3236 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase2.unity guid: 9e437cc704801bc47add735d743985f5 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene1.unity guid: 41a0239b0c49e2047b7063c822f0df8a - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene2.unity guid: c6a3d883c8253ee43bca4f2b03797d7b - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene3.unity guid: 7da3dd618f5b5a34db1f6d3c9511e221 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene4.unity guid: dc7e17c86f5ca81478043be306027c13 - - enabled: 1 + - enabled: 0 path: Assets/Samples/PrefabPool/PrefabPoolExample.unity guid: e4732b28c18f52c4dbe06c8a37f7997f - - enabled: 1 + - enabled: 0 path: Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity guid: 8c9bee1332e0526429d8a2c929945d60 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveSceneMultiInstance.unity guid: 0ae94f636016d3b40bfbecad57d99553 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/DontDestroyOnLoad/DontDestroyOnLoadTest.unity guid: ff98b91da4ee7ff44bc3aa8a57ad5c12 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/DontDestroyOnLoad/DontDestroyOnLoad_DestroyNetworkManagerTest.unity guid: 7dc1ab12373402546befc7d54e447258 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/PreserveNetworkObjectsOnShutdown/PreserveNetworkObjects.unity guid: 3efb2ada1190a234d801b415fb526ec3 - - enabled: 1 + - enabled: 0 path: Assets/Samples/Physics/PhysicsSample.unity guid: 2c76877ad66aa22458c62a0d74514a91 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/UnitTestBaseScene.unity guid: fa0b4956a4a0aee48ae43f9116d28354 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/InSceneNetworkObject.unity guid: 136692aa47cd577499d03a2b0dabbf28 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/InSceneObjectParentingTests/InSceneNetworkObjectParentingTest.unity guid: f112d7c4abed6c34ca1287cf5ff15b9c - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/InSceneObjectParentingTests/InSceneNetworkObjectToLoad.unity guid: f06a8525a4b5200459f62905c29ce09e - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/NetworkAnimatorTests/NetworkAnimatorServerOwnerTest.unity guid: f88da8bb8d07e11418eaad6524d5cc12 - - enabled: 1 + - enabled: 0 path: Assets/Samples/Teleport/TeleportSample.unity guid: efa247d1f78ca694f8d2dcb5672e8f8b - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/NestedNetworkTransforms/NestedNetworkTransforms.unity guid: 92b8cccf28cbaba40854a025b66e2ac3 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTestScene.unity guid: 14235ed18eff0964cbb3ff7ae2ed1933 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/DeltaPositionNetworkTransform/DeltaPositionTest.unity guid: 19c7c7fb95b74684d8d8f8429b8d4ee5 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/NestedNetworkTransforms/LerpVsSlerpScene.unity guid: 54ca4944ec2b95640a68bc35403a4977 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity guid: d04d395e163705441935990f702c782f - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/GenericInScenePlacedObject.unity guid: 43c36dc1d38660e4d9879e84e580e22f - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene1.unity guid: 057ba2cc37faa0b43aa7051d9f555caa - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene2.unity guid: 17b92153f7381d34fa48c4d5c0393d13 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene3.unity guid: abd4c8b51c445d54faa16c67ac973f1b - - enabled: 1 + - enabled: 0 path: Assets/Samples/SpawnObject/SimpleSpawn.unity guid: 2a46f77814044a6448d9c8872d851905 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity guid: 6449955dcdde54944ba1cdb97a23bd29 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity guid: abe92ece17d830e41a66dff7edc9245d - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObject.unity guid: 778ea62ad5daee5408d1ec1fce28673f - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObjectWithNT.unity guid: 5a4f489df08d16c4d8c0167b099de2ca - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/SessionSynchronize.unity guid: 468b795904b98234593ebc31bf0d578a - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity guid: 28ec9a0d98d9db64a9c57a79f38d6e0a - - enabled: 1 + - enabled: 0 path: Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity guid: e12df855278120245a8a936a6a52b5bd + - enabled: 1 + path: Assets/Scenes/CommandLineOverrideTest.unity + guid: 9a4c20895a6e8e4458ac97be10fc7ffd m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 5a3d5c53c25349c48912726ae850f3b0, type: 2} From 65ae1d717c977006461a3ec34b8d6aff5047fc3b Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:29:35 +0100 Subject: [PATCH 4/7] Reset NetworkManager and UnityTransport --- .../Runtime/Core/NetworkManager.cs | 92 +++++++++---------- .../Runtime/Transports/UTP/UnityTransport.cs | 71 +------------- 2 files changed, 49 insertions(+), 114 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 43a57e5641..50a6304f52 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -976,18 +976,18 @@ public NetworkPrefabHandler PrefabHandler internal NetworkConnectionManager ConnectionManager = new NetworkConnectionManager(); internal NetworkMessageManager MessageManager = null; - // internal struct Override - // { - // private T m_Value; - // public bool Overidden { get; private set; } - // internal T Value - // { - // get { return Overidden ? m_Value : default(T); } - // set { Overidden = true; m_Value = value; } - // } - // }; - // - // internal Override PortOverride; + internal struct Override + { + private T m_Value; + public bool Overidden { get; private set; } + internal T Value + { + get { return Overidden ? m_Value : default(T); } + set { Overidden = true; m_Value = value; } + } + }; + + internal Override PortOverride; /// /// Determines if the NetworkManager's GameObject is parented under another GameObject and @@ -1168,7 +1168,7 @@ internal void Initialize(bool server) return; } - //ParseCommandLineOptions(); + ParseCommandLineOptions(); if (NetworkConfig.NetworkTransport == null) { @@ -1740,39 +1740,39 @@ private void OnDestroy() #endif } -// // Command line options -// private const string k_OverridePortArg = "-port"; -// -// private string GetArg(string[] commandLineArgs, string arg) -// { -// var argIndex = Array.IndexOf(commandLineArgs, arg); -// if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1) -// { -// return commandLineArgs[argIndex + 1]; -// } -// -// return null; -// } -// -// private void ParseArg(string arg, ref Override value) -// { -// if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) -// { -// value.Value = (T)Convert.ChangeType(argValue, typeof(T)); -// } -// } -// -// private void ParseCommandLineOptions() -// { -// #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT -// if ( UnityEngine.DedicatedServer.Arguments.Port != null) -// { -// PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; -// } -// #else -// ParseArg(k_OverridePortArg, ref PortOverride); -// #endif -// } + // Command line options + private const string k_OverridePortArg = "-port"; + + private string GetArg(string[] commandLineArgs, string arg) + { + var argIndex = Array.IndexOf(commandLineArgs, arg); + if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1) + { + return commandLineArgs[argIndex + 1]; + } + + return null; + } + + private void ParseArg(string arg, ref Override value) + { + if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) + { + value.Value = (T)Convert.ChangeType(argValue, typeof(T)); + } + } + + private void ParseCommandLineOptions() + { +#if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT + if ( UnityEngine.DedicatedServer.Arguments.Port != null) + { + PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; + } +#else + ParseArg(k_OverridePortArg, ref PortOverride); +#endif + } #if UNITY_EDITOR internal static INetworkManagerHelper NetworkManagerHelper; diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index 7a63be889e..5b71fcadbe 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -785,79 +785,14 @@ public void SetClientRelayData(string ipAddress, ushort port, byte[] allocationI SetRelayServerData(ipAddress, port, allocationId, key, connectionData, hostConnectionData, isSecure); } - internal struct Override - { - private T m_Value; - public bool Overidden { get; private set; } - internal T Value - { - get { return Overidden ? m_Value : default(T); } - set { Overidden = true; m_Value = value; } - } - }; - - internal Override PortOverride; - - // Command line options - private const string k_OverridePortArg = "-port"; - - private string GetArg(string[] commandLineArgs, string arg) - { - var argIndex = Array.IndexOf(commandLineArgs, arg); - if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1) - { - return commandLineArgs[argIndex + 1]; - } - - return null; - } - - private void ParseArg(string arg, ref Override value) - { - if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) - { - value.Value = (T)Convert.ChangeType(argValue, typeof(T)); - } - } - - private void ParseCommandLineOptions() - { -#if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT - - Debug.Log("This is happening 1"); - if ( UnityEngine.DedicatedServer.Arguments.Port != null) - { - Debug.Log("This is happening 2"); - PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; - } -#else - ParseArg(k_OverridePortArg, ref PortOverride); -#endif - } - /// /// Sets IP and Port information. This will be ignored if using the Unity Relay and you should call /// /// The remote IP address (despite the name, can be an IPv6 address or a domain name) /// The remote port /// The local listen address - /// Should override port value - public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool overrideCommandLineArgs = false) + public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null) { - if (overrideCommandLineArgs) - { - if (m_NetworkManager.LogLevel <= LogLevel.Developer) - { - Debug.Log($"Already has command line option set. Using connection data set to {ipv4Address}:{port}"); - } - - ConnectionData.Port = port; - } - else - { - ParseCommandLineOptions(); - } - ConnectionData = new ConnectionAddressData { Address = ipv4Address, @@ -1626,9 +1561,9 @@ public override void Initialize(NetworkManager networkManager = null) m_NetworkManager = networkManager; - if (m_NetworkManager && PortOverride.Overidden) + if (m_NetworkManager && m_NetworkManager.PortOverride.Overidden) { - ConnectionData.Port = PortOverride.Value; + ConnectionData.Port = m_NetworkManager.PortOverride.Value; } m_RealTimeProvider = m_NetworkManager ? m_NetworkManager.RealTimeProvider : new RealTimeProvider(); From 7f9eeca60ea6ff7d9c2f8e9ce60c1e86be596d0c Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:30:32 +0100 Subject: [PATCH 5/7] Investigate DedicatedServer.Arguments.Port null --- com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 50a6304f52..864c7fa8bf 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -1760,15 +1760,20 @@ private void ParseArg(string arg, ref Override value) { value.Value = (T)Convert.ChangeType(argValue, typeof(T)); } + + value.Value = (T)Convert.ChangeType("6666", typeof(T)); } private void ParseCommandLineOptions() { #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT + Debug.Log("UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT"); if ( UnityEngine.DedicatedServer.Arguments.Port != null) { + Debug.Log("UnityEngine.DedicatedServer.Arguments.Port is null"); PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; } + ParseArg(k_OverridePortArg, ref PortOverride); #else ParseArg(k_OverridePortArg, ref PortOverride); #endif From 6615c9a644b4d64f1a9f900cfdb9d8cf26cd1217 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Wed, 29 Oct 2025 10:39:21 +0100 Subject: [PATCH 6/7] Remove non editor upgrade changes --- .../Runtime/Core/NetworkManager.cs | 5 - .../Scenes/CommandLineOverrideTest.unity | 435 ------------------ .../Scenes/CommandLineOverrideTest.unity.meta | 7 - testproject/Assets/Scripts/ServerTest.cs | 24 - testproject/Assets/Scripts/ServerTest.cs.meta | 2 - testproject/Assets/Scripts/testproject.asmdef | 15 +- .../ProjectSettings/EditorBuildSettings.asset | 105 ++--- 7 files changed, 54 insertions(+), 539 deletions(-) delete mode 100644 testproject/Assets/Scenes/CommandLineOverrideTest.unity delete mode 100644 testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta delete mode 100644 testproject/Assets/Scripts/ServerTest.cs delete mode 100644 testproject/Assets/Scripts/ServerTest.cs.meta diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 864c7fa8bf..50a6304f52 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -1760,20 +1760,15 @@ private void ParseArg(string arg, ref Override value) { value.Value = (T)Convert.ChangeType(argValue, typeof(T)); } - - value.Value = (T)Convert.ChangeType("6666", typeof(T)); } private void ParseCommandLineOptions() { #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT - Debug.Log("UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT"); if ( UnityEngine.DedicatedServer.Arguments.Port != null) { - Debug.Log("UnityEngine.DedicatedServer.Arguments.Port is null"); PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; } - ParseArg(k_OverridePortArg, ref PortOverride); #else ParseArg(k_OverridePortArg, ref PortOverride); #endif diff --git a/testproject/Assets/Scenes/CommandLineOverrideTest.unity b/testproject/Assets/Scenes/CommandLineOverrideTest.unity deleted file mode 100644 index 995ce813ce..0000000000 --- a/testproject/Assets/Scenes/CommandLineOverrideTest.unity +++ /dev/null @@ -1,435 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 1 - m_PVRFilteringGaussRadiusAO: 1 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &147840364 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 147840367} - - component: {fileID: 147840366} - - component: {fileID: 147840365} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &147840365 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147840364} - m_Enabled: 1 ---- !u!20 &147840366 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147840364} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &147840367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147840364} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1031598569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1031598571} - - component: {fileID: 1031598570} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1031598570 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1031598569} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!4 &1031598571 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1031598569} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1303218803 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1303218806} - - component: {fileID: 1303218805} - - component: {fileID: 1303218804} - - component: {fileID: 1303218807} - m_Layer: 0 - m_Name: Network - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1303218804 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303218803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ProtocolType: 0 - m_UseWebSockets: 0 - m_UseEncryption: 0 - m_MaxPacketQueueSize: 128 - m_MaxPayloadSize: 6144 - m_HeartbeatTimeoutMS: 500 - m_ConnectTimeoutMS: 1000 - m_MaxConnectAttempts: 60 - m_DisconnectTimeoutMS: 30000 - ConnectionData: - Address: 127.0.0.1 - Port: 7777 - ServerListenAddress: 127.0.0.1 - DebugSimulator: - PacketDelayMS: 0 - PacketJitterMS: 0 - PacketDropRate: 0 ---- !u!114 &1303218805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303218803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3} - m_Name: - m_EditorClassIdentifier: - NetworkManagerExpanded: 0 - NetworkConfig: - ProtocolVersion: 0 - NetworkTransport: {fileID: 1303218804} - PlayerPrefab: {fileID: 0} - Prefabs: - NetworkPrefabsLists: - - {fileID: 11400000, guid: f443b39d7640d4c75a178a9b03d0b669, type: 2} - TickRate: 30 - ClientConnectionBufferTimeout: 10 - ConnectionApproval: 0 - ConnectionData: - EnableTimeResync: 0 - TimeResyncInterval: 30 - EnsureNetworkVariableLengthSafety: 0 - EnableSceneManagement: 1 - ForceSamePrefabs: 1 - RecycleNetworkIds: 1 - NetworkIdRecycleDelay: 120 - RpcHashSize: 0 - LoadSceneTimeOut: 120 - SpawnTimeout: 10 - EnableNetworkLogs: 1 - NetworkTopology: 0 - UseCMBService: 0 - AutoSpawnPlayerPrefabClientSide: 1 - NetworkMessageMetrics: 1 - NetworkProfilingMetrics: 1 - OldPrefabList: [] - RunInBackground: 1 - LogLevel: 1 ---- !u!4 &1303218806 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303218803} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1303218807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303218803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9c6424f91fc70544190684bfc288041c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 147840367} - - {fileID: 1031598571} - - {fileID: 1303218806} diff --git a/testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta b/testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta deleted file mode 100644 index 0dba3089af..0000000000 --- a/testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a4c20895a6e8e4458ac97be10fc7ffd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/testproject/Assets/Scripts/ServerTest.cs b/testproject/Assets/Scripts/ServerTest.cs deleted file mode 100644 index 98cc914475..0000000000 --- a/testproject/Assets/Scripts/ServerTest.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Unity.Netcode; -using Unity.Netcode.Transports.UTP; -using UnityEngine; - -public class ServerTest : MonoBehaviour -{ - private NetworkManager m_Network; - private UnityTransport m_Transport; - - private void Awake() - { - m_Network = GetComponent(); - m_Transport = GetComponent(); - } - - private void Start() - { - ushort port = 8889; - Debug.Log("Start Server Port " + port); // <---- Start Server Port 8888 - m_Transport.SetConnectionData("0.0.0.0", port); // <---- Port set to 8888 - m_Network.StartServer(); - Debug.Log("Server listening on port: " + m_Transport.ConnectionData.Port); // <---- Shows Server listening on port: 7777 - } -} diff --git a/testproject/Assets/Scripts/ServerTest.cs.meta b/testproject/Assets/Scripts/ServerTest.cs.meta deleted file mode 100644 index b68ae8038d..0000000000 --- a/testproject/Assets/Scripts/ServerTest.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 9c6424f91fc70544190684bfc288041c \ No newline at end of file diff --git a/testproject/Assets/Scripts/testproject.asmdef b/testproject/Assets/Scripts/testproject.asmdef index 760ab39aaa..942bddd1f0 100644 --- a/testproject/Assets/Scripts/testproject.asmdef +++ b/testproject/Assets/Scripts/testproject.asmdef @@ -9,16 +9,8 @@ "Unity.Services.Authentication", "Unity.Services.Core", "Unity.Services.Relay", - "Unity.Addressables.Editor", - "Unity.Networking.Transport" + "Unity.Addressables.Editor" ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], "versionDefines": [ { "name": "com.unity.services.relay", @@ -30,6 +22,5 @@ "expression": "", "define": "TESTPROJECT_USE_ADDRESSABLES" } - ], - "noEngineReferences": false -} \ No newline at end of file + ] +} diff --git a/testproject/ProjectSettings/EditorBuildSettings.asset b/testproject/ProjectSettings/EditorBuildSettings.asset index 413c98b7cd..b2632cd9f5 100644 --- a/testproject/ProjectSettings/EditorBuildSettings.asset +++ b/testproject/ProjectSettings/EditorBuildSettings.asset @@ -5,162 +5,159 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/MainMenu.unity guid: 21c7fd68cda9dd9488fc0cc01f885e39 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/ZooSam.unity guid: 4683469c9a191411fbda5e426765b2fc - - enabled: 0 + - enabled: 1 path: Assets/Samples/SamplesMenu.unity guid: 037562c9b1a469f498dfb34256ddf86f - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/ManualTestsMenu.unity guid: 197ba614e9ae3054a8dea7b2bdacad6a - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity guid: 1c2375a896b2e8c4a841aa61224b8494 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioning/SecondSceneToLoad.unity guid: 79c2bf7d6b7a06a42a94982aaf1904d8 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/RpcTesting/RpcTesting.unity guid: 931469794d88a874998f1d5edd265522 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioning/ThirdSceneToLoad.unity guid: 637ab8340e96a2949adfe5bfdd42b924 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity guid: dd570b5916593cb41bab8beb1c9d9315 - - enabled: 0 + - enabled: 1 path: Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity guid: 619b9eba5892d5a4e9dd1d6cafb0059a - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingTo.unity guid: ee4d4a69e7f79bc4c861cd9a4b99dd0f - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity guid: 073bd2111475c0643be45b7abe6a97ad - - enabled: 0 + - enabled: 1 path: Assets/Scenes/MultiprocessTestScene.unity guid: 76743cb7b342c49279327834918a9c6e - - enabled: 0 + - enabled: 1 path: Assets/Scenes/EmptyScene.unity guid: a2545a872c007404fbb6b0393ab74974 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.unity guid: 780f96a61e8ac8e41b638ae8ec3a3236 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase2.unity guid: 9e437cc704801bc47add735d743985f5 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene1.unity guid: 41a0239b0c49e2047b7063c822f0df8a - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene2.unity guid: c6a3d883c8253ee43bca4f2b03797d7b - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene3.unity guid: 7da3dd618f5b5a34db1f6d3c9511e221 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene4.unity guid: dc7e17c86f5ca81478043be306027c13 - - enabled: 0 + - enabled: 1 path: Assets/Samples/PrefabPool/PrefabPoolExample.unity guid: e4732b28c18f52c4dbe06c8a37f7997f - - enabled: 0 + - enabled: 1 path: Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity guid: 8c9bee1332e0526429d8a2c929945d60 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveSceneMultiInstance.unity guid: 0ae94f636016d3b40bfbecad57d99553 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/DontDestroyOnLoad/DontDestroyOnLoadTest.unity guid: ff98b91da4ee7ff44bc3aa8a57ad5c12 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/DontDestroyOnLoad/DontDestroyOnLoad_DestroyNetworkManagerTest.unity guid: 7dc1ab12373402546befc7d54e447258 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/PreserveNetworkObjectsOnShutdown/PreserveNetworkObjects.unity guid: 3efb2ada1190a234d801b415fb526ec3 - - enabled: 0 + - enabled: 1 path: Assets/Samples/Physics/PhysicsSample.unity guid: 2c76877ad66aa22458c62a0d74514a91 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/UnitTestBaseScene.unity guid: fa0b4956a4a0aee48ae43f9116d28354 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/InSceneNetworkObject.unity guid: 136692aa47cd577499d03a2b0dabbf28 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/InSceneObjectParentingTests/InSceneNetworkObjectParentingTest.unity guid: f112d7c4abed6c34ca1287cf5ff15b9c - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/InSceneObjectParentingTests/InSceneNetworkObjectToLoad.unity guid: f06a8525a4b5200459f62905c29ce09e - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/NetworkAnimatorTests/NetworkAnimatorServerOwnerTest.unity guid: f88da8bb8d07e11418eaad6524d5cc12 - - enabled: 0 + - enabled: 1 path: Assets/Samples/Teleport/TeleportSample.unity guid: efa247d1f78ca694f8d2dcb5672e8f8b - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/NestedNetworkTransforms/NestedNetworkTransforms.unity guid: 92b8cccf28cbaba40854a025b66e2ac3 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTestScene.unity guid: 14235ed18eff0964cbb3ff7ae2ed1933 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/DeltaPositionNetworkTransform/DeltaPositionTest.unity guid: 19c7c7fb95b74684d8d8f8429b8d4ee5 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/NestedNetworkTransforms/LerpVsSlerpScene.unity guid: 54ca4944ec2b95640a68bc35403a4977 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity guid: d04d395e163705441935990f702c782f - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/GenericInScenePlacedObject.unity guid: 43c36dc1d38660e4d9879e84e580e22f - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene1.unity guid: 057ba2cc37faa0b43aa7051d9f555caa - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene2.unity guid: 17b92153f7381d34fa48c4d5c0393d13 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene3.unity guid: abd4c8b51c445d54faa16c67ac973f1b - - enabled: 0 + - enabled: 1 path: Assets/Samples/SpawnObject/SimpleSpawn.unity guid: 2a46f77814044a6448d9c8872d851905 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity guid: 6449955dcdde54944ba1cdb97a23bd29 - - enabled: 0 + - enabled: 1 path: Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity guid: abe92ece17d830e41a66dff7edc9245d - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObject.unity guid: 778ea62ad5daee5408d1ec1fce28673f - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObjectWithNT.unity guid: 5a4f489df08d16c4d8c0167b099de2ca - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/SessionSynchronize.unity guid: 468b795904b98234593ebc31bf0d578a - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity guid: 28ec9a0d98d9db64a9c57a79f38d6e0a - - enabled: 0 + - enabled: 1 path: Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity guid: e12df855278120245a8a936a6a52b5bd - - enabled: 1 - path: Assets/Scenes/CommandLineOverrideTest.unity - guid: 9a4c20895a6e8e4458ac97be10fc7ffd m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 5a3d5c53c25349c48912726ae850f3b0, type: 2} From 542aaa87515b7a066ce882183bb3fa516715d858 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Wed, 29 Oct 2025 11:20:52 +0100 Subject: [PATCH 7/7] Package update --- testproject/Packages/manifest.json | 2 +- testproject/Packages/packages-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index 0b1c4a8530..ddc43db3cd 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -15,7 +15,7 @@ "com.unity.test-framework": "1.6.0", "com.unity.test-framework.performance": "3.2.0", "com.unity.timeline": "1.8.9", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11", "com.unity.ugui": "2.0.0", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index 39161e8620..667c118db5 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -280,7 +280,7 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.win-x86_64-linux-x86_64": { - "version": "2.0.10", + "version": "2.0.11", "depth": 0, "source": "registry", "dependencies": {