Merge branch 'release/0.2.1' into stable

Author: unknown

Runtime/PreloadSettings.cs

@@ -56,27 +56,39 @@ public static SettingsProvider LoadSettingsProvider()
 
         private static PreloadSettings GetOrCreateSettings()
         {
-            if (_settings != null) return _settings;
+            try
+            {
+                if (_settings != null) return _settings;
 
-            _settings = PreloadSettings.Instance;
-            
-            if (_settings != null) return _settings;
-            
-            _settings = AssetDatabase.LoadAssetAtPath<PreloadSettings>(SETTINGS_PATH);
+                _settings = PreloadSettings.Instance;
+
+                if (_settings != null) return _settings;
+
+                _settings = AssetDatabase.LoadAssetAtPath<PreloadSettings>(SETTINGS_PATH);
+                if (_settings != null)
+                {
+                    Debug.Log("FOUND SETTINGS C, RETURNING");
+
+                    return _settings;
+                }
 
-            if (_settings != null) return _settings;
+                if (!Directory.Exists(SETTINGS_PATH))
+                {
+                    Directory.CreateDirectory(SETTINGS_PATH);
+                }
+
+                _settings = ScriptableObject.CreateInstance<PreloadSettings>();
 
-            if (!Directory.Exists(SETTINGS_PATH))
+                AssetDatabase.CreateAsset(_settings, SETTINGS_PATH);
+                AssetDatabase.SaveAssets();
+
+                return _settings;
+            }
+            catch (Exception _exception)
             {
-                Directory.CreateDirectory(SETTINGS_PATH);
+                Debug.LogError(_exception);
+                throw;
             }
-            
-            _settings = ScriptableObject.CreateInstance<PreloadSettings>();
-            
-            AssetDatabase.CreateAsset(_settings, SETTINGS_PATH);
-            AssetDatabase.SaveAssets();
-
-            return _settings;
         }
 
         private static SettingsProvider CreateSettingsProvider()

Runtime/ScriptableObjectSingleton.cs

@@ -1,5 +1,6 @@
-using System.Collections.Generic;
 using System.Linq;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 
 using UnityEngine;
 
@@ -28,17 +29,28 @@ public static T Instance
 			{
 				if (InstanceExists) return _internalInstance;
 
+				Object[] _preloadedAssets = PreloadedAssets;
+				foreach (Object _preloadedAsset in _preloadedAssets)
+				{
+					if (_preloadedAsset is T _singleton) //(_preloadedAsset.GetType() == typeof(T))
+					{
+						return _internalInstance = _singleton;
+					} 
+				}
+				
 				T[] _found = Resources.FindObjectsOfTypeAll<T>();
 
 				//TODO: Ensured?
-				if (_found != null)
+				if (_found != null && _found.Length != 0)
 				{
 					if (_found[0] != null)
 					{
 						return _internalInstance = _found[0];		
 					}	
 				}
 
+				Debug.LogWarning("Couldn't find Singleton Instance!");
+				
 				return null;
 				//return _internalInstance = CreateInstance<T>();
 			}
@@ -49,13 +61,13 @@ protected set
 				#if UNITY_EDITOR
 				if(_internalInstance == null) return;
 
-				List<Object> _preloadedAssets = PlayerSettings.GetPreloadedAssets().ToList();
+				List<Object> _preloadedAssets = PreloadedAssets.ToList();
 
 				if (_preloadedAssets.Contains(_internalInstance)) return;
 
 				_preloadedAssets.Add(_internalInstance);
 
-				PlayerSettings.SetPreloadedAssets(_preloadedAssets.ToArray());
+				PreloadedAssets = _preloadedAssets.ToArray();
 				#endif
 			}
 		}
@@ -64,6 +76,14 @@ protected set
 		[PublicAPI]
 		public static bool InstanceExists => (_internalInstance != null);
 
+		private static Object[] PreloadedAssets
+		{
+			[MethodImpl(MethodImplOptions.AggressiveInlining)]
+			get => PlayerSettings.GetPreloadedAssets();
+			[MethodImpl(MethodImplOptions.AggressiveInlining)]
+			set => PlayerSettings.SetPreloadedAssets(value);
+		}
+
 		#endregion
 
 		#region Methods

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.common-games.utils.preload",
   "displayName": "CGTK.Utils.Preload",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "unity": "2020.3",
   "description": "Allows one to easily preload assets before entering the first scene.",
   "keywords": [