diff --git a/Assets/Libs/Hypernex.CCK/Hypernex.CCK.Unity.dll b/Assets/Libs/Hypernex.CCK/Hypernex.CCK.Unity.dll index 52bafc5..7f153b7 100644 Binary files a/Assets/Libs/Hypernex.CCK/Hypernex.CCK.Unity.dll and b/Assets/Libs/Hypernex.CCK/Hypernex.CCK.Unity.dll differ diff --git a/Assets/Scripts/Game/LocalPlayer.cs b/Assets/Scripts/Game/LocalPlayer.cs index 24ca5f5..c703870 100644 --- a/Assets/Scripts/Game/LocalPlayer.cs +++ b/Assets/Scripts/Game/LocalPlayer.cs @@ -165,9 +165,9 @@ public IEnumerator SafeSwitchScene(string s, Action onAsyncDone = null, A if(onAsyncDone != null) onAsyncDone.Invoke(currentScene); yield return new WaitUntil(() => currentScene.isLoaded); + LowestPoint = AnimationUtility.GetLowestObject(currentScene).position; if(onDone != null) onDone.Invoke(currentScene); - LowestPoint = AnimationUtility.GetLowestObject(currentScene).position; } public IEnumerator SafeSwitchScene(int i, Action onAsyncDone = null, Action onDone = null) @@ -179,9 +179,9 @@ public IEnumerator SafeSwitchScene(int i, Action onAsyncDone = null, Acti if(onAsyncDone != null) onAsyncDone.Invoke(currentScene); yield return new WaitUntil(() => currentScene.isLoaded); + LowestPoint = AnimationUtility.GetLowestObject(currentScene).position; if(onDone != null) onDone.Invoke(currentScene); - LowestPoint = AnimationUtility.GetLowestObject(currentScene).position; } // maybe we should cache an avatar instead? would improve speeds for HDD users, but increase memory usage @@ -211,7 +211,7 @@ .SpawnPoints[new System.Random().Next(0, GameInstance.FocusedInstance.World.Spaw searchSpawn = SceneManager.GetActiveScene().GetRootGameObjects() .FirstOrDefault(x => x.name.ToLower() == "spawn"); else - searchSpawn = s.Value.GetRootGameObjects().FirstOrDefault(x => x.name.ToLower() == "Spawn"); + searchSpawn = s.Value.GetRootGameObjects().FirstOrDefault(x => x.name.ToLower() == "spawn"); if (searchSpawn != null) spawnPosition = searchSpawn.transform.position; } diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index 593b6db..a46a3fc 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -32,7 +32,7 @@ public class Init : MonoBehaviour { - public const string VERSION = "2024.07.1b"; + public const string VERSION = "2024.07.2b"; public static Init Instance; public static bool IsQuitting { get; private set; } diff --git a/Assets/Scripts/Tools/SecurityTools.cs b/Assets/Scripts/Tools/SecurityTools.cs index a603bf4..3f4c371 100644 --- a/Assets/Scripts/Tools/SecurityTools.cs +++ b/Assets/Scripts/Tools/SecurityTools.cs @@ -11,6 +11,7 @@ using UnityEngine.Rendering.Universal; using UnityEngine.UI; using UnityEngine.XR.Interaction.Toolkit.UI; +using UnityEngine.EventSystems; using Object = UnityEngine.Object; using Security = Hypernex.CCK.Unity.Security; #if MAGICACLOTH2 @@ -81,6 +82,8 @@ private static Camera[] GetAllMirrorCameras() => Object.FindObjectsOfType(); + Security.RegisterForceDeleteObject(); Security.RegisterComponentRestriction((component, _) => { Camera camera = (Camera) component; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 21dce56..bf0087c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,9 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: -5264253658483339981, guid: 95c4cfd8338326e45922c4ac0ed2ff73, type: 2} + - {fileID: 5711663381222140903, guid: a08e1849d99fdcd4ea4a7ae8dfb275d4, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1