📦 2.0.10 Release

- Fixed an assembly issue with the common code shared between assets. - Temp fix for a compatibility issue due to script overriding, though still not sure why it even happens on just 2 scripts xD
CarterGames · Aug 3, 2023 · 8c4fbab · 8c4fbab
1 parent 6b57de7
commit 8c4fbab
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 57 deletions.
diff --git a/Code/Editor/Utility/AssetVersionData.cs b/Code/Editor/Utility/AssetVersionData.cs
@@ -31,7 +31,7 @@ public static class AssetVersionData
         /// <summary>
         /// The version number of the asset.
         /// </summary>
-        public static string VersionNumber => "2.0.9";
+        public static string VersionNumber => "2.0.10";
 
 
         /// <summary>
@@ -40,6 +40,6 @@ public static class AssetVersionData
         /// <remarks>
         /// Asset owner is in the UK, so its D/M/Y format.
         /// </remarks>
-        public static string ReleaseDate => "30/07/2023";
+        public static string ReleaseDate => "03/08/2023";
     }
 }
diff --git a/...ility/Scriptable Assets/FileEditorUtil.cs → ...ity/Scriptable Assets/FileEditorUtilSM.cs b/...ility/Scriptable Assets/FileEditorUtil.cs → ...ity/Scriptable Assets/FileEditorUtilSM.cs
@@ -31,7 +31,7 @@ namespace CarterGames.Assets.SaveManager.Editor
     /// <summary>
     /// Handles finding assets in the project in editor space and creating/referencing/caching them for use.
     /// </summary>
-    public static class FileEditorUtil
+    public static class FileEditorUtilSM
     {
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Fields

diff --git a/.../Scriptable Assets/FileEditorUtil.cs.meta → ...criptable Assets/FileEditorUtilSM.cs.meta b/.../Scriptable Assets/FileEditorUtil.cs.meta → ...criptable Assets/FileEditorUtilSM.cs.meta
diff --git a/...tility/Scriptable Assets/ScriptableRef.cs → ...lity/Scriptable Assets/ScriptableRefSM.cs b/...tility/Scriptable Assets/ScriptableRef.cs → ...lity/Scriptable Assets/ScriptableRefSM.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2018-Present Carter Games
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,7 +29,7 @@ namespace CarterGames.Assets.SaveManager.Editor
     /// <summary>
     /// Handles references to scriptable objects in the asset that need generating without user input etc.
     /// </summary>
-    public static class ScriptableRef
+    public static class ScriptableRefSM
     {
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Fields
@@ -47,22 +47,22 @@ public static class ScriptableRef
 
         // Asset Filters
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */
-        private static readonly string RuntimeSettingsFilter = $"t:{typeof(SettingsAssetRuntime).FullName}";
-        private static readonly string EditorSettingsFilter = $"t:{typeof(SettingsAssetEditor).FullName}";
-        private static readonly string AssetIndexFilter = $"t:{typeof(AssetIndex).FullName}";
-        private static readonly string SaveProfilesStoreFilter = $"t:{typeof(SaveProfilesStore).FullName}";
-        private static readonly string SaveDataFilter = $"t:{typeof(SaveData).FullName}";
-        private static readonly string SaveDataEncryptionKeyFilter = $"t:{typeof(EncryptionKeyAsset).FullName}";
+        private static readonly string RuntimeSettingsFilter = $"t:{typeof(CarterGames.Assets.SaveManager.SettingsAssetRuntime).FullName}";
+        private static readonly string EditorSettingsFilter = $"t:{typeof(CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor).FullName}";
+        private static readonly string AssetIndexFilter = $"t:{typeof(CarterGames.Assets.SaveManager.AssetIndex).FullName}";
+        private static readonly string SaveProfilesStoreFilter = $"t:{typeof(CarterGames.Assets.SaveManager.Editor.SaveProfilesStore).FullName}";
+        private static readonly string SaveDataFilter = $"t:{typeof(CarterGames.Assets.SaveManager.SaveData).FullName}";
+        private static readonly string SaveDataEncryptionKeyFilter = $"t:{typeof(CarterGames.Assets.SaveManager.EncryptionKeyAsset).FullName}";
 
 
         // Asset Caches
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */
-        private static SettingsAssetRuntime settingsAssetRuntimeCache;
-        private static SettingsAssetEditor settingsAssetEditorCache;
-        private static AssetIndex assetIndexCache;
-        private static SaveProfilesStore saveProfilesStoreCache;
-        private static SaveData saveDataCache;
-        private static EncryptionKeyAsset encryptionKeyAssetCache;
+        private static CarterGames.Assets.SaveManager.SettingsAssetRuntime settingsAssetRuntimeCache;
+        private static CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor settingsAssetEditorCache;
+        private static CarterGames.Assets.SaveManager.AssetIndex assetIndexCache;
+        private static CarterGames.Assets.SaveManager.Editor.SaveProfilesStore saveProfilesStoreCache;
+        private static CarterGames.Assets.SaveManager.SaveData saveDataCache;
+        private static CarterGames.Assets.SaveManager.EncryptionKeyAsset encryptionKeyAssetCache;
 
 
         // SerializedObject Caches
@@ -80,13 +80,13 @@ public static class ScriptableRef
         /// <summary>
         /// Gets the path where the asset code is located.
         /// </summary>
-        private static string AssetBasePath => FileEditorUtil.AssetBasePath;
+        private static string AssetBasePath => FileEditorUtilSM.AssetBasePath;
 
 
         /// <summary>
         /// Gets the asset name stored in the file util editor class.
         /// </summary>
-        private static string AssetName => FileEditorUtil.AssetName;
+        private static string AssetName => FileEditorUtilSM.AssetName;
 
 
         // Asset Properties
@@ -95,43 +95,43 @@ public static class ScriptableRef
         /// <summary>
         /// The asset index for the asset.
         /// </summary>
-        public static AssetIndex AssetIndex =>
-            FileEditorUtil.CreateSoGetOrAssignAssetCache(ref assetIndexCache, AssetIndexFilter, AssetIndexPath, AssetName, $"{AssetName}/Resources/Asset Index.asset");
+        public static CarterGames.Assets.SaveManager.AssetIndex AssetIndex =>
+            FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref assetIndexCache, AssetIndexFilter, AssetIndexPath, AssetName, $"{AssetName}/Resources/Asset Index.asset");
 
 
         /// <summary>
         /// The editor settings for the asset.
         /// </summary>
-        public static SettingsAssetEditor EditorSettings =>
-            FileEditorUtil.CreateSoGetOrAssignAssetCache(ref settingsAssetEditorCache, EditorSettingsFilter, EditorSettingsAssetPath, AssetName, $"{AssetName}/Data/Editor Settings.asset");
+        public static CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor EditorSettings =>
+            FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref settingsAssetEditorCache, EditorSettingsFilter, EditorSettingsAssetPath, AssetName, $"{AssetName}/Data/Editor Settings.asset");
 
 
         /// <summary>
         /// The runtime settings for the asset.
         /// </summary>
