[fix] Added additional path checking for the stylesheets, should the …

…Descant folder be anywhere other than the root of the Packages folder
Owmacohe · Jan 7, 2024 · b846484 · b846484
1 parent 1c5979f
commit b846484
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/Descant-1.0.0.unitypackage.meta b/Descant-1.0.0.unitypackage.meta
diff --git a/Editor/Window/DescantActorEditor.cs b/Editor/Window/DescantActorEditor.cs
@@ -89,7 +89,10 @@ void ReloadGUI()
         /// </summary>
         void AddStyleSheet()
         {
-            StyleSheet styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Packages/com.owmacohe.descant/Assets/DescantActorEditorStyleSheet.uss");
+            StyleSheet styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/com.owmacohe.descant/Assets/DescantActorEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/com.owmacohe.descant/Assets/DescantActorEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/com.owmacohe.descant/Assets/DescantActorEditorStyleSheet.uss");
+
             rootVisualElement.styleSheets.Add(styleSheet);
         }
 

diff --git a/Editor/Window/DescantEditor.cs b/Editor/Window/DescantEditor.cs
@@ -101,7 +101,10 @@ void AddGraphView()
         /// </summary>
         void AddStyleSheet()
         {
-            StyleSheet styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            StyleSheet styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+
             rootVisualElement.styleSheets.Add(styleSheet);
         }
 
@@ -190,7 +193,7 @@ void AddToolbar()
         }
 
         #endregion
-
+        
         #region Saving and Loading
 
         /// <summary>

diff --git a/Editor/Window/DescantGraphView.cs b/Editor/Window/DescantGraphView.cs
@@ -227,7 +227,10 @@ void AddManipulators()
         /// </summary>
         void AddStyleSheet()
         {
-            StyleSheet styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            StyleSheet styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+
             styleSheets.Add(styleSheet);
         }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.owmacohe.descant",
   "displayName": "Descant",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "An enhanced and and user-friendly Unity dialogue system plugin.\n\nDescant aims to hit the sweet spot between quality UI, powerful features, and easy-to-lean functionality, while also addressing many of the game-specific consequences of the standard dialogue manager setup.\n\nPlease view the README before beginning development.",
   "unity": "2022.3",
   "unityRelease": "7f1",