diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity b/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity index e0da42832c..c4ae260302 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity @@ -218,7 +218,7 @@ GameObject: - component: {fileID: 1102477897} - component: {fileID: 1102477896} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -245,9 +245,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!114 &1102477897 MonoBehaviour: @@ -270,22 +270,27 @@ MonoBehaviour: RegisteredScenes: - NetworkPrefabGlobalObjectIdHashTests AllowRuntimeSceneChanges: 0 + PlayerPrefab: {fileID: 0} NetworkPrefabs: - - Prefab: {fileID: 6634540090042209438, guid: 7006127095cef495b808ea027e90bf91, + - Override: 0 + Prefab: {fileID: 6634540090042209438, guid: 7006127095cef495b808ea027e90bf91, type: 3} - IsPlayer: 1 - - Prefab: {fileID: 5253977552660788477, guid: e9ff9ca5dee4e4a0e9aba758527ed56e, + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5253977552660788477, guid: e9ff9ca5dee4e4a0e9aba758527ed56e, type: 3} - IsPlayer: 0 - - Prefab: {fileID: 8106213239008607392, guid: 08036a5a809c74816892f96d72e1ca81, + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 8106213239008607392, guid: 08036a5a809c74816892f96d72e1ca81, type: 3} - IsPlayer: 0 - PlayerPrefabHash: 2044183727 - CreatePlayerPrefab: 1 - ReceiveTickrate: 64 - NetworkTickIntervalSec: 0.05 - MaxReceiveEventsPerTickRate: 500 - EventTickrate: 64 + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + TickRate: 30 ClientConnectionBufferTimeout: 10 ConnectionApproval: 0 ConnectionData: @@ -299,7 +304,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!4 &1102477898 diff --git a/testproject/Assets/MainMenu.unity b/testproject/Assets/MainMenu.unity index b07bf694ba..2e2140ad3d 100644 --- a/testproject/Assets/MainMenu.unity +++ b/testproject/Assets/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -943,7 +943,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: MLAPI Main Menu + m_Text: Netcode Main Menu --- !u!222 &1178849204 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity b/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity index bdb5cb5791..b6f45491da 100644 --- a/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity +++ b/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -631,7 +631,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -727,7 +726,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -823,7 +821,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1323,7 +1320,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1409,7 +1405,7 @@ GameObject: - component: {fileID: 1706952616} - component: {fileID: 1706952615} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1440,10 +1436,7 @@ MonoBehaviour: PlayerPrefab: {fileID: 4079352819444256614, guid: c16f03336b6104576a565ef79ad643c0, type: 3} NetworkPrefabs: [] - ReceiveTickrate: 64 - NetworkTickIntervalSec: 0.05 - MaxReceiveEventsPerTickRate: 500 - EventTickrate: 64 + TickRate: 30 ClientConnectionBufferTimeout: 10 ConnectionApproval: 0 ConnectionData: @@ -1457,7 +1450,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!114 &1706952616 @@ -1481,9 +1473,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!4 &1706952617 Transform: @@ -1622,7 +1614,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity b/testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity index b3869569bb..469ad83c59 100644 --- a/testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity +++ b/testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -265,7 +265,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -564,7 +563,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -852,7 +850,7 @@ GameObject: - component: {fileID: 1024114719} - component: {fileID: 1024114718} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -927,9 +925,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!4 &1024114720 Transform: @@ -1087,7 +1085,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1461,7 +1458,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1682,7 +1678,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity b/testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity index ec140fb1aa..d3ffd1e1ec 100644 --- a/testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity +++ b/testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -265,7 +265,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -564,7 +563,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -852,7 +850,7 @@ GameObject: - component: {fileID: 1024114719} - component: {fileID: 1024114718} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -928,9 +926,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!4 &1024114720 Transform: @@ -984,7 +982,6 @@ MonoBehaviour: - {fileID: 1991364468704639885, guid: 2ab098de4ccb3a8459b88084b29fd0ac, type: 3} - {fileID: 6137946741893414299, guid: d2bccc96d1636264fa43b546a1b617c3, type: 3} m_ObjectPoolSize: 15 - m_SynchronizeOverrides: 1 m_SpawnsPerSecond: 2 --- !u!4 &1113539280 Transform: @@ -1094,7 +1091,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1468,7 +1464,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1689,7 +1684,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/testproject/Assets/Samples/SamplesMenu.unity b/testproject/Assets/Samples/SamplesMenu.unity index 6fe81d20a1..4837d0a589 100644 --- a/testproject/Assets/Samples/SamplesMenu.unity +++ b/testproject/Assets/Samples/SamplesMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1896,7 +1896,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: MLAPI SAMPLES + m_Text: Netcode Samples --- !u!222 &1996333346 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3598,7 +3598,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: MLAPI + m_Text: Netcode Samples --- !u!222 &8786710036155684099 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/testproject/Assets/Scenes/MultiprocessTestScene.unity b/testproject/Assets/Scenes/MultiprocessTestScene.unity index c767c54cd0..5971bd488a 100644 --- a/testproject/Assets/Scenes/MultiprocessTestScene.unity +++ b/testproject/Assets/Scenes/MultiprocessTestScene.unity @@ -658,7 +658,7 @@ GameObject: - component: {fileID: 1211923377} - component: {fileID: 1211923378} m_Layer: 0 - m_Name: NetworkManager-Multiprocess + m_Name: '[NetworkManager] (Multiprocess)' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -695,10 +695,7 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} - ReceiveTickrate: 64 - NetworkTickIntervalSec: 0.05 - MaxReceiveEventsPerTickRate: -1 - EventTickrate: 64 + TickRate: 30 ClientConnectionBufferTimeout: 10 ConnectionApproval: 0 ConnectionData: @@ -712,7 +709,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!4 &1211923376 @@ -869,9 +865,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!1 &2027640071 GameObject: diff --git a/testproject/Assets/Scenes/SampleScene.unity b/testproject/Assets/Scenes/SampleScene.unity index c0c8e3e838..7a89a0777f 100644 --- a/testproject/Assets/Scenes/SampleScene.unity +++ b/testproject/Assets/Scenes/SampleScene.unity @@ -829,7 +829,7 @@ GameObject: - component: {fileID: 620561611} - component: {fileID: 620561610} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -856,9 +856,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!114 &620561611 MonoBehaviour: @@ -898,7 +898,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!4 &620561612 diff --git a/testproject/Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity b/testproject/Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity index 233c049133..6bcdf17aa8 100644 --- a/testproject/Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity +++ b/testproject/Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -388,6 +388,7 @@ MonoBehaviour: GlobalObjectIdHash: 1327782974 AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!4 &606367639 Transform: m_ObjectHideFlags: 0 @@ -500,7 +501,7 @@ GameObject: - component: {fileID: 697639107} - component: {fileID: 697639106} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -536,10 +537,7 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} - ReceiveTickrate: 64 - NetworkTickIntervalSec: 0.05 - MaxReceiveEventsPerTickRate: 500 - EventTickrate: 64 + TickRate: 30 ClientConnectionBufferTimeout: 10 ConnectionApproval: 1 ConnectionData: @@ -553,7 +551,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!114 &697639107 @@ -577,9 +574,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!4 &697639108 Transform: diff --git a/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs b/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs index 6fa3a56325..a2491102d0 100644 --- a/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs +++ b/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs @@ -164,7 +164,7 @@ private void Start() m_BeginTest = false; m_MesageSendDelay = 0.01f; - var gameObject = GameObject.Find("NetworkManager"); + var gameObject = GameObject.Find("[NetworkManager]"); if (gameObject != null) { gameObject.SetActive(false); diff --git a/testproject/Assets/Tests/Manual/ManualTestsMenu.unity b/testproject/Assets/Tests/Manual/ManualTestsMenu.unity index cfa371e60d..36a42d0221 100644 --- a/testproject/Assets/Tests/Manual/ManualTestsMenu.unity +++ b/testproject/Assets/Tests/Manual/ManualTestsMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2022,7 +2022,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: MLAPI SDK + m_Text: Netcode SDK --- !u!222 &8786710036155684099 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/testproject/Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity b/testproject/Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity index 789bda3a7f..25ad282b5b 100644 --- a/testproject/Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity +++ b/testproject/Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -363,7 +363,7 @@ GameObject: - component: {fileID: 746470209} - component: {fileID: 746470208} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -390,9 +390,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!114 &746470209 MonoBehaviour: @@ -419,10 +419,7 @@ MonoBehaviour: PlayerPrefab: {fileID: 4700706668509470175, guid: 7eeaaf9e50c0afc4dab93584a54fb0d6, type: 3} NetworkPrefabs: [] - ReceiveTickrate: 64 - NetworkTickIntervalSec: 0.05 - MaxReceiveEventsPerTickRate: 500 - EventTickrate: 64 + TickRate: 30 ClientConnectionBufferTimeout: 10 ConnectionApproval: 0 ConnectionData: @@ -436,7 +433,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!4 &746470210 @@ -586,6 +582,7 @@ MonoBehaviour: GlobalObjectIdHash: 4103035044 AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!114 &1146788460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -789,7 +786,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1146788460} - m_TargetAssemblyTypeName: MLAPI.NetworkSceneManagerCallbackTests, Assembly-CSharp + m_TargetAssemblyTypeName: Netcode.NetworkSceneManagerCallbackTests, Assembly-CSharp m_MethodName: StartHost m_Mode: 1 m_Arguments: diff --git a/testproject/Assets/Tests/Manual/RpcTesting/RpcTesting.unity b/testproject/Assets/Tests/Manual/RpcTesting/RpcTesting.unity index 8abf854678..63356502de 100644 --- a/testproject/Assets/Tests/Manual/RpcTesting/RpcTesting.unity +++ b/testproject/Assets/Tests/Manual/RpcTesting/RpcTesting.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -863,6 +863,7 @@ MonoBehaviour: GlobalObjectIdHash: 1844309308 AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!114 &1207168974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -986,7 +987,7 @@ GameObject: - component: {fileID: 1574548686} - component: {fileID: 1574548685} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1013,9 +1014,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!114 &1574548686 MonoBehaviour: @@ -1041,10 +1042,7 @@ MonoBehaviour: PlayerPrefab: {fileID: 4700706668509470175, guid: 7eeaaf9e50c0afc4dab93584a54fb0d6, type: 3} NetworkPrefabs: [] - ReceiveTickrate: 64 - NetworkTickIntervalSec: 0.05 - MaxReceiveEventsPerTickRate: 500 - EventTickrate: 64 + TickRate: 30 ClientConnectionBufferTimeout: 10 ConnectionApproval: 0 ConnectionData: @@ -1058,7 +1056,6 @@ MonoBehaviour: NetworkIdRecycleDelay: 120 RpcHashSize: 0 LoadSceneTimeOut: 120 - EnableMessageBuffering: 1 MessageBufferTimeout: 20 EnableNetworkLogs: 1 --- !u!4 &1574548687 diff --git a/testproject/Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity b/testproject/Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity index b49ad92b44..25efe0cd2c 100644 --- a/testproject/Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity +++ b/testproject/Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -318,7 +318,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -619,7 +618,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -986,7 +984,7 @@ GameObject: - component: {fileID: 1024114719} - component: {fileID: 1024114718} m_Layer: 0 - m_Name: NetworkManager + m_Name: '[NetworkManager]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1063,9 +1061,9 @@ MonoBehaviour: ServerWebsocketListenPort: 8887 SupportWebsocket: 0 Channels: [] - UseMLAPIRelay: 0 - MLAPIRelayAddress: 184.72.104.138 - MLAPIRelayPort: 8888 + UseNetcodeRelay: 0 + NetcodeRelayAddress: 127.0.0.1 + NetcodeRelayPort: 8888 MessageSendMode: 0 --- !u!4 &1024114720 Transform: @@ -1232,7 +1230,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2004,7 +2001,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2336,7 +2332,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs b/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs index cdb85177c1..a43bdd3a55 100644 --- a/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs +++ b/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs @@ -69,7 +69,7 @@ public IEnumerator SceneLoading() SceneManager.sceneLoaded -= SceneManager_sceneLoaded; // Get the NetworkManager instantiated from the scene - var gameObject = GameObject.Find("NetworkManager"); + var gameObject = GameObject.Find("[NetworkManager]"); Assert.IsNotNull(gameObject); m_NetworkManager = gameObject.GetComponent();