⭐[update] RainbowAssets

Signed-off-by: xinansky <[email protected]>
AIO-GAME · Oct 26, 2023 · 08046a2 · 08046a2
1 parent 7d257fc
commit 08046a2
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 30 deletions.
diff --git a/Resources/RainbowAssets/Editor.meta → Resources/Editor.meta b/Resources/RainbowAssets/Editor.meta → Resources/Editor.meta
diff --git a/Resources/RainbowAssets.meta → Resources/Editor/RainbowAssets.meta b/Resources/RainbowAssets.meta → Resources/Editor/RainbowAssets.meta
diff --git a/...Assets/Editor/RainbowFoldersRuleset.asset → ...Editor/RainbowAssets/ProjectRuleset.asset b/...Assets/Editor/RainbowFoldersRuleset.asset → ...Editor/RainbowAssets/ProjectRuleset.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -1720354355, guid: d6a73fd01763dc74986b8acf577ee60b, type: 3}
-  m_Name: RainbowFoldersRuleset
+  m_Name: ProjectRuleset
   m_EditorClassIdentifier: 
   Rules:
   - Type: 0

diff --git a/...s/Editor/RainbowFoldersRuleset.asset.meta → ...r/RainbowAssets/ProjectRuleset.asset.meta b/...s/Editor/RainbowFoldersRuleset.asset.meta → ...r/RainbowAssets/ProjectRuleset.asset.meta
diff --git a/...urces/RainbowAssets/Editor/QuickStart.pdf → ...urces/Editor/RainbowAssets/QuickStart.pdf b/...urces/RainbowAssets/Editor/QuickStart.pdf → ...urces/Editor/RainbowAssets/QuickStart.pdf
diff --git a/.../RainbowAssets/Editor/QuickStart.pdf.meta → .../Editor/RainbowAssets/QuickStart.pdf.meta b/.../RainbowAssets/Editor/QuickStart.pdf.meta → .../Editor/RainbowAssets/QuickStart.pdf.meta
diff --git a/Resources/RainbowAssets/Editor/icon.png → Resources/Editor/RainbowAssets/icon.png b/Resources/RainbowAssets/Editor/icon.png → Resources/Editor/RainbowAssets/icon.png
diff --git a/Resources/RainbowAssets/Editor/icon.png.meta → Resources/Editor/RainbowAssets/icon.png.meta b/Resources/RainbowAssets/Editor/icon.png.meta → Resources/Editor/RainbowAssets/icon.png.meta
diff --git a/Resources/RainbowAssets/Editor/NOTICES.txt b/Resources/RainbowAssets/Editor/NOTICES.txt
diff --git a/Resources/RainbowAssets/Editor/NOTICES.txt.meta b/Resources/RainbowAssets/Editor/NOTICES.txt.meta
diff --git a/...ess/Process.Unity/Script/RainbowFolders/Borodar.RainbowFolders.Settings/ProjectRuleset.cs b/...ess/Process.Unity/Script/RainbowFolders/Borodar.RainbowFolders.Settings/ProjectRuleset.cs
@@ -41,34 +41,62 @@ public static ProjectRuleset Instance
             {
                 if (_instance is null)
                 {
-                    if (paths is null)
+                    try
                     {
-                        paths = new List<string>();
-                        foreach (var guid in AssetDatabase.FindAssets($"t:{nameof(ProjectRuleset)}",
-                                     new string[] { "Packages", "Assets" }))
+                        if (paths is null)
                         {
-                            paths.Add(AssetDatabase.GUIDToAssetPath(guid));
+                            paths = new List<string>();
+                            foreach (var guid in AssetDatabase.FindAssets($"t:{nameof(ProjectRuleset)}",
+                                         new string[] { "Packages", "Assets" }))
+                            {
+                                paths.Add(AssetDatabase.GUIDToAssetPath(guid));
+                            }
+                        }
+
+                        foreach (var expr in paths)
+                        {
+                            _instance = AssetDatabase.LoadAssetAtPath<ProjectRuleset>(expr);
+                            if (_instance is null) continue;
+                            _instance.UpdateOrdinals();
+                            OnRulesetChange =
+                                (Action)Delegate.Combine(OnRulesetChange, new Action(_instance.UpdateOrdinals));
+                            _instance.UpdateDictionaries();
+                            OnRulesetChange =
+                                (Action)Delegate.Combine(OnRulesetChange, new Action(_instance.UpdateDictionaries));
+                            return _instance;
                         }
                     }
+                    catch (Exception e)
+                    {
+                        // ignored
+                    }
+                }
 
-                    foreach (var expr in paths)
+                if (_instance is null)
+                {
+                    try
+                    {
+                        _instance = Resources.Load<ProjectRuleset>(
+                            $"Editor/RainbowFoldersRuleset/{nameof(ProjectRuleset)}");
+                    }
+                    catch (Exception e)
                     {
-                        _instance = AssetDatabase.LoadAssetAtPath<ProjectRuleset>(expr);
-                        if (_instance is null) continue;
-                        _instance.UpdateOrdinals();
-                        OnRulesetChange =
-                            (Action)Delegate.Combine(OnRulesetChange, new Action(_instance.UpdateOrdinals));
-                        _instance.UpdateDictionaries();
-                        OnRulesetChange =
-                            (Action)Delegate.Combine(OnRulesetChange, new Action(_instance.UpdateDictionaries));
-                        return _instance;
+                        // ignored
                     }
                 }
 
                 if (_instance is null)
                 {
                     _instance = CreateInstance<ProjectRuleset>();
-                    AssetDatabase.CreateAsset(_instance, $"Assets/Editor/Gen/Settings/{nameof(ProjectRuleset)}.asset");
+                    try
+                    {
+                        AssetDatabase.CreateAsset(_instance,
+                            $"Assets/Editor/Gen/Settings/{nameof(ProjectRuleset)}.asset");
+                    }
+                    catch (Exception e)
+                    {
+                        // ignored
+                    }
                 }
 
                 return _instance;