fix scriptable setting

Author: VirtueSky

README.md

@@ -4,9 +4,9 @@
 
 ### Add the lines below to `Packages/manifest.json`
 
-for version `1.0.8`
+for version `1.0.9`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#1.0.8",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#1.0.9",
 ```
 
 - If you are missing some of the libraries used in the package, you can download them [here](https://drive.google.com/drive/folders/1OdT5EfMDfkQsEleMM6C2-HHav9o0neTS)

VirtueSky/Core/BaseMono.cs

@@ -142,20 +142,8 @@ protected virtual void Reset()
         [ContextMenu("GetTickerAndPools")]
         void GetTickerAndPools()
         {
-            ticker = AssetUtils.FindAssetAtFolder<Ticker>(new string[] { "Assets" }).FirstOrDefault();
-            if (ticker == null)
-            {
-                ScriptableSetting.CreateSettingAssets<Ticker>();
-                ticker = AssetUtils.FindAssetAtFolder<Ticker>(new string[] { "Assets" }).FirstOrDefault();
-            }
-
-            pools = AssetUtils.FindAssetAtFolder<Pools>(new string[] { "Assets" }).FirstOrDefault();
-            if (pools == null)
-            {
-                ScriptableSetting.CreateSettingAssets<Pools>();
-                pools = AssetUtils.FindAssetAtFolder<Pools>(new string[] { "Assets" }).FirstOrDefault();
-            }
-
+            ticker = ScriptableSetting.CreateAndGetScriptableAsset<Ticker>();
+            pools = ScriptableSetting.CreateAndGetScriptableAsset<Pools>();
             EditorUtility.SetDirty(this);
         }
 #endif

VirtueSky/Core/BaseSO.cs

@@ -142,20 +142,8 @@ protected virtual void Reset()
         [ContextMenu("GetTickerAndPools")]
         void GetTickerAndPools()
         {
-            ticker = AssetUtils.FindAssetAtFolder<Ticker>(new string[] { "Assets" }).FirstOrDefault();
-            if (ticker == null)
-            {
-                ScriptableSetting.CreateSettingAssets<Ticker>();
-                ticker = AssetUtils.FindAssetAtFolder<Ticker>(new string[] { "Assets" }).FirstOrDefault();
-            }
-
-            pools = AssetUtils.FindAssetAtFolder<Pools>(new string[] { "Assets" }).FirstOrDefault();
-            if (pools == null)
-            {
-                ScriptableSetting.CreateSettingAssets<Pools>();
-                pools = AssetUtils.FindAssetAtFolder<Pools>(new string[] { "Assets" }).FirstOrDefault();
-            }
-
+            ticker = ScriptableSetting.CreateAndGetScriptableAsset<Ticker>();
+            pools = ScriptableSetting.CreateAndGetScriptableAsset<Pools>();
             EditorUtility.SetDirty(this);
         }
 #endif

VirtueSky/EditorControl/WindowControl.cs

@@ -7,7 +7,7 @@ namespace VirtueSky.EditorControl
 #if UNITY_EDITOR
     public class WindowControl : EditorWindow
     {
-        [MenuItem("DataControl/Clear Data %F1")]
+        [MenuItem("GameControl/Clear Data %F1")]
         public static void ClearAllData()
         {
             GameData.DelDataInStorage();
@@ -16,7 +16,7 @@ public static void ClearAllData()
             Debug.Log($"<color=Green>Clear data succeed</color>");
         }
 
-        [MenuItem("DataControl/Save Data %F2")]
+        [MenuItem("GameControl/Save Data %F2")]
         public static void SaveData()
         {
             GameData.Save();

VirtueSky/EditorUtils/ScriptableSetting.cs

@@ -1,5 +1,7 @@
 using System.IO;
+using System.Linq;
 using UnityEngine;
+using VirtueSky.Utils;
 
 namespace VirtueSky.EditorUtils
 {
@@ -28,5 +30,17 @@ public static string DefaultResourcesPath()
 
             return defaultResourcePath;
         }
+
+        public static T CreateAndGetScriptableAsset<T>() where T : ScriptableObject
+        {
+            var so = AssetUtils.FindAssetAtFolder<T>(new string[] { "Assets" }).FirstOrDefault();
+            if (so == null)
+            {
+                ScriptableSetting.CreateSettingAssets<T>();
+                so = AssetUtils.FindAssetAtFolder<T>(new string[] { "Assets" }).FirstOrDefault();
+            }
+
+            return so;
+        }
     }
 }

package.json

@@ -2,7 +2,7 @@
   "name": "com.virtuesky.sunflower",
   "displayName": "Sunflower",
   "description": "Core ScriptableObject Architecture for building Unity games",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "unity": "2021.3",
   "category": "virtuesky",
   "keywords": [