diff --git a/UnityUtils/Scripts/Singleton/PersistentSingleton.cs b/UnityUtils/Scripts/Singleton/PersistentSingleton.cs index edc96c6..b535c92 100644 --- a/UnityUtils/Scripts/Singleton/PersistentSingleton.cs +++ b/UnityUtils/Scripts/Singleton/PersistentSingleton.cs @@ -7,7 +7,6 @@ public class PersistentSingleton : MonoBehaviour where T : Component { protected static T instance; public static bool HasInstance => instance != null; - public static T TryGetInstance() => HasInstance ? instance : null; public static T Instance { get { @@ -33,13 +32,12 @@ protected virtual void Awake() { protected virtual void InitializeSingleton() { if (!Application.isPlaying) return; - if (AutoUnparentOnAwake) { - transform.SetParent(null); - } - if (instance == null) { instance = this as T; DontDestroyOnLoad(gameObject); + if (AutoUnparentOnAwake) { + transform.SetParent(null); + } } else { if (instance != this) { Destroy(gameObject); @@ -47,4 +45,4 @@ protected virtual void InitializeSingleton() { } } } -} \ No newline at end of file +}