From ceaa7e7a30dd0885f3e7d99f213e5e6bf4a1dec2 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:25:40 +0100 Subject: [PATCH 01/26] 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 02/26] 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 03/26] 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 04/26] 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 05/26] 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 06/26] 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 07/26] 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": { From 13960e3aa5f463236c050e963035ecece502a153 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 27 Oct 2025 18:25:40 +0100 Subject: [PATCH 08/26] 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 fda69993f68b4d02af02fa9e05e2477bdf85e004 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Wed, 29 Oct 2025 15:54:31 +0100 Subject: [PATCH 09/26] Clean up --- .../Runtime/Core/NetworkManager.cs | 49 ------------------- .../Runtime/Transports/UTP/UnityTransport.cs | 8 +-- testproject/Packages/manifest.json | 1 + testproject/Packages/packages-lock.json | 7 +++ 4 files changed, 12 insertions(+), 53 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs index 43a57e5641..069f31b5b4 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs @@ -976,19 +976,6 @@ 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; - /// /// Determines if the NetworkManager's GameObject is parented under another GameObject and /// notifies the user that this is not allowed for the NetworkManager. @@ -1168,8 +1155,6 @@ internal void Initialize(bool server) return; } - //ParseCommandLineOptions(); - if (NetworkConfig.NetworkTransport == null) { if (NetworkLog.CurrentLogLevel <= LogLevel.Error) @@ -1740,40 +1725,6 @@ 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 -// } - #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..a3ea2fb260 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -824,10 +824,10 @@ 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("UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT"); + if (UnityEngine.DedicatedServer.Arguments.Port != null) { - Debug.Log("This is happening 2"); + Debug.Log("UnityEngine.DedicatedServer.Arguments.Port is not null"); PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; } #else @@ -851,7 +851,7 @@ public void SetConnectionData(string ipv4Address, ushort port, string listenAddr Debug.Log($"Already has command line option set. Using connection data set to {ipv4Address}:{port}"); } - ConnectionData.Port = port; + port = ConnectionData.Port; } else { diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index ddc43db3cd..a64c607824 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -4,6 +4,7 @@ "com.unity.addressables": "2.7.4", "com.unity.ai.navigation": "2.0.9", "com.unity.collab-proxy": "2.9.3", + "com.unity.dedicated-server": "1.6.1", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.25", "com.unity.mathematics": "1.3.3", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index 667c118db5..56374f575d 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -55,6 +55,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.dedicated-server": { + "version": "1.6.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, From adb5132a7584400305d81669113337b1e91870d6 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 10:39:20 +0100 Subject: [PATCH 10/26] Reset/delete files to exlude --- .../ProjectSettings/MultiplayerManager.asset | 4 +--- .../ContentSelectionSettings.asset | 22 ------------------- .../MultiplayerRolesSettings.asset | 17 -------------- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset delete mode 100644 testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset diff --git a/testproject/ProjectSettings/MultiplayerManager.asset b/testproject/ProjectSettings/MultiplayerManager.asset index f1d03dfbac..2a936644e0 100644 --- a/testproject/ProjectSettings/MultiplayerManager.asset +++ b/testproject/ProjectSettings/MultiplayerManager.asset @@ -4,6 +4,4 @@ MultiplayerManager: m_ObjectHideFlags: 0 m_EnableMultiplayerRoles: 0 - m_StrippingTypes: - 1: [] - 2: [] + m_StrippingTypes: {} diff --git a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset deleted file mode 100644 index 6af50aac8d..0000000000 --- a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset +++ /dev/null @@ -1,22 +0,0 @@ -%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 deleted file mode 100644 index 977913f644..0000000000 --- a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset +++ /dev/null @@ -1,17 +0,0 @@ -%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: From 41928fd7e1f98894a47e13f90de761347d1cf447 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 11:29:58 +0100 Subject: [PATCH 11/26] Editor version minimalproject + Example projects 6000.0.61f1 --- .../Assets/DefaultNetworkPrefabs.asset | 10 + .../Packages/manifest.json | 21 +- .../Packages/packages-lock.json | 643 +++++++++++++++++ .../ProjectSettings/AudioManager.asset | 20 + .../ProjectSettings/ClusterInputManager.asset | 6 + .../ProjectSettings/DynamicsManager.asset | 41 ++ .../ProjectSettings/EditorSettings.asset | 49 ++ .../ProjectSettings/GraphicsSettings.asset | 66 ++ .../ProjectSettings/InputManager.asset | 296 ++++++++ .../ProjectSettings/MemorySettings.asset | 35 + .../ProjectSettings/MultiplayerManager.asset | 7 + .../ProjectSettings/NavMeshAreas.asset | 93 +++ .../PackageManagerSettings.asset | 40 ++ .../com.unity.services.core/Settings.json | 0 .../Settings.json | 5 + .../ProjectSettings/Physics2DSettings.asset | 56 ++ .../ProjectSettings/PresetManager.asset | 7 + .../ProjectSettings/ProjectVersion.txt | 2 + .../ProjectSettings/QualitySettings.asset | 341 +++++++++ .../ProjectSettings/TagManager.asset | 45 ++ .../ProjectSettings/TimeManager.asset | 14 + .../UnityConnectSettings.asset | 36 + .../ProjectSettings/VFXManager.asset | 19 + .../VersionControlSettings.asset | 7 + .../Packages/manifest.json | 20 +- .../Packages/packages-lock.json | 643 +++++++++++++++++ .../ProjectSettings/AudioManager.asset | 20 + .../PackageManagerSettings.asset | 40 ++ .../com.unity.services.core/Settings.json | 0 .../Settings.json | 5 + .../ProjectSettings/ProjectVersion.txt | 2 + .../NetStatsMonitorPanelSettings.asset | 3 + Examples/PingTool/Packages/manifest.json | 24 +- Examples/PingTool/Packages/packages-lock.json | 674 ++++++++++++++++++ .../ProjectSettings/AudioManager.asset | 20 + .../ProjectSettings/ClusterInputManager.asset | 6 + .../ProjectSettings/DynamicsManager.asset | 41 ++ .../ProjectSettings/EditorSettings.asset | 49 ++ .../ProjectSettings/GraphicsSettings.asset | 66 ++ .../ProjectSettings/InputManager.asset | 296 ++++++++ .../ProjectSettings/MemorySettings.asset | 35 + .../ProjectSettings/MultiplayerManager.asset | 7 + .../ProjectSettings/NavMeshAreas.asset | 93 +++ .../PackageManagerSettings.asset | 40 ++ .../CustomColorSettings.asset | 17 + .../com.unity.services.core/Settings.json | 0 .../Settings.json | 5 + .../ProjectSettings/Physics2DSettings.asset | 56 ++ .../ProjectSettings/PresetManager.asset | 7 + .../ProjectSettings/ProjectVersion.txt | 2 + .../ProjectSettings/QualitySettings.asset | 341 +++++++++ .../PingTool/ProjectSettings/VFXManager.asset | 19 + .../VirtualProjectsConfig.json | 4 + .../Assets/DefaultNetworkPrefabs.asset | 16 + .../Assets/DefaultNetworkPrefabs.asset.meta | 8 + minimalproject/Packages/manifest.json | 2 +- minimalproject/Packages/packages-lock.json | 100 +-- .../ProjectSettings/MemorySettings.asset | 35 + .../ProjectSettings/MultiplayerManager.asset | 7 + .../ProjectSettings/ProjectVersion.txt | 4 +- 60 files changed, 4460 insertions(+), 106 deletions(-) create mode 100644 Examples/CharacterControllerMovingBodies/Packages/packages-lock.json create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/AudioManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/ClusterInputManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/DynamicsManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/EditorSettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/GraphicsSettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/InputManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/MemorySettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/MultiplayerManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/NavMeshAreas.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/PackageManagerSettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.services.core/Settings.json create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/Physics2DSettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/PresetManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectVersion.txt create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/QualitySettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/TagManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/TimeManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/UnityConnectSettings.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/VFXManager.asset create mode 100644 Examples/CharacterControllerMovingBodies/ProjectSettings/VersionControlSettings.asset create mode 100644 Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json create mode 100644 Examples/OverridingScenesAndPrefabs/ProjectSettings/AudioManager.asset create mode 100644 Examples/OverridingScenesAndPrefabs/ProjectSettings/PackageManagerSettings.asset create mode 100644 Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.services.core/Settings.json create mode 100644 Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json create mode 100644 Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectVersion.txt create mode 100644 Examples/PingTool/Packages/packages-lock.json create mode 100644 Examples/PingTool/ProjectSettings/AudioManager.asset create mode 100644 Examples/PingTool/ProjectSettings/ClusterInputManager.asset create mode 100644 Examples/PingTool/ProjectSettings/DynamicsManager.asset create mode 100644 Examples/PingTool/ProjectSettings/EditorSettings.asset create mode 100644 Examples/PingTool/ProjectSettings/GraphicsSettings.asset create mode 100644 Examples/PingTool/ProjectSettings/InputManager.asset create mode 100644 Examples/PingTool/ProjectSettings/MemorySettings.asset create mode 100644 Examples/PingTool/ProjectSettings/MultiplayerManager.asset create mode 100644 Examples/PingTool/ProjectSettings/NavMeshAreas.asset create mode 100644 Examples/PingTool/ProjectSettings/PackageManagerSettings.asset create mode 100644 Examples/PingTool/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset create mode 100644 Examples/PingTool/ProjectSettings/Packages/com.unity.services.core/Settings.json create mode 100644 Examples/PingTool/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json create mode 100644 Examples/PingTool/ProjectSettings/Physics2DSettings.asset create mode 100644 Examples/PingTool/ProjectSettings/PresetManager.asset create mode 100644 Examples/PingTool/ProjectSettings/ProjectVersion.txt create mode 100644 Examples/PingTool/ProjectSettings/QualitySettings.asset create mode 100644 Examples/PingTool/ProjectSettings/VFXManager.asset create mode 100644 Examples/PingTool/ProjectSettings/VirtualProjectsConfig.json create mode 100644 minimalproject/Assets/DefaultNetworkPrefabs.asset create mode 100644 minimalproject/Assets/DefaultNetworkPrefabs.asset.meta create mode 100644 minimalproject/ProjectSettings/MemorySettings.asset create mode 100644 minimalproject/ProjectSettings/MultiplayerManager.asset diff --git a/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset b/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset index 073f4484e8..97d69fc5b0 100644 --- a/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset +++ b/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset @@ -29,3 +29,13 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 8921789205124766477, guid: 8ae02ac62e2067144b8ff06d48aeb47a, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/Examples/CharacterControllerMovingBodies/Packages/manifest.json b/Examples/CharacterControllerMovingBodies/Packages/manifest.json index 78d06b2065..0a8e3c4a4b 100644 --- a/Examples/CharacterControllerMovingBodies/Packages/manifest.json +++ b/Examples/CharacterControllerMovingBodies/Packages/manifest.json @@ -3,22 +3,23 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "4.4.2", - "com.unity.ai.navigation": "2.0.3", + "com.unity.ai.navigation": "2.0.9", "com.unity.analytics": "3.8.1", - "com.unity.collab-proxy": "2.4.4", + "com.unity.collab-proxy": "2.10.0", "com.unity.feature.development": "1.0.2", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.multiplayer.center": "1.0.0", "com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", "com.unity.purchasing": "4.12.2", "com.unity.services.multiplayer": "1.2.0", - "com.unity.test-framework": "1.4.5", - "com.unity.timeline": "1.8.7", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", - "com.unity.transport": "2.3.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.9", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", + "com.unity.transport": "2.6.0", "com.unity.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.4", - "com.unity.xr.legacyinputhelpers": "2.1.10", + "com.unity.visualscripting": "1.9.7", + "com.unity.xr.legacyinputhelpers": "2.1.12", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Examples/CharacterControllerMovingBodies/Packages/packages-lock.json b/Examples/CharacterControllerMovingBodies/Packages/packages-lock.json new file mode 100644 index 0000000000..c19504fc77 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/Packages/packages-lock.json @@ -0,0 +1,643 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.ads": { + "version": "4.4.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ai.navigation": { + "version": "2.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.8.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" + }, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.8.25", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.10.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "2.6.2", + "depth": 1, + "source": "registry", + "dependencies": { + "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" + }, + "com.unity.editorcoroutines": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.feature.development": { + "version": "1.0.2", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.ide.rider": "3.0.38", + "com.unity.editorcoroutines": "1.0.1", + "com.unity.performance.profile-analyzer": "1.2.4", + "com.unity.test-framework": "1.6.0", + "com.unity.testtools.codecoverage": "1.2.7" + } + }, + "com.unity.ide.rider": { + "version": "3.0.38", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.25", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.3.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.netcode.gameobjects": { + "version": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.transport": "2.6.0" + }, + "hash": "37bdf528127a9ae3e104d76b9a13343bffd653cb" + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.performance.profile-analyzer": { + "version": "1.2.4", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "4.12.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.5", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "6.1.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.4", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.authentication": { + "version": "3.5.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.15.1", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.15.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.androidjni": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment": { + "version": "1.6.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.15.1", + "com.unity.services.deployment.api": "1.1.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment.api": { + "version": "1.1.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.multiplayer": { + "version": "1.2.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.transport": "2.5.0", + "com.unity.collections": "2.2.1", + "com.unity.services.qos": "1.3.0", + "com.unity.services.core": "1.15.1", + "com.unity.services.wire": "1.4.0", + "com.unity.services.deployment": "1.6.2", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "3.5.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.qos": { + "version": "1.3.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "1.2.4", + "com.unity.services.core": "1.12.4", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "2.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.wire": { + "version": "1.4.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.12.5", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.authentication": "2.7.4" + }, + "url": "https://packages.unity.com" + }, + "com.unity.settings-manager": { + "version": "2.1.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "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.6.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.test-framework.performance": { + "version": "3.2.0", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.testtools.codecoverage": { + "version": "1.2.7", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.16", + "com.unity.settings-manager": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.8.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "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": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.24", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "2.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualscripting": { + "version": "1.9.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/AudioManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/AudioManager.asset new file mode 100644 index 0000000000..df1e8090a2 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/AudioManager.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Volume: 1 + Rolloff Scale: 1 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_SampleRate: 0 + m_DSPBufferSize: 1024 + m_VirtualVoiceCount: 512 + m_RealVoiceCount: 32 + m_EnableOutputSuspension: 1 + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: + m_DisableAudio: 0 + m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 0 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/ClusterInputManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000000..e7886b266a --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/ClusterInputManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/DynamicsManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/DynamicsManager.asset new file mode 100644 index 0000000000..118ec1920f --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/DynamicsManager.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!55 &1 +PhysicsManager: + m_ObjectHideFlags: 0 + serializedVersion: 20 + m_Gravity: {x: 0, y: -9.81, z: 0} + m_DefaultMaterial: {fileID: 0} + m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 + m_SleepThreshold: 0.005 + m_DefaultContactOffset: 0.01 + m_DefaultSolverIterations: 6 + m_DefaultSolverVelocityIterations: 1 + m_QueriesHitBackfaces: 0 + m_QueriesHitTriggers: 1 + m_EnableAdaptiveForce: 0 + m_ClothInterCollisionDistance: 0.1 + m_ClothInterCollisionStiffness: 0.2 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_SimulationMode: 0 + m_AutoSyncTransforms: 0 + m_ReuseCollisionCallbacks: 0 + m_InvokeCollisionCallbacks: 1 + m_ClothInterCollisionSettingsToggle: 0 + m_ClothGravity: {x: 0, y: -9.81, z: 0} + m_ContactPairsMode: 0 + m_BroadphaseType: 0 + m_WorldBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 256, y: 256, z: 256} + m_WorldSubdivisions: 8 + m_FrictionType: 0 + m_EnableEnhancedDeterminism: 0 + m_ImprovedPatchFriction: 0 + m_GenerateOnTriggerStayEvents: 1 + m_SolverType: 0 + m_DefaultMaxAngularSpeed: 50 + m_ScratchBufferChunkCount: 4 + m_CurrentBackendId: 4072204805 + m_FastMotionThreshold: 3.4028235e+38 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/EditorSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/EditorSettings.asset new file mode 100644 index 0000000000..6a63f223b6 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/EditorSettings.asset @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!159 &1 +EditorSettings: + m_ObjectHideFlags: 0 + serializedVersion: 14 + m_SerializationMode: 2 + m_LineEndingsForNewScripts: 2 + m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} + m_SpritePackerMode: 0 + m_SpritePackerCacheSize: 10 + m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 4 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp;java;cpp;c;mm;m;h + m_ProjectGenerationRootNamespace: + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 + m_AsyncShaderCompilation: 1 + m_PrefabModeAllowAutoSave: 1 + m_EnterPlayModeOptionsEnabled: 1 + m_EnterPlayModeOptions: 0 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 + m_UseLegacyProbeSampleCount: 0 + m_SerializeInlineMappingsOnOneLine: 1 + m_DisableCookiesInLightmapper: 0 + m_ShadowmaskStitching: 1 + m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0 + m_ReferencedClipsExactNaming: 1 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/GraphicsSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/GraphicsSettings.asset new file mode 100644 index 0000000000..7c0ea0b5c3 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/GraphicsSettings.asset @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 16 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_BrgStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_RenderPipelineGlobalSettingsMap: {} + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_LightProbeOutsideHullStrategy: 1 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/InputManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/InputManager.asset new file mode 100644 index 0000000000..8068b2058b --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/InputManager.asset @@ -0,0 +1,296 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!13 &1 +InputManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Axes: + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: a + altPositiveButton: d + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: s + altPositiveButton: w + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: mouse 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: mouse 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: mouse 2 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: space + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse X + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse Y + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse ScrollWheel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 2 + joyNum: 0 + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 1 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 2 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 3 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: enter + altNegativeButton: + altPositiveButton: space + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Cancel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + m_UsePhysicalKeys: 1 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/MemorySettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000000..5b5facecac --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/MultiplayerManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000000..2a936644e0 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/NavMeshAreas.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000000..2e2e36968e --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/NavMeshAreas.asset @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshProjectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + areas: + - name: Walkable + cost: 1 + - name: Not Walkable + cost: 1 + - name: Jump + cost: 2 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + m_LastAgentTypeID: -887442657 + m_Settings: + - serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.75 + 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_SettingNames: + - Humanoid diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/PackageManagerSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000000..a31e2cf876 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,40 @@ +%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: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 + oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 + m_Compliance: + m_Status: 0 + m_Violations: [] + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_Modified: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -924 + m_OriginalInstanceId: -926 + m_LoadAssets: 0 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.services.core/Settings.json b/Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json new file mode 100644 index 0000000000..3c7b4c18bb --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -0,0 +1,5 @@ +{ + "m_Dictionary": { + "m_DictionaryValues": [] + } +} \ No newline at end of file diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/Physics2DSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/Physics2DSettings.asset new file mode 100644 index 0000000000..c00eeb46fd --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/Physics2DSettings.asset @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!19 &1 +Physics2DSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Gravity: {x: 0, y: -9.81} + m_DefaultMaterial: {fileID: 0} + m_VelocityIterations: 8 + m_PositionIterations: 3 + m_BounceThreshold: 1 + m_MaxLinearCorrection: 0.2 + m_MaxAngularCorrection: 8 + m_MaxTranslationSpeed: 100 + m_MaxRotationSpeed: 360 + m_BaumgarteScale: 0.2 + m_BaumgarteTimeOfImpactScale: 0.75 + m_TimeToSleep: 0.5 + m_LinearSleepTolerance: 0.01 + m_AngularSleepTolerance: 2 + m_DefaultContactOffset: 0.01 + m_ContactThreshold: 0 + m_JobOptions: + serializedVersion: 2 + useMultithreading: 0 + useConsistencySorting: 0 + m_InterpolationPosesPerJob: 100 + m_NewContactsPerJob: 30 + m_CollideContactsPerJob: 100 + m_ClearFlagsPerJob: 200 + m_ClearBodyForcesPerJob: 200 + m_SyncDiscreteFixturesPerJob: 50 + m_SyncContinuousFixturesPerJob: 50 + m_FindNearestContactsPerJob: 100 + m_UpdateTriggerContactsPerJob: 100 + m_IslandSolverCostThreshold: 100 + m_IslandSolverBodyCostScale: 1 + m_IslandSolverContactCostScale: 10 + m_IslandSolverJointCostScale: 10 + m_IslandSolverBodiesPerJob: 50 + m_IslandSolverContactsPerJob: 50 + m_SimulationMode: 0 + m_SimulationLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxSubStepCount: 4 + m_MinSubStepFPS: 30 + m_UseSubStepping: 0 + m_UseSubStepContacts: 0 + m_QueriesHitTriggers: 1 + m_QueriesStartInColliders: 1 + m_CallbacksOnDisable: 1 + m_ReuseCollisionCallbacks: 1 + m_AutoSyncTransforms: 0 + m_GizmoOptions: 10 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/PresetManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000000..67a94daefe --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/PresetManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectVersion.txt b/Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000000..47df254537 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 6000.0.61f1 +m_EditorVersionWithRevision: 6000.0.61f1 (74a0adb02c31) diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/QualitySettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/QualitySettings.asset new file mode 100644 index 0000000000..55f0aea3e4 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/QualitySettings.asset @@ -0,0 +1,341 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!47 &1 +QualitySettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_CurrentQuality: 5 + m_QualitySettings: + - serializedVersion: 4 + name: Very Low + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 15 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 1 + globalTextureMipmapLimit: 1 + textureMipmapLimitSettings: [] + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 0 + realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 0.3 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Low + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 0 + realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 0.4 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 16 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Medium + pixelLightCount: 1 + shadows: 1 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 0.7 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: High + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 50 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 1 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Very High + pixelLightCount: 3 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 70 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 50 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 1.5 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 1024 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Ultra + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 255 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 100 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 2 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] + m_PerPlatformDefaultQuality: + Android: 2 + EmbeddedLinux: 5 + GameCoreScarlett: 5 + GameCoreXboxOne: 5 + Kepler: 5 + LinuxHeadlessSimulation: 5 + Nintendo Switch: 5 + Nintendo Switch 2: 5 + PS4: 5 + PS5: 5 + QNX: 5 + Server: 5 + Standalone: 5 + VisionOS: 5 + WebGL: 3 + Windows Store Apps: 5 + XboxOne: 5 + iPhone: 2 + tvOS: 2 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/TagManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/TagManager.asset new file mode 100644 index 0000000000..eb5d9aedd6 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/TagManager.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!78 &1 +TagManager: + serializedVersion: 3 + tags: [] + layers: + - Default + - TransparentFX + - Ignore Raycast + - + - Water + - UI + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + m_SortingLayers: + - name: Default + uniqueID: 0 + locked: 0 + m_RenderingLayers: + - Default diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/TimeManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/TimeManager.asset new file mode 100644 index 0000000000..2e23a1f421 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/TimeManager.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!5 &1 +TimeManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + Fixed Timestep: + m_Count: 2822399 + m_Rate: + m_Denominator: 1 + m_Numerator: 141120000 + Maximum Allowed Timestep: 0.33333334 + m_TimeScale: 1 + Maximum Particle Timestep: 0.03 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/UnityConnectSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000000..a88bee0f15 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/UnityConnectSettings.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!310 &1 +UnityConnectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 1 + m_Enabled: 0 + m_TestMode: 0 + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com + m_TestInitMode: 0 + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com + m_Enabled: 0 + m_LogBufferSize: 10 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 0 + m_TestMode: 0 + m_InitializeOnStartup: 1 + m_PackageRequiringCoreStatsPresent: 0 + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_IosGameId: + m_AndroidGameId: + m_GameIds: {} + m_GameId: + PerformanceReportingSettings: + m_Enabled: 0 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/VFXManager.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000000..a2a4a97a2f --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/VFXManager.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_EmptyShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 + m_MaxScrubTime: 30 + m_MaxCapacity: 100000000 + m_CompiledVersion: 0 + m_RuntimeVersion: 0 + m_RuntimeResources: {fileID: 0} + m_BatchEmptyLifetime: 300 diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/VersionControlSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000000..979fd8eca8 --- /dev/null +++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_TrackPackagesOutsideProject: 0 diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index e4a67ea8f3..0a8e3c4a4b 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -3,23 +3,23 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "4.4.2", - "com.unity.ai.navigation": "2.0.4", + "com.unity.ai.navigation": "2.0.9", "com.unity.analytics": "3.8.1", - "com.unity.collab-proxy": "2.5.2", + "com.unity.collab-proxy": "2.10.0", "com.unity.feature.development": "1.0.2", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", "com.unity.multiplayer.center": "1.0.0", "com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", "com.unity.purchasing": "4.12.2", "com.unity.services.multiplayer": "1.2.0", - "com.unity.test-framework": "1.4.5", - "com.unity.timeline": "1.8.7", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", - "com.unity.transport": "2.3.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.9", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", + "com.unity.transport": "2.6.0", "com.unity.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.4", - "com.unity.xr.legacyinputhelpers": "2.1.11", + "com.unity.visualscripting": "1.9.7", + "com.unity.xr.legacyinputhelpers": "2.1.12", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json b/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json new file mode 100644 index 0000000000..c19504fc77 --- /dev/null +++ b/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json @@ -0,0 +1,643 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.ads": { + "version": "4.4.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ai.navigation": { + "version": "2.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.8.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" + }, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.8.25", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.10.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "2.6.2", + "depth": 1, + "source": "registry", + "dependencies": { + "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" + }, + "com.unity.editorcoroutines": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.feature.development": { + "version": "1.0.2", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.ide.rider": "3.0.38", + "com.unity.editorcoroutines": "1.0.1", + "com.unity.performance.profile-analyzer": "1.2.4", + "com.unity.test-framework": "1.6.0", + "com.unity.testtools.codecoverage": "1.2.7" + } + }, + "com.unity.ide.rider": { + "version": "3.0.38", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.25", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.3.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.netcode.gameobjects": { + "version": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.transport": "2.6.0" + }, + "hash": "37bdf528127a9ae3e104d76b9a13343bffd653cb" + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.performance.profile-analyzer": { + "version": "1.2.4", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "4.12.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.5", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "6.1.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.4", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.authentication": { + "version": "3.5.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.15.1", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.15.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.androidjni": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment": { + "version": "1.6.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.15.1", + "com.unity.services.deployment.api": "1.1.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment.api": { + "version": "1.1.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.multiplayer": { + "version": "1.2.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.transport": "2.5.0", + "com.unity.collections": "2.2.1", + "com.unity.services.qos": "1.3.0", + "com.unity.services.core": "1.15.1", + "com.unity.services.wire": "1.4.0", + "com.unity.services.deployment": "1.6.2", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "3.5.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.qos": { + "version": "1.3.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "1.2.4", + "com.unity.services.core": "1.12.4", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "2.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.wire": { + "version": "1.4.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.12.5", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.authentication": "2.7.4" + }, + "url": "https://packages.unity.com" + }, + "com.unity.settings-manager": { + "version": "2.1.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "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.6.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.test-framework.performance": { + "version": "3.2.0", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.testtools.codecoverage": { + "version": "1.2.7", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.16", + "com.unity.settings-manager": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.8.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "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": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.24", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "2.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualscripting": { + "version": "1.9.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/AudioManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/AudioManager.asset new file mode 100644 index 0000000000..df1e8090a2 --- /dev/null +++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/AudioManager.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Volume: 1 + Rolloff Scale: 1 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_SampleRate: 0 + m_DSPBufferSize: 1024 + m_VirtualVoiceCount: 512 + m_RealVoiceCount: 32 + m_EnableOutputSuspension: 1 + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: + m_DisableAudio: 0 + m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 0 diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/PackageManagerSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000000..29fcfeb5dc --- /dev/null +++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,40 @@ +%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: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 + oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 + m_Compliance: + m_Status: 0 + m_Violations: [] + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_Modified: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -892 + m_OriginalInstanceId: -894 + m_LoadAssets: 0 diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.services.core/Settings.json b/Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json new file mode 100644 index 0000000000..3c7b4c18bb --- /dev/null +++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -0,0 +1,5 @@ +{ + "m_Dictionary": { + "m_DictionaryValues": [] + } +} \ No newline at end of file diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectVersion.txt b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000000..47df254537 --- /dev/null +++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 6000.0.61f1 +m_EditorVersionWithRevision: 6000.0.61f1 (74a0adb02c31) diff --git a/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset b/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset index 5867392d24..0f354cc1c0 100644 --- a/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset +++ b/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset @@ -41,6 +41,9 @@ MonoBehaviour: m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + m_SDFShader: {fileID: 19011, guid: 0000000000000000f000000000000000, type: 0} + m_BitmapShader: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0} + m_SpriteShader: {fileID: 19012, guid: 0000000000000000f000000000000000, type: 0} m_ICUDataAsset: {fileID: 0} forceGammaRendering: 0 textSettings: {fileID: 0} diff --git a/Examples/PingTool/Packages/manifest.json b/Examples/PingTool/Packages/manifest.json index 7c393e519c..0c5e1bb258 100644 --- a/Examples/PingTool/Packages/manifest.json +++ b/Examples/PingTool/Packages/manifest.json @@ -3,23 +3,25 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "4.4.2", - "com.unity.ai.navigation": "2.0.4", + "com.unity.ai.navigation": "2.0.9", "com.unity.analytics": "3.8.1", - "com.unity.collab-proxy": "2.5.2", + "com.unity.collab-proxy": "2.10.0", "com.unity.feature.development": "1.0.2", - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.playmode": "1.3.0", - "com.unity.multiplayer.tools": "2.2.1", + "com.unity.multiplayer.playmode": "1.6.1", + "com.unity.multiplayer.tools": "2.2.6", "com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", + "com.unity.purchasing": "4.12.2", "com.unity.services.multiplayer": "1.2.0", - "com.unity.test-framework": "1.4.5", - "com.unity.timeline": "1.8.7", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", - "com.unity.transport": "2.3.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.9", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", + "com.unity.transport": "2.6.0", "com.unity.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.4", - "com.unity.xr.legacyinputhelpers": "2.1.11", + "com.unity.visualscripting": "1.9.7", + "com.unity.xr.legacyinputhelpers": "2.1.12", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Examples/PingTool/Packages/packages-lock.json b/Examples/PingTool/Packages/packages-lock.json new file mode 100644 index 0000000000..f76bd76778 --- /dev/null +++ b/Examples/PingTool/Packages/packages-lock.json @@ -0,0 +1,674 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.ads": { + "version": "4.4.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ai.navigation": { + "version": "2.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.8.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" + }, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.8.25", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.10.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "2.6.2", + "depth": 1, + "source": "registry", + "dependencies": { + "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" + }, + "com.unity.editorcoroutines": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.feature.development": { + "version": "1.0.2", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.ide.rider": "3.0.38", + "com.unity.editorcoroutines": "1.0.1", + "com.unity.performance.profile-analyzer": "1.2.4", + "com.unity.test-framework": "1.6.0", + "com.unity.testtools.codecoverage": "1.2.7" + } + }, + "com.unity.ide.rider": { + "version": "3.0.38", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.25", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.3.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.multiplayer.playmode": { + "version": "1.6.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer.tools": { + "version": "2.2.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.18", + "com.unity.collections": "2.5.1", + "com.unity.mathematics": "1.3.2", + "com.unity.profiling.core": "1.0.2", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.modules.uielements": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.netcode.gameobjects": { + "version": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.transport": "2.6.0" + }, + "hash": "37bdf528127a9ae3e104d76b9a13343bffd653cb" + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.performance.profile-analyzer": { + "version": "1.2.4", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.profiling.core": { + "version": "1.0.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "4.12.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.5", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "6.1.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.4", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.authentication": { + "version": "3.5.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.15.1", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.15.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.androidjni": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment": { + "version": "1.6.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.15.1", + "com.unity.services.deployment.api": "1.1.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment.api": { + "version": "1.1.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.multiplayer": { + "version": "1.2.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.transport": "2.5.0", + "com.unity.collections": "2.2.1", + "com.unity.services.qos": "1.3.0", + "com.unity.services.core": "1.15.1", + "com.unity.services.wire": "1.4.0", + "com.unity.services.deployment": "1.6.2", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "3.5.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.qos": { + "version": "1.3.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "1.2.4", + "com.unity.services.core": "1.12.4", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "2.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.wire": { + "version": "1.4.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.12.5", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.authentication": "2.7.4" + }, + "url": "https://packages.unity.com" + }, + "com.unity.settings-manager": { + "version": "2.1.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "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.6.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.test-framework.performance": { + "version": "3.2.0", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.testtools.codecoverage": { + "version": "1.2.7", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.16", + "com.unity.settings-manager": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.8.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "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": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.24", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "2.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualscripting": { + "version": "1.9.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/Examples/PingTool/ProjectSettings/AudioManager.asset b/Examples/PingTool/ProjectSettings/AudioManager.asset new file mode 100644 index 0000000000..df1e8090a2 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/AudioManager.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Volume: 1 + Rolloff Scale: 1 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_SampleRate: 0 + m_DSPBufferSize: 1024 + m_VirtualVoiceCount: 512 + m_RealVoiceCount: 32 + m_EnableOutputSuspension: 1 + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: + m_DisableAudio: 0 + m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 0 diff --git a/Examples/PingTool/ProjectSettings/ClusterInputManager.asset b/Examples/PingTool/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000000..e7886b266a --- /dev/null +++ b/Examples/PingTool/ProjectSettings/ClusterInputManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/Examples/PingTool/ProjectSettings/DynamicsManager.asset b/Examples/PingTool/ProjectSettings/DynamicsManager.asset new file mode 100644 index 0000000000..118ec1920f --- /dev/null +++ b/Examples/PingTool/ProjectSettings/DynamicsManager.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!55 &1 +PhysicsManager: + m_ObjectHideFlags: 0 + serializedVersion: 20 + m_Gravity: {x: 0, y: -9.81, z: 0} + m_DefaultMaterial: {fileID: 0} + m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 + m_SleepThreshold: 0.005 + m_DefaultContactOffset: 0.01 + m_DefaultSolverIterations: 6 + m_DefaultSolverVelocityIterations: 1 + m_QueriesHitBackfaces: 0 + m_QueriesHitTriggers: 1 + m_EnableAdaptiveForce: 0 + m_ClothInterCollisionDistance: 0.1 + m_ClothInterCollisionStiffness: 0.2 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_SimulationMode: 0 + m_AutoSyncTransforms: 0 + m_ReuseCollisionCallbacks: 0 + m_InvokeCollisionCallbacks: 1 + m_ClothInterCollisionSettingsToggle: 0 + m_ClothGravity: {x: 0, y: -9.81, z: 0} + m_ContactPairsMode: 0 + m_BroadphaseType: 0 + m_WorldBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 256, y: 256, z: 256} + m_WorldSubdivisions: 8 + m_FrictionType: 0 + m_EnableEnhancedDeterminism: 0 + m_ImprovedPatchFriction: 0 + m_GenerateOnTriggerStayEvents: 1 + m_SolverType: 0 + m_DefaultMaxAngularSpeed: 50 + m_ScratchBufferChunkCount: 4 + m_CurrentBackendId: 4072204805 + m_FastMotionThreshold: 3.4028235e+38 diff --git a/Examples/PingTool/ProjectSettings/EditorSettings.asset b/Examples/PingTool/ProjectSettings/EditorSettings.asset new file mode 100644 index 0000000000..6a63f223b6 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/EditorSettings.asset @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!159 &1 +EditorSettings: + m_ObjectHideFlags: 0 + serializedVersion: 14 + m_SerializationMode: 2 + m_LineEndingsForNewScripts: 2 + m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} + m_SpritePackerMode: 0 + m_SpritePackerCacheSize: 10 + m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 4 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp;java;cpp;c;mm;m;h + m_ProjectGenerationRootNamespace: + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 + m_AsyncShaderCompilation: 1 + m_PrefabModeAllowAutoSave: 1 + m_EnterPlayModeOptionsEnabled: 1 + m_EnterPlayModeOptions: 0 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 + m_UseLegacyProbeSampleCount: 0 + m_SerializeInlineMappingsOnOneLine: 1 + m_DisableCookiesInLightmapper: 0 + m_ShadowmaskStitching: 1 + m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0 + m_ReferencedClipsExactNaming: 1 diff --git a/Examples/PingTool/ProjectSettings/GraphicsSettings.asset b/Examples/PingTool/ProjectSettings/GraphicsSettings.asset new file mode 100644 index 0000000000..7c0ea0b5c3 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/GraphicsSettings.asset @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 16 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_BrgStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_RenderPipelineGlobalSettingsMap: {} + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_LightProbeOutsideHullStrategy: 1 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/Examples/PingTool/ProjectSettings/InputManager.asset b/Examples/PingTool/ProjectSettings/InputManager.asset new file mode 100644 index 0000000000..8068b2058b --- /dev/null +++ b/Examples/PingTool/ProjectSettings/InputManager.asset @@ -0,0 +1,296 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!13 &1 +InputManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Axes: + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: a + altPositiveButton: d + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: s + altPositiveButton: w + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: mouse 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: mouse 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: mouse 2 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: space + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse X + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse Y + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse ScrollWheel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 2 + joyNum: 0 + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 1 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 2 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 3 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: enter + altNegativeButton: + altPositiveButton: space + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Cancel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + m_UsePhysicalKeys: 1 diff --git a/Examples/PingTool/ProjectSettings/MemorySettings.asset b/Examples/PingTool/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000000..5b5facecac --- /dev/null +++ b/Examples/PingTool/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/Examples/PingTool/ProjectSettings/MultiplayerManager.asset b/Examples/PingTool/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000000..2a936644e0 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/Examples/PingTool/ProjectSettings/NavMeshAreas.asset b/Examples/PingTool/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000000..2e2e36968e --- /dev/null +++ b/Examples/PingTool/ProjectSettings/NavMeshAreas.asset @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshProjectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + areas: + - name: Walkable + cost: 1 + - name: Not Walkable + cost: 1 + - name: Jump + cost: 2 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + m_LastAgentTypeID: -887442657 + m_Settings: + - serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.75 + 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_SettingNames: + - Humanoid diff --git a/Examples/PingTool/ProjectSettings/PackageManagerSettings.asset b/Examples/PingTool/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000000..9f91f86d32 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,40 @@ +%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: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 + oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 + m_Compliance: + m_Status: 0 + m_Violations: [] + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_Modified: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -916 + m_OriginalInstanceId: -918 + m_LoadAssets: 0 diff --git a/Examples/PingTool/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset b/Examples/PingTool/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset new file mode 100644 index 0000000000..0f059e0cd3 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.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: 6762c37d3236e2a4382cd018dcdf221e, type: 3} + m_Name: + m_EditorClassIdentifier: + colors: + m_Keys: + m_Values: [] diff --git a/Examples/PingTool/ProjectSettings/Packages/com.unity.services.core/Settings.json b/Examples/PingTool/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Examples/PingTool/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/Examples/PingTool/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json new file mode 100644 index 0000000000..3c7b4c18bb --- /dev/null +++ b/Examples/PingTool/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -0,0 +1,5 @@ +{ + "m_Dictionary": { + "m_DictionaryValues": [] + } +} \ No newline at end of file diff --git a/Examples/PingTool/ProjectSettings/Physics2DSettings.asset b/Examples/PingTool/ProjectSettings/Physics2DSettings.asset new file mode 100644 index 0000000000..c00eeb46fd --- /dev/null +++ b/Examples/PingTool/ProjectSettings/Physics2DSettings.asset @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!19 &1 +Physics2DSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Gravity: {x: 0, y: -9.81} + m_DefaultMaterial: {fileID: 0} + m_VelocityIterations: 8 + m_PositionIterations: 3 + m_BounceThreshold: 1 + m_MaxLinearCorrection: 0.2 + m_MaxAngularCorrection: 8 + m_MaxTranslationSpeed: 100 + m_MaxRotationSpeed: 360 + m_BaumgarteScale: 0.2 + m_BaumgarteTimeOfImpactScale: 0.75 + m_TimeToSleep: 0.5 + m_LinearSleepTolerance: 0.01 + m_AngularSleepTolerance: 2 + m_DefaultContactOffset: 0.01 + m_ContactThreshold: 0 + m_JobOptions: + serializedVersion: 2 + useMultithreading: 0 + useConsistencySorting: 0 + m_InterpolationPosesPerJob: 100 + m_NewContactsPerJob: 30 + m_CollideContactsPerJob: 100 + m_ClearFlagsPerJob: 200 + m_ClearBodyForcesPerJob: 200 + m_SyncDiscreteFixturesPerJob: 50 + m_SyncContinuousFixturesPerJob: 50 + m_FindNearestContactsPerJob: 100 + m_UpdateTriggerContactsPerJob: 100 + m_IslandSolverCostThreshold: 100 + m_IslandSolverBodyCostScale: 1 + m_IslandSolverContactCostScale: 10 + m_IslandSolverJointCostScale: 10 + m_IslandSolverBodiesPerJob: 50 + m_IslandSolverContactsPerJob: 50 + m_SimulationMode: 0 + m_SimulationLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxSubStepCount: 4 + m_MinSubStepFPS: 30 + m_UseSubStepping: 0 + m_UseSubStepContacts: 0 + m_QueriesHitTriggers: 1 + m_QueriesStartInColliders: 1 + m_CallbacksOnDisable: 1 + m_ReuseCollisionCallbacks: 1 + m_AutoSyncTransforms: 0 + m_GizmoOptions: 10 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/Examples/PingTool/ProjectSettings/PresetManager.asset b/Examples/PingTool/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000000..67a94daefe --- /dev/null +++ b/Examples/PingTool/ProjectSettings/PresetManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/Examples/PingTool/ProjectSettings/ProjectVersion.txt b/Examples/PingTool/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000000..47df254537 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 6000.0.61f1 +m_EditorVersionWithRevision: 6000.0.61f1 (74a0adb02c31) diff --git a/Examples/PingTool/ProjectSettings/QualitySettings.asset b/Examples/PingTool/ProjectSettings/QualitySettings.asset new file mode 100644 index 0000000000..55f0aea3e4 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/QualitySettings.asset @@ -0,0 +1,341 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!47 &1 +QualitySettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_CurrentQuality: 5 + m_QualitySettings: + - serializedVersion: 4 + name: Very Low + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 15 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 1 + globalTextureMipmapLimit: 1 + textureMipmapLimitSettings: [] + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 0 + realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 0.3 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Low + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 0 + realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 0.4 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 16 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Medium + pixelLightCount: 1 + shadows: 1 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 0.7 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: High + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 50 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 1 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Very High + pixelLightCount: 3 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 70 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 50 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 1.5 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 1024 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + - serializedVersion: 4 + name: Ultra + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 255 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 0 + adaptiveVsync: 0 + vSyncCount: 1 + realtimeGICPUUsage: 100 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 2 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] + m_PerPlatformDefaultQuality: + Android: 2 + EmbeddedLinux: 5 + GameCoreScarlett: 5 + GameCoreXboxOne: 5 + Kepler: 5 + LinuxHeadlessSimulation: 5 + Nintendo Switch: 5 + Nintendo Switch 2: 5 + PS4: 5 + PS5: 5 + QNX: 5 + Server: 5 + Standalone: 5 + VisionOS: 5 + WebGL: 3 + Windows Store Apps: 5 + XboxOne: 5 + iPhone: 2 + tvOS: 2 diff --git a/Examples/PingTool/ProjectSettings/VFXManager.asset b/Examples/PingTool/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000000..a2a4a97a2f --- /dev/null +++ b/Examples/PingTool/ProjectSettings/VFXManager.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_EmptyShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 + m_MaxScrubTime: 30 + m_MaxCapacity: 100000000 + m_CompiledVersion: 0 + m_RuntimeVersion: 0 + m_RuntimeResources: {fileID: 0} + m_BatchEmptyLifetime: 300 diff --git a/Examples/PingTool/ProjectSettings/VirtualProjectsConfig.json b/Examples/PingTool/ProjectSettings/VirtualProjectsConfig.json new file mode 100644 index 0000000000..4ea16eb5a7 --- /dev/null +++ b/Examples/PingTool/ProjectSettings/VirtualProjectsConfig.json @@ -0,0 +1,4 @@ +{ + "PlayerTags": [], + "version": "1.6.1" +} \ No newline at end of file diff --git a/minimalproject/Assets/DefaultNetworkPrefabs.asset b/minimalproject/Assets/DefaultNetworkPrefabs.asset new file mode 100644 index 0000000000..0b6f21b5e9 --- /dev/null +++ b/minimalproject/Assets/DefaultNetworkPrefabs.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: e651dbb3fbac04af2b8f5abf007ddc23, type: 3} + m_Name: DefaultNetworkPrefabs + m_EditorClassIdentifier: + IsDefault: 1 + List: [] diff --git a/minimalproject/Assets/DefaultNetworkPrefabs.asset.meta b/minimalproject/Assets/DefaultNetworkPrefabs.asset.meta new file mode 100644 index 0000000000..412ac72ab2 --- /dev/null +++ b/minimalproject/Assets/DefaultNetworkPrefabs.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2d77875a79abd4438fdb0ab643d3582 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json index 367f882e2b..6556fd319a 100644 --- a/minimalproject/Packages/manifest.json +++ b/minimalproject/Packages/manifest.json @@ -1,7 +1,7 @@ { "disableProjectUpdate": false, "dependencies": { - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.38", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects" }, "testables": [ diff --git a/minimalproject/Packages/packages-lock.json b/minimalproject/Packages/packages-lock.json index d0ad6ca622..5b95287ae1 100644 --- a/minimalproject/Packages/packages-lock.json +++ b/minimalproject/Packages/packages-lock.json @@ -1,16 +1,7 @@ { "dependencies": { - "com.unity.ai.navigation": { - "version": "2.0.5", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.ai": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.burst": { - "version": "1.8.19", + "version": "1.8.25", "depth": 2, "source": "registry", "dependencies": { @@ -20,22 +11,31 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.6.2", "depth": 2, "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" }, "com.unity.ext.nunit": { "version": "2.0.5", - "depth": 4, + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.ide.rider": { + "version": "3.0.38", + "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, "url": "https://packages.unity.com" }, "com.unity.mathematics": { @@ -45,108 +45,64 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.multiplayer.center": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - } - }, "com.unity.netcode.gameobjects": { "version": "file:../../com.unity.netcode.gameobjects", "depth": 0, "source": "local", "dependencies": { "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.transport": "2.4.0" + "com.unity.transport": "2.6.0" } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.4.6", + "version": "1.6.0", "depth": 3, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.2.0", "depth": 3, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.4.0", + "version": "2.6.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.12", + "com.unity.burst": "1.8.24", "com.unity.collections": "2.2.1", - "com.unity.mathematics": "1.3.1" + "com.unity.mathematics": "1.3.2" }, "url": "https://packages.unity.com" }, - "com.unity.modules.accessibility": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.ai": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.hierarchycore": { - "version": "1.0.0", - "depth": 2, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.imgui": { "version": "1.0.0", - "depth": 2, + "depth": 4, "source": "builtin", "dependencies": {} }, "com.unity.modules.jsonserialize": { "version": "1.0.0", - "depth": 2, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.ui": { - "version": "1.0.0", - "depth": 2, + "depth": 3, "source": "builtin", "dependencies": {} - }, - "com.unity.modules.uielements": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" - } } } } diff --git a/minimalproject/ProjectSettings/MemorySettings.asset b/minimalproject/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000000..5b5facecac --- /dev/null +++ b/minimalproject/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/minimalproject/ProjectSettings/MultiplayerManager.asset b/minimalproject/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000000..2a936644e0 --- /dev/null +++ b/minimalproject/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/minimalproject/ProjectSettings/ProjectVersion.txt b/minimalproject/ProjectSettings/ProjectVersion.txt index 307f912404..47df254537 100644 --- a/minimalproject/ProjectSettings/ProjectVersion.txt +++ b/minimalproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.38f1 -m_EditorVersionWithRevision: 6000.0.38f1 (82314a941f2d) +m_EditorVersion: 6000.0.61f1 +m_EditorVersionWithRevision: 6000.0.61f1 (74a0adb02c31) From 0e7c72b7a1d61070f636236c97d9f998fca4a3e5 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 11:35:31 +0100 Subject: [PATCH 12/26] Editor upgrade testproject 6000.61f1 (latest LTS) --- testproject/Packages/manifest.json | 2 +- testproject/Packages/packages-lock.json | 2 +- testproject/ProjectSettings/ProjectVersion.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index ddc43db3cd..f7832aaad0 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -3,7 +3,7 @@ "dependencies": { "com.unity.addressables": "2.7.4", "com.unity.ai.navigation": "2.0.9", - "com.unity.collab-proxy": "2.9.3", + "com.unity.collab-proxy": "2.10.1", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.25", "com.unity.mathematics": "1.3.3", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index 667c118db5..a7e60d2362 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.9.3", + "version": "2.10.1", "depth": 0, "source": "registry", "dependencies": {}, diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt index ea02f79eaf..47df254537 100644 --- a/testproject/ProjectSettings/ProjectVersion.txt +++ b/testproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.60f1 -m_EditorVersionWithRevision: 6000.0.60f1 (61dfb374e36f) +m_EditorVersion: 6000.0.61f1 +m_EditorVersionWithRevision: 6000.0.61f1 (74a0adb02c31) From 3576a443ae33e2f1b9ec3862b0846e99d7cf167e Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 12:06:17 +0100 Subject: [PATCH 13/26] reset manifest --- testproject/Packages/manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index a64c607824..ddc43db3cd 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -4,7 +4,6 @@ "com.unity.addressables": "2.7.4", "com.unity.ai.navigation": "2.0.9", "com.unity.collab-proxy": "2.9.3", - "com.unity.dedicated-server": "1.6.1", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.25", "com.unity.mathematics": "1.3.3", From 40c2d2b58b3d3b96d2d780f5f6212edf43517c5d Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 12:16:11 +0100 Subject: [PATCH 14/26] Rename forceOverrideCommandLineArgs --- .../Runtime/Transports/UTP/UnityTransport.cs | 6 +++--- testproject/Packages/manifest.json | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index 49be7333c1..efa58eb449 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -861,10 +861,10 @@ private void ParseCommandLineOptions() /// The remote IP address (despite the name, can be an IPv6 address or a domain name). /// The remote port to connect to. /// The address the server is going to listen on. - /// Should override port value - public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool overrideCommandLineArgs = false) + /// Should override port value + public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool forceOverrideCommandLineArgs = false) { - if (overrideCommandLineArgs) + if (forceOverrideCommandLineArgs) { if (m_NetworkManager.LogLevel <= LogLevel.Developer) { diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index f7832aaad0..d4a0e4a561 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -4,6 +4,7 @@ "com.unity.addressables": "2.7.4", "com.unity.ai.navigation": "2.0.9", "com.unity.collab-proxy": "2.10.1", + "com.unity.dedicated-server": "1.6.1", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.25", "com.unity.mathematics": "1.3.3", From c48d446d811a9f218846630b4893209eaa8b477e Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 19:37:57 +0100 Subject: [PATCH 15/26] Remove Override and ParseArgs, add flag to overide --- .../Packages/manifest.json | 2 +- .../Packages/packages-lock.json | 2 +- .../ProjectSettings/ProjectSettings.asset | 6 + .../Runtime/Transports/UTP/UnityTransport.cs | 59 ++++------ testproject/Assets/Scripts/ServerTest.cs | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 105 +++++++++--------- .../ProjectSettings/MultiplayerManager.asset | 6 +- .../ContentSelectionSettings.asset | 22 ++++ .../MultiplayerRolesSettings.asset | 18 +++ .../ProjectSettings/ProjectSettings.asset | 5 + 10 files changed, 134 insertions(+), 93 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/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index 0a8e3c4a4b..83066a5321 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -15,7 +15,7 @@ "com.unity.services.multiplayer": "1.2.0", "com.unity.test-framework": "1.6.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.transport": "2.6.0", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.7", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json b/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json index c19504fc77..5c7264b424 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json @@ -334,7 +334,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": { diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset index 7894df05ea..c320fe4d01 100644 --- a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset +++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 1 androidDefaultWindowWidth: 1920 @@ -86,6 +87,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -271,6 +273,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -398,6 +403,7 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index efa58eb449..23815128f5 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -805,19 +805,6 @@ 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"; @@ -832,15 +819,7 @@ private string GetArg(string[] commandLineArgs, string arg) 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() + private bool ParseCommandLineOptions(out int port) { #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT @@ -848,11 +827,19 @@ private void ParseCommandLineOptions() if (UnityEngine.DedicatedServer.Arguments.Port != null) { Debug.Log("UnityEngine.DedicatedServer.Arguments.Port is not null"); - PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port; + port = UnityEngine.DedicatedServer.Arguments.Port.Value; + return true; } + #else - ParseArg(k_OverridePortArg, ref PortOverride); + if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) + { + port = (T)Convert.ChangeType(argValue, typeof(T)); + return true; + } #endif + port = default; + return false; } /// @@ -864,18 +851,9 @@ private void ParseCommandLineOptions() /// Should override port value public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool forceOverrideCommandLineArgs = false) { - if (forceOverrideCommandLineArgs) + if (!forceOverrideCommandLineArgs) { - if (m_NetworkManager.LogLevel <= LogLevel.Developer) - { - Debug.Log($"Already has command line option set. Using connection data set to {ipv4Address}:{port}"); - } - - port = ConnectionData.Port; - } - else - { - ParseCommandLineOptions(); + port = ParseCommandLineOptions(out var newPort) ? (ushort)newPort : ConnectionData.Port; } ConnectionData = new ConnectionAddressData @@ -1631,6 +1609,9 @@ protected override string GetDisconnectEventMessage(DisconnectEvents disconnectE return m_UnityTransportNotificationHandler.GetDisconnectEventMessage(disconnectEvent); } + + private bool m_HasForcedConnectionData; + /// /// Initializes the transport /// @@ -1647,9 +1628,13 @@ public override void Initialize(NetworkManager networkManager = null) m_NetworkManager = networkManager; - if (m_NetworkManager && PortOverride.Overidden) + if (m_HasForcedConnectionData && ParseCommandLineOptions(out var port)) { - ConnectionData.Port = PortOverride.Value; + if (m_NetworkManager?.LogLevel <= LogLevel.Developer) + { + Debug.Log($"Already has command line option set. Using connection data set to {ConnectionData.Address}:{port}"); + } + ConnectionData.Port = (ushort)port; } m_RealTimeProvider = m_NetworkManager ? m_NetworkManager.RealTimeProvider : new RealTimeProvider(); diff --git a/testproject/Assets/Scripts/ServerTest.cs b/testproject/Assets/Scripts/ServerTest.cs index 98cc914475..fd6fe98357 100644 --- a/testproject/Assets/Scripts/ServerTest.cs +++ b/testproject/Assets/Scripts/ServerTest.cs @@ -17,7 +17,7 @@ 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_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: true); // <---- 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/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} diff --git a/testproject/ProjectSettings/MultiplayerManager.asset b/testproject/ProjectSettings/MultiplayerManager.asset index 2a936644e0..3210ff9de3 100644 --- a/testproject/ProjectSettings/MultiplayerManager.asset +++ b/testproject/ProjectSettings/MultiplayerManager.asset @@ -3,5 +3,7 @@ --- !u!655991488 &1 MultiplayerManager: m_ObjectHideFlags: 0 - m_EnableMultiplayerRoles: 0 - m_StrippingTypes: {} + m_EnableMultiplayerRoles: 1 + 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..e19b80eb8e --- /dev/null +++ b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset @@ -0,0 +1,18 @@ +%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: + - 8d1e1bca926649cba89d37a4c66e8b3d + m_Values: 03000000 diff --git a/testproject/ProjectSettings/ProjectSettings.asset b/testproject/ProjectSettings/ProjectSettings.asset index 5dafbe1407..25f6daf341 100644 --- a/testproject/ProjectSettings/ProjectSettings.asset +++ b/testproject/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 @@ -86,6 +87,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -271,6 +273,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 From 78c1d4c0f739a3a5428fa80231e72fe550a338ba Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 21:01:07 +0100 Subject: [PATCH 16/26] Remove logs --- .../Runtime/Transports/UTP/UnityTransport.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index 23815128f5..b87398b79e 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -823,10 +823,8 @@ private bool ParseCommandLineOptions(out int port) { #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 not null"); port = UnityEngine.DedicatedServer.Arguments.Port.Value; return true; } From 370b459cc0b5504233c18982457d05660e2ad76f Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Mon, 3 Nov 2025 23:34:35 +0100 Subject: [PATCH 17/26] Address review comments TODO cleanup --- .../Packages/manifest.json | 2 +- .../Packages/packages-lock.json | 2 +- .../ProjectSettings/ProjectSettings.asset | 6 ------ .../Runtime/Transports/UTP/UnityTransport.cs | 17 ++++++++++------- testproject/Assets/Scripts/ServerTest.cs | 2 +- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index 83066a5321..0a8e3c4a4b 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -15,7 +15,7 @@ "com.unity.services.multiplayer": "1.2.0", "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.9", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.transport": "2.6.0", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.7", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json b/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json index 5c7264b424..c19504fc77 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json @@ -334,7 +334,7 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.win-x86_64-linux-x86_64": { - "version": "2.0.11", + "version": "2.0.10", "depth": 0, "source": "registry", "dependencies": { diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset index c320fe4d01..7894df05ea 100644 --- a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset +++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset @@ -70,7 +70,6 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 - androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 1 androidDefaultWindowWidth: 1920 @@ -87,7 +86,6 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 - audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -273,9 +271,6 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 - androidAppCategory: 3 - useAndroidAppCategory: 1 - androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -403,7 +398,6 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] - m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index b87398b79e..e4ba8851bd 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -819,13 +819,13 @@ private string GetArg(string[] commandLineArgs, string arg) return null; } - private bool ParseCommandLineOptions(out int port) + private bool ParseCommandLineOptions(out ushort port) { #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT if (UnityEngine.DedicatedServer.Arguments.Port != null) { - port = UnityEngine.DedicatedServer.Arguments.Port.Value; + port = (ushort)UnityEngine.DedicatedServer.Arguments.Port; return true; } @@ -846,12 +846,13 @@ private bool ParseCommandLineOptions(out int port) /// The remote IP address (despite the name, can be an IPv6 address or a domain name). /// The remote port to connect to. /// The address the server is going to listen on. - /// Should override port value + /// When true, any command line arguments will be ignored. public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool forceOverrideCommandLineArgs = false) { - if (!forceOverrideCommandLineArgs) + m_HasForcedConnectionData = forceOverrideCommandLineArgs; + if (!forceOverrideCommandLineArgs && ParseCommandLineOptions(out var commandLinePort)) { - port = ParseCommandLineOptions(out var newPort) ? (ushort)newPort : ConnectionData.Port; + port = commandLinePort; } ConnectionData = new ConnectionAddressData @@ -1607,7 +1608,9 @@ protected override string GetDisconnectEventMessage(DisconnectEvents disconnectE return m_UnityTransportNotificationHandler.GetDisconnectEventMessage(disconnectEvent); } - + /// + /// This is set in + /// private bool m_HasForcedConnectionData; /// @@ -1626,7 +1629,7 @@ public override void Initialize(NetworkManager networkManager = null) m_NetworkManager = networkManager; - if (m_HasForcedConnectionData && ParseCommandLineOptions(out var port)) + if (!m_HasForcedConnectionData && ParseCommandLineOptions(out var port)) { if (m_NetworkManager?.LogLevel <= LogLevel.Developer) { diff --git a/testproject/Assets/Scripts/ServerTest.cs b/testproject/Assets/Scripts/ServerTest.cs index fd6fe98357..ffe36cf1ee 100644 --- a/testproject/Assets/Scripts/ServerTest.cs +++ b/testproject/Assets/Scripts/ServerTest.cs @@ -17,7 +17,7 @@ private void Start() { ushort port = 8889; Debug.Log("Start Server Port " + port); // <---- Start Server Port 8888 - m_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: true); // <---- Port set to 8888 + // m_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: false); // <---- Port set to true 8888 false 9999 m_Network.StartServer(); Debug.Log("Server listening on port: " + m_Transport.ConnectionData.Port); // <---- Shows Server listening on port: 7777 } From 05b794c6e44f6034eb9549f93f0aea5f172d98d2 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Tue, 4 Nov 2025 10:41:26 +0100 Subject: [PATCH 18/26] Revert files --- .../Scenes/CommandLineOverrideTest.unity | 435 ------------------ .../Scenes/CommandLineOverrideTest.unity.meta | 7 - testproject/Assets/Scripts/ServerTest.cs | 24 - testproject/Assets/Scripts/ServerTest.cs.meta | 2 - testproject/Packages/manifest.json | 1 - testproject/Packages/packages-lock.json | 7 - .../ProjectSettings/EditorBuildSettings.asset | 105 ++--- .../ProjectSettings/MultiplayerManager.asset | 6 +- .../ContentSelectionSettings.asset | 22 - .../MultiplayerRolesSettings.asset | 18 - 10 files changed, 53 insertions(+), 574 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 delete mode 100644 testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset delete mode 100644 testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset 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 ffe36cf1ee..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, forceOverrideCommandLineArgs: false); // <---- Port set to true 8888 false 9999 - 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/Packages/manifest.json b/testproject/Packages/manifest.json index d4a0e4a561..f7832aaad0 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -4,7 +4,6 @@ "com.unity.addressables": "2.7.4", "com.unity.ai.navigation": "2.0.9", "com.unity.collab-proxy": "2.10.1", - "com.unity.dedicated-server": "1.6.1", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.25", "com.unity.mathematics": "1.3.3", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index 28353355dc..a7e60d2362 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -55,13 +55,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.dedicated-server": { - "version": "1.6.1", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, 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} diff --git a/testproject/ProjectSettings/MultiplayerManager.asset b/testproject/ProjectSettings/MultiplayerManager.asset index 3210ff9de3..2a936644e0 100644 --- a/testproject/ProjectSettings/MultiplayerManager.asset +++ b/testproject/ProjectSettings/MultiplayerManager.asset @@ -3,7 +3,5 @@ --- !u!655991488 &1 MultiplayerManager: m_ObjectHideFlags: 0 - m_EnableMultiplayerRoles: 1 - m_StrippingTypes: - 1: [] - 2: [] + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset b/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset deleted file mode 100644 index 6af50aac8d..0000000000 --- a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset +++ /dev/null @@ -1,22 +0,0 @@ -%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 deleted file mode 100644 index e19b80eb8e..0000000000 --- a/testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset +++ /dev/null @@ -1,18 +0,0 @@ -%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: - - 8d1e1bca926649cba89d37a4c66e8b3d - m_Values: 03000000 From ec6d03b9c89b6ea19f5065499326280427b8bed3 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Tue, 4 Nov 2025 16:51:05 +0100 Subject: [PATCH 19/26] Fix unknown arg when not dedicated server profile --- .../Runtime/Transports/UTP/UnityTransport.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index e4ba8851bd..f998febfe1 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -830,9 +830,9 @@ private bool ParseCommandLineOptions(out ushort port) } #else - if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue) + if (GetArg(Environment.GetCommandLineArgs(), k_OverridePortArg) is string argValue) { - port = (T)Convert.ChangeType(argValue, typeof(T)); + port = (ushort)Convert.ChangeType(argValue, typeof(ushort)); return true; } #endif From 4f1217686602da4387b4d958d3039215cc61b953 Mon Sep 17 00:00:00 2001 From: Noellie Velez Date: Thu, 6 Nov 2025 17:18:00 +0100 Subject: [PATCH 20/26] Revert "Revert files" + test project This reverts commit 05b794c6e44f6034eb9549f93f0aea5f172d98d2. --- testproject/Assets/PortOverrideCLI.meta | 8 + .../CLI-Override-Panel Settings.asset | 50 ++ .../CLI-Override-Panel Settings.asset.meta | 8 + .../PortOverrideCLI/CLI-Override-UI.uxml | 4 + .../PortOverrideCLI/CLI-Override-UI.uxml.meta | 10 + .../PortOverrideCLI/CLI-Override-test.cs | 37 ++ .../PortOverrideCLI/CLI-Override-test.cs.meta | 2 + .../PortOverrideCLI/CommandLineOverride.unity | 492 ++++++++++++++++++ .../CommandLineOverride.unity.meta | 7 + testproject/Assets/UI Toolkit.meta | 8 + .../Assets/UI Toolkit/UnityThemes.meta | 8 + .../UnityThemes/UnityDefaultRuntimeTheme.tss | 1 + .../UnityDefaultRuntimeTheme.tss.meta | 11 + testproject/Packages/manifest.json | 1 + testproject/Packages/packages-lock.json | 7 + .../ProjectSettings/EditorBuildSettings.asset | 105 ++-- .../ProjectSettings/MultiplayerManager.asset | 6 +- .../ContentSelectionSettings.asset | 22 + .../MultiplayerRolesSettings.asset | 18 + 19 files changed, 752 insertions(+), 53 deletions(-) create mode 100644 testproject/Assets/PortOverrideCLI.meta create mode 100644 testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset create mode 100644 testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset.meta create mode 100644 testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml create mode 100644 testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml.meta create mode 100644 testproject/Assets/PortOverrideCLI/CLI-Override-test.cs create mode 100644 testproject/Assets/PortOverrideCLI/CLI-Override-test.cs.meta create mode 100644 testproject/Assets/PortOverrideCLI/CommandLineOverride.unity create mode 100644 testproject/Assets/PortOverrideCLI/CommandLineOverride.unity.meta create mode 100644 testproject/Assets/UI Toolkit.meta create mode 100644 testproject/Assets/UI Toolkit/UnityThemes.meta create mode 100644 testproject/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss create mode 100644 testproject/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta 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/Assets/PortOverrideCLI.meta b/testproject/Assets/PortOverrideCLI.meta new file mode 100644 index 0000000000..7157d64c75 --- /dev/null +++ b/testproject/Assets/PortOverrideCLI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3feb6271b2f8293428a6231a3d427a6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset b/testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset new file mode 100644 index 0000000000..d0704c5f5f --- /dev/null +++ b/testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset @@ -0,0 +1,50 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 19101, guid: 0000000000000000e000000000000000, type: 0} + m_Name: CLI-Override-Panel Settings + m_EditorClassIdentifier: + themeUss: {fileID: -4733365628477956816, guid: d42e41277d2c0f7458e242e733a9129e, + type: 3} + m_DisableNoThemeWarning: 0 + m_TargetTexture: {fileID: 0} + m_RenderMode: 0 + m_WorldSpaceLayer: 0 + m_ScaleMode: 1 + m_ReferenceSpritePixelsPerUnit: 100 + m_PixelsPerUnit: 100 + m_Scale: 1 + m_ReferenceDpi: 96 + m_FallbackDpi: 96 + m_ReferenceResolution: {x: 1200, y: 800} + m_ScreenMatchMode: 0 + m_Match: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 + m_BindingLogLevel: 0 + m_ClearDepthStencil: 1 + m_ClearColor: 0 + m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_VertexBudget: 0 + m_DynamicAtlasSettings: + m_MinAtlasSize: 64 + m_MaxAtlasSize: 4096 + m_MaxSubTextureSize: 64 + m_ActiveFilters: -1 + m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + m_SDFShader: {fileID: 19011, guid: 0000000000000000f000000000000000, type: 0} + m_BitmapShader: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0} + m_SpriteShader: {fileID: 19012, guid: 0000000000000000f000000000000000, type: 0} + m_ICUDataAsset: {fileID: 0} + forceGammaRendering: 0 + textSettings: {fileID: 0} diff --git a/testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset.meta b/testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset.meta new file mode 100644 index 0000000000..1cabfa96f8 --- /dev/null +++ b/testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ba4aaf41204b5940b0ad51178892db1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml b/testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml new file mode 100644 index 0000000000..a55a5d1f33 --- /dev/null +++ b/testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml @@ -0,0 +1,4 @@ + + + + diff --git a/testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml.meta b/testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml.meta new file mode 100644 index 0000000000..6c0a4b02d4 --- /dev/null +++ b/testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 665cf3d7a1200d646afd1e15a37f17fa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0} diff --git a/testproject/Assets/PortOverrideCLI/CLI-Override-test.cs b/testproject/Assets/PortOverrideCLI/CLI-Override-test.cs new file mode 100644 index 0000000000..57b4957528 --- /dev/null +++ b/testproject/Assets/PortOverrideCLI/CLI-Override-test.cs @@ -0,0 +1,37 @@ +using Unity.Netcode; +using Unity.Netcode.Transports.UTP; +using UnityEngine; +using UnityEngine.UIElements; + +public class ServerTest : MonoBehaviour +{ + private NetworkManager m_Network; + private UnityTransport m_Transport; + + public UIDocument Doc; + public string First; + public string Second; + + private void Awake() + { + m_Network = GetComponent(); + m_Transport = GetComponent(); + } + + private void Start() + { + ushort port = 8889; + + First = "Start Server Port " + port; + Debug.Log(First); // <---- Start Server Port 8888 + //m_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: true); // <---- Port set to true 8888 false what is set in cli + m_Network.StartServer(); + Second = "Server listening on port: " + m_Transport.ConnectionData.Port; + Debug.Log(Second); // <---- Shows Server listening on port: 7777 + + Doc.rootVisualElement.Q