Remove TweenEditorSetting from Resources folder

ls9512 · Mar 17, 2021 · 33f1784 · 33f1784
1 parent 068e794
commit 33f1784
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 8 deletions.
diff --git a/Core/Script/_Setting/Editor.meta → Core/EditorResources/Images.meta b/Core/Script/_Setting/Editor.meta → Core/EditorResources/Images.meta
diff --git a/Core/EditorResources/Icon_512.png → Core/EditorResources/Images/Icon_512.png b/Core/EditorResources/Icon_512.png → Core/EditorResources/Images/Icon_512.png
diff --git a/Core/EditorResources/Icon_512.png.meta → .../EditorResources/Images/Icon_512.png.meta b/Core/EditorResources/Icon_512.png.meta → .../EditorResources/Images/Icon_512.png.meta
diff --git a/Core/EditorResources/Icon_Pause.png → Core/EditorResources/Images/Icon_Pause.png b/Core/EditorResources/Icon_Pause.png → Core/EditorResources/Images/Icon_Pause.png
diff --git a/Core/EditorResources/Icon_Pause.png.meta → ...ditorResources/Images/Icon_Pause.png.meta b/Core/EditorResources/Icon_Pause.png.meta → ...ditorResources/Images/Icon_Pause.png.meta
diff --git a/Core/EditorResources/Icon_Play.png → Core/EditorResources/Images/Icon_Play.png b/Core/EditorResources/Icon_Play.png → Core/EditorResources/Images/Icon_Play.png
diff --git a/Core/EditorResources/Icon_Play.png.meta → ...EditorResources/Images/Icon_Play.png.meta b/Core/EditorResources/Icon_Play.png.meta → ...EditorResources/Images/Icon_Play.png.meta
diff --git a/Core/EditorResources/Icon_Refresh.png → Core/EditorResources/Images/Icon_Refresh.png b/Core/EditorResources/Icon_Refresh.png → Core/EditorResources/Images/Icon_Refresh.png
diff --git a/Core/EditorResources/Icon_Refresh.png.meta → ...torResources/Images/Icon_Refresh.png.meta b/Core/EditorResources/Icon_Refresh.png.meta → ...torResources/Images/Icon_Refresh.png.meta
diff --git a/Core/EditorResources/Icon_Setting.png → Core/EditorResources/Images/Icon_Setting.png b/Core/EditorResources/Icon_Setting.png → Core/EditorResources/Images/Icon_Setting.png
diff --git a/Core/EditorResources/Icon_Setting.png.meta → ...torResources/Images/Icon_Setting.png.meta b/Core/EditorResources/Icon_Setting.png.meta → ...torResources/Images/Icon_Setting.png.meta
diff --git a/Core/Resources/TweenEditorSetting.asset → .../EditorResources/TweenEditorSetting.asset b/Core/Resources/TweenEditorSetting.asset → .../EditorResources/TweenEditorSetting.asset
diff --git a/Core/Resources/TweenEditorSetting.asset.meta → ...orResources/TweenEditorSetting.asset.meta b/Core/Resources/TweenEditorSetting.asset.meta → ...orResources/TweenEditorSetting.asset.meta
diff --git a/Core/Script/Editor/Setting.meta b/Core/Script/Editor/Setting.meta
diff --git a/Core/Script/_Setting/TweenEditorSetting.cs → ...ript/Editor/Setting/TweenEditorSetting.cs b/Core/Script/_Setting/TweenEditorSetting.cs → ...ript/Editor/Setting/TweenEditorSetting.cs
@@ -6,11 +6,13 @@
 //  E-mail   : [email protected]
 //
 /////////////////////////////////////////////////////////////////////////////
+#if UNITY_EDITOR
+using UnityEditor;
 using UnityEngine;
 
 namespace Aya.Tween
 {
-    [CreateAssetMenu(menuName = "UTween/Tween Setting", fileName = "TweenEditorSetting")]
+    [CreateAssetMenu(menuName = "UTween/Tween Editor Setting", fileName = "TweenEditorSetting")]
     public class TweenEditorSetting : ScriptableObject
     {
         #region Instance
@@ -21,7 +23,7 @@ public static TweenEditorSetting Ins
             {
                 if (Instance == null)
                 {
-                    Instance = Load(nameof(TweenEditorSetting));
+                    Instance = FindAsset<TweenEditorSetting>();
                 }
 
                 return Instance;
@@ -30,12 +32,16 @@ public static TweenEditorSetting Ins
 
         protected static TweenEditorSetting Instance;
 
-        internal static TweenEditorSetting Load(string fileName)
+        internal static T FindAsset<T>() where T : Object
         {
-            var ins = Resources.Load<TweenEditorSetting>(fileName);
-            return ins;
-        } 
-
+            var guidList = AssetDatabase.FindAssets("t:" + typeof(T).FullName);
+            if (guidList != null && guidList.Length > 0)
+            {
+                return AssetDatabase.LoadAssetAtPath<T>(AssetDatabase.GUIDToAssetPath(guidList[0]));
+            }
+
+            return null;
+        }
         #endregion
 
         [Header("Icon")]
@@ -45,3 +51,4 @@ internal static TweenEditorSetting Load(string fileName)
         public Texture2D IconRefresh;
     }
 }
+#endif
diff --git a/...cript/_Setting/TweenEditorSetting.cs.meta → ...Editor/Setting/TweenEditorSetting.cs.meta b/...cript/_Setting/TweenEditorSetting.cs.meta → ...Editor/Setting/TweenEditorSetting.cs.meta
diff --git a/...t/_Setting/Editor/TweenSettingProvider.cs → ...pt/Editor/Setting/TweenSettingProvider.cs b/...t/_Setting/Editor/TweenSettingProvider.cs → ...pt/Editor/Setting/TweenSettingProvider.cs
diff --git a/...tting/Editor/TweenSettingProvider.cs.meta → ...itor/Setting/TweenSettingProvider.cs.meta b/...tting/Editor/TweenSettingProvider.cs.meta → ...itor/Setting/TweenSettingProvider.cs.meta