-        public static SettingsAssetRuntime RuntimeSettings =>
-            FileEditorUtil.CreateSoGetOrAssignAssetCache(ref settingsAssetRuntimeCache, RuntimeSettingsFilter, SettingsAssetPath, AssetName, $"{AssetName}/Data/Runtime Settings.asset");
+        public static CarterGames.Assets.SaveManager.SettingsAssetRuntime RuntimeSettings =>
+            FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref settingsAssetRuntimeCache, RuntimeSettingsFilter, SettingsAssetPath, AssetName, $"{AssetName}/Data/Runtime Settings.asset");
 
 
         /// <summary>
         /// The save profiles for the asset.
         /// </summary>
-        public static SaveProfilesStore SaveProfiles =>
-            FileEditorUtil.CreateSoGetOrAssignAssetCache(ref saveProfilesStoreCache, SaveProfilesStoreFilter, CapturesObjectAssetPath, AssetName, $"{AssetName}/Data/Save Profiles Container.asset");
+        public static CarterGames.Assets.SaveManager.Editor.SaveProfilesStore SaveProfiles =>
+            FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref saveProfilesStoreCache, SaveProfilesStoreFilter, CapturesObjectAssetPath, AssetName, $"{AssetName}/Data/Save Profiles Container.asset");
 
 
         /// <summary>
         /// The save data for the asset.
         /// </summary>
-        public static SaveData SaveData =>
-            FileEditorUtil.CreateSoGetOrAssignAssetCache(ref saveDataCache, SaveDataFilter, SaveDataPath, AssetName, $"{AssetName}/Data/Save Data.asset");
+        public static CarterGames.Assets.SaveManager.SaveData SaveData =>
+            FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref saveDataCache, SaveDataFilter, SaveDataPath, AssetName, $"{AssetName}/Data/Save Data.asset");
 
 
         /// <summary>
         /// The encryption key asset for the asset.
         /// </summary>
-        public static EncryptionKeyAsset EncryptionKey =>
-            FileEditorUtil.CreateSoGetOrAssignAssetCache(ref encryptionKeyAssetCache, SaveDataEncryptionKeyFilter, EncryptionKeyAssetPath, AssetName, $"{AssetName}/Data/Encryption Key.asset");
+        public static CarterGames.Assets.SaveManager.EncryptionKeyAsset EncryptionKey =>
+            FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref encryptionKeyAssetCache, SaveDataEncryptionKeyFilter, EncryptionKeyAssetPath, AssetName, $"{AssetName}/Data/Encryption Key.asset");
 
         // Object Properties
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */
@@ -140,14 +140,14 @@ public static class ScriptableRef
         /// The editor SerializedObject for the asset.
         /// </summary>
         public static SerializedObject EditorSettingsObject =>
