com.wallstop-studios.unity-helpers 2.0.0-rc80 → 2.0.0-rc80.3

package/Runtime/Core/Attributes/ScriptableSingletonPathAttribute.cs

@@ -0,0 +1,15 @@
+namespace WallstopStudios.UnityHelpers.Core.Attributes
+{
+    using System;
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    public sealed class ScriptableSingletonPathAttribute : Attribute
+    {
+        public readonly string resourcesPath;
+
+        public ScriptableSingletonPathAttribute(string resourcesPath)
+        {
+            this.resourcesPath = resourcesPath ?? string.Empty;
+        }
+    }
+}

package/Runtime/Core/Attributes/ScriptableSingletonPathAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f6e7e461ef354d009ce229352104d4db
+timeCreated: 1758580433

package/Runtime/Utils/ChildSpawner.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Utils
     using System.Linq;
     using Core.Extension;
     using UnityEngine;
+    using UnityEngine.Serialization;
 
     [Flags]
     public enum ChildSpawnMethod
@@ -20,6 +21,10 @@ namespace WallstopStudios.UnityHelpers.Utils
     {
         private static readonly HashSet<GameObject> SpawnedPrefabs = new();
 
+        [FormerlySerializedAs("dontDestroyOnLoad")]
+        [SerializeField]
+        private bool _dontDestroyOnLoad = true;
+
         [SerializeField]
         private ChildSpawnMethod _spawnMethod = ChildSpawnMethod.Start;
 
@@ -58,6 +63,7 @@ namespace WallstopStudios.UnityHelpers.Utils
 
         private void Spawn()
         {
+            TrySetDontDestroyOnLoad();
             if (
                 _prefabs
                     .Concat(_editorOnlyPrefabs)
@@ -133,5 +139,13 @@ namespace WallstopStudios.UnityHelpers.Utils
             }
             return child;
         }
+
+        private void TrySetDontDestroyOnLoad()
+        {
+            if (_dontDestroyOnLoad && Application.isPlaying && !gameObject.IsDontDestroyOnLoad())
+            {
+                DontDestroyOnLoad(gameObject);
+            }
+        }
     }
 }

package/Runtime/Utils/ScriptableObjectSingleton.cs

@@ -2,6 +2,8 @@ namespace WallstopStudios.UnityHelpers.Utils
 {
     using System;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Attributes;
+    using WallstopStudios.UnityHelpers.Core.Helper;
 #if ODIN_INSPECTOR
     using Sirenix.OdinInspector;
 #endif
@@ -14,9 +16,46 @@ namespace WallstopStudios.UnityHelpers.Utils
 #endif
         where T : ScriptableObjectSingleton<T>
     {
+        private static string GetResourcesPath()
+        {
+            Type type = typeof(T);
+            ScriptableSingletonPathAttribute attribute =
+                ReflectionHelpers.GetAttributeSafe<ScriptableSingletonPathAttribute>(type);
+            if (attribute != null && !string.IsNullOrWhiteSpace(attribute.resourcesPath))
+            {
+                return attribute.resourcesPath;
+            }
+
+            return type.Name;
+        }
+
         protected static readonly Lazy<T> LazyInstance = new(() =>
         {
-            T[] instances = Resources.LoadAll<T>(string.Empty);
+            string path = GetResourcesPath();
+            T[] instances = Resources.LoadAll<T>(path);
+
+            if (instances == null || instances.Length == 0)
+            {
+                T named = Resources.Load<T>(typeof(T).Name);
+                if (named != null)
+                {
+                    instances = new[] { named };
+                }
+            }
+
+            if (instances == null || instances.Length == 0)
+            {
+                instances = Resources.LoadAll<T>(string.Empty);
+            }
+
+            if (instances == null)
+            {
+                Debug.LogError(
+                    $"Failed to find ScriptableSingleton of {typeof(T).Name} - null instances."
+                );
+                return default;
+            }
+
             switch (instances.Length)
             {
                 case 1:
@@ -25,7 +64,9 @@ namespace WallstopStudios.UnityHelpers.Utils
                 }
                 case 0:
                 {
-                    Debug.LogError($"Failed to find ScriptableSingleton of type {typeof(T).Name}.");
+                    Debug.LogError(
+                        $"Failed to find ScriptableSingleton of type {typeof(T).Name} - empty instances."
+                    );
                     return null;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc80",
+  "version": "2.0.0-rc80.3",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -53,4 +53,7 @@
 
 
 
+
+
+