-            FileEditorUtil.CreateGetOrAssignSerializedObjectCache(ref settingsAssetEditorObjectCache, EditorSettings);
+            FileEditorUtilSM.CreateGetOrAssignSerializedObjectCache(ref settingsAssetEditorObjectCache, EditorSettings);
 
 
         /// <summary>
         /// The runtime SerializedObject for the asset.
         /// </summary>
         public static SerializedObject RuntimeSettingsObject =>
-            FileEditorUtil.CreateGetOrAssignSerializedObjectCache(ref settingsAssetRuntimeObjectCache, RuntimeSettings);
+            FileEditorUtilSM.CreateGetOrAssignSerializedObjectCache(ref settingsAssetRuntimeObjectCache, RuntimeSettings);
 
         // Assets Initialized Check
         /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */

diff --git a/...y/Scriptable Assets/ScriptableRef.cs.meta → ...Scriptable Assets/ScriptableRefSM.cs.meta b/...y/Scriptable Assets/ScriptableRef.cs.meta → ...Scriptable Assets/ScriptableRefSM.cs.meta
diff --git a/Code/Editor/Utility/UtilEditor.cs b/Code/Editor/Utility/UtilEditor.cs
@@ -147,7 +147,7 @@ public static class UtilEditor
         /// <summary>
         /// Gets the path where the asset code is located.
         /// </summary>
-        private static string AssetBasePath => FileEditorUtil.AssetBasePath;
+        private static string AssetBasePath => FileEditorUtilSM.AssetBasePath;
 
 
         // Textures/Graphics
@@ -156,72 +156,72 @@ public static class UtilEditor
         /// <summary>
         /// Gets the save manager logo.
         /// </summary>
-        public static Texture2D SaveManagerLogo => FileEditorUtil.GetOrAssignCache(ref saveManagerLogoCache, SaveManagerLogoFilter);
+        public static Texture2D SaveManagerLogo => FileEditorUtilSM.GetOrAssignCache(ref saveManagerLogoCache, SaveManagerLogoFilter);
 
 
         /// <summary>
         /// Gets the save manager banner.
         /// </summary>
         public static Texture2D SaveManagerBanner =>
-            FileEditorUtil.GetOrAssignCache(ref saveManagerBannerCache, SaveManagerBannerFilter);
+            FileEditorUtilSM.GetOrAssignCache(ref saveManagerBannerCache, SaveManagerBannerFilter);
 
 
         /// <summary>
         /// Gets the save manager banner.
         /// </summary>
         public static Texture2D SaveManagerBannerTextOnly =>
-            FileEditorUtil.GetOrAssignCache(ref saveManagerTitleBannerCache, SaveManagerTitleBannerFilter);
+            FileEditorUtilSM.GetOrAssignCache(ref saveManagerTitleBannerCache, SaveManagerTitleBannerFilter);
 
 
         /// <summary>
         /// Gets the carter games banner.
         /// </summary>
         public static Texture2D CarterGamesBanner =>
-            FileEditorUtil.GetOrAssignCache(ref carterGamesBannerCache, CarterGamesBannerFilter);
+            FileEditorUtilSM.GetOrAssignCache(ref carterGamesBannerCache, CarterGamesBannerFilter);
 
 
         /// <summary>
         /// Gets the cog icon.
         /// </summary>
-        public static Texture2D CogIcon => FileEditorUtil.GetOrAssignCache(ref cogIconCache, CogIconFilter);
+        public static Texture2D CogIcon => FileEditorUtilSM.GetOrAssignCache(ref cogIconCache, CogIconFilter);
 
 
         /// <summary>
         /// Gets the key icon.
         /// </summary>
-        public static Texture2D KeyIcon => FileEditorUtil.GetOrAssignCache(ref keyIconCache, KeyIconFilter);
+        public static Texture2D KeyIcon => FileEditorUtilSM.GetOrAssignCache(ref keyIconCache, KeyIconFilter);
 
 
         /// <summary>
         /// Gets the book icon.
         /// </summary>
-        public static Texture2D BookIcon => FileEditorUtil.GetOrAssignCache(ref bookIconCache, BookIconFilter);
+        public static Texture2D BookIcon => FileEditorUtilSM.GetOrAssignCache(ref bookIconCache, BookIconFilter);
 
 
         /// <summary>
         /// Gets the data icon.
         /// </summary>
-        public static Texture2D DataIcon => FileEditorUtil.GetOrAssignCache(ref dataIconCache, DataIconFilter);
+        public static Texture2D DataIcon => FileEditorUtilSM.GetOrAssignCache(ref dataIconCache, DataIconFilter);
 
 
         /// <summary>
         /// Gets the white save icon.
         /// </summary>
-        public static Texture2D SaveIconWhite => FileEditorUtil.GetOrAssignCache(ref saveIconWhite, SaveWhiteIconFilter);
+        public static Texture2D SaveIconWhite => FileEditorUtilSM.GetOrAssignCache(ref saveIconWhite, SaveWhiteIconFilter);
 
 
         /// <summary>
         /// Gets the title text for the editor tab in the save manager editor window.
         /// </summary>
         public static Texture2D EditorWindowTitleEditor => 
-            FileEditorUtil.GetOrAssignCache(ref editorWindowTitleEditor, EditorWindowTitleEditorFilter);
+            FileEditorUtilSM.GetOrAssignCache(ref editorWindowTitleEditor, EditorWindowTitleEditorFilter);
 
 
         /// <summary>
         /// Gets the title text for the profiles tab in the save manager editor window.
         /// </summary>
         public static Texture2D EditorWindowTitleProfiles =>
-            FileEditorUtil.GetOrAssignCache(ref editorWindowTitleProfiles, EditorWindowTitleProfilesFilter);
+            FileEditorUtilSM.GetOrAssignCache(ref editorWindowTitleProfiles, EditorWindowTitleProfilesFilter);
 
 
 
@@ -236,58 +236,58 @@ public static bool HasInitialized
             get
             {
                 AssetIndexHandler.UpdateIndex();
-                return ScriptableRef.HasAllAssets;
+                return ScriptableRefSM.HasAllAssets;
             }
         }
 
 
         /// <summary>
         /// Gets/Sets the save manager settings asset.
         /// </summary>
-        public static SettingsAssetRuntime Settings => ScriptableRef.RuntimeSettings;
+        public static CarterGames.Assets.SaveManager.SettingsAssetRuntime Settings => ScriptableRefSM.RuntimeSettings;
 
 
         /// <summary>
         /// Gets/Sets the save manager editor settings asset.
         /// </summary>
-        public static SerializedObject SettingsObject => ScriptableRef.RuntimeSettingsObject;
+        public static SerializedObject SettingsObject => ScriptableRefSM.RuntimeSettingsObject;
 
 
         /// <summary>
         /// Gets/Sets the save manager editor settings asset.
         /// </summary>
-        public static SettingsAssetEditor SettingsAssetEditor => ScriptableRef.EditorSettings;
+        public static CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor SettingsAssetEditor => ScriptableRefSM.EditorSettings;
 
 
         /// <summary>
         /// Gets/Sets the save manager editor settings asset.
         /// </summary>
-        public static SerializedObject EditorSettingsObject => ScriptableRef.EditorSettingsObject;
+        public static SerializedObject EditorSettingsObject => ScriptableRefSM.EditorSettingsObject;
 
 
 
         /// <summary>
         /// Gets/Sets the save manager save profiles asset.
         /// </summary>
-        public static SaveProfilesStore SaveProfiles => ScriptableRef.SaveProfiles;
+        public static CarterGames.Assets.SaveManager.Editor.SaveProfilesStore SaveProfiles => ScriptableRefSM.SaveProfiles;
 
 
         /// <summary>
         /// Gets/Sets the save manager save data asset.
         /// </summary>
-        public static SaveData SaveData => ScriptableRef.SaveData;
+        public static CarterGames.Assets.SaveManager.SaveData SaveData => ScriptableRefSM.SaveData;
 
 
         /// <summary>
         /// Gets/Sets the save manager save data asset.
         /// </summary>
-        public static EncryptionKeyAsset EncryptionKeyAsset => ScriptableRef.EncryptionKey;
+        public static CarterGames.Assets.SaveManager.EncryptionKeyAsset EncryptionKeyAsset => ScriptableRefSM.EncryptionKey;
 
 
         /// <summary>
         /// Gets/Sets the save manager save data asset.
         /// </summary>
-        public static AssetIndex AssetIndex => ScriptableRef.AssetIndex;
+        public static CarterGames.Assets.SaveManager.AssetIndex AssetIndex => ScriptableRefSM.AssetIndex;
 
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Draw Methods

diff --git a/Code/Runtime/Common/CarterGames.Common.asmdef b/Code/Runtime/Common/CarterGames.Common.asmdef
diff --git a/Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef b/Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef
@@ -0,0 +1,14 @@
+{
+    "name": "CarterGames.SaveManager.Common",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/...ime/Common/CarterGames.Common.asmdef.meta → ...arterGames.SaveManager.Common.asmdef.meta b/...ime/Common/CarterGames.Common.asmdef.meta → ...arterGames.SaveManager.Common.asmdef.meta