[fix] Added more possible stylesheet fallback paths, and did some ren…

…aming
Owmacohe · Mar 19, 2024 · 07710ed · 07710ed
1 parent 8590c7e
commit 07710ed
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 12 deletions.
diff --git a/Descant-1.1.1.unitypackage.meta → Descant-1.1.2.unitypackage.meta b/Descant-1.1.1.unitypackage.meta → Descant-1.1.2.unitypackage.meta
diff --git a/Editor/Window/DescantEditor.cs b/Editor/Window/DescantEditor.cs
@@ -100,8 +100,11 @@ void AddGraphView()
         void AddStyleSheet()
         {
             StyleSheet styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/Descant-1.1.2/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/Descant-1.1.2/Assets/DescantGraphEditorStyleSheet.uss");
             if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/Descant-1.1.2/Assets/DescantGraphEditorStyleSheet.uss");
 
             rootVisualElement.styleSheets.Add(styleSheet);
         }

diff --git a/Editor/Window/DescantGraphView.cs b/Editor/Window/DescantGraphView.cs
@@ -228,8 +228,11 @@ void AddManipulators()
         void AddStyleSheet()
         {
             StyleSheet styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Packages/Descant-1.1.2/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/Descant-1.1.2/Assets/DescantGraphEditorStyleSheet.uss");
             if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/com.owmacohe.descant/Assets/DescantGraphEditorStyleSheet.uss");
+            if (styleSheet == null) styleSheet = (StyleSheet)EditorGUIUtility.Load("Assets/Packages/Descant-1.1.2/Assets/DescantGraphEditorStyleSheet.uss");
 
             styleSheets.Add(styleSheet);
         }

diff --git a/Examples/Test_Graph.asset.meta b/Examples/Test_Graph.asset.meta
diff --git a/Examples/Test_NPC.asset b/Examples/Test_NPC.asset
@@ -21,4 +21,4 @@ MonoBehaviour:
   - Test_Player
   RelationshipValues:
   - 0.5
-  DialogueAttempts: 10
+  DialogueAttempts: 15
diff --git a/Examples/Test_NPC.asset.meta b/Examples/Test_NPC.asset.meta
diff --git a/Examples/Test_Player.asset.meta b/Examples/Test_Player.asset.meta
diff --git a/Examples/Test_Scene.unity b/Examples/Test_Scene.unity
@@ -223,8 +223,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 14
-  m_fontSizeBase: 14
+  m_fontSize: 12
+  m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -513,9 +513,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   UI: {fileID: 1216080874}
   displayOnStart: 1
-  graph: {fileID: 11400000, guid: 2afe73c3efc0cb54b875c1ed8a7d7fd2, type: 2}
-  player: {fileID: 11400000, guid: dd0840731343a1c4c8074948e9204850, type: 2}
-  NPC: {fileID: 11400000, guid: 949369597d8aa154e89f691798bf86c6, type: 2}
+  graph: {fileID: 11400000, guid: d983a4c99eb750a4aa7c4573d0bd7347, type: 2}
+  player: {fileID: 11400000, guid: aa50e7fd76a0a8c4ba679f3a8ac2fe0e, type: 2}
+  NPC: {fileID: 11400000, guid: ac3d79085608abb479f9d21705ca4a30, type: 2}
   extraActors: []
   portraits:
   - {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
@@ -665,6 +665,18 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4448661632235425834, guid: f628a439a00194aa4a7962cf53bda26c, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4448661632235425834, guid: f628a439a00194aa4a7962cf53bda26c, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4448661632235425834, guid: f628a439a00194aa4a7962cf53bda26c, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4448661632235425834, guid: f628a439a00194aa4a7962cf53bda26c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

diff --git a/Media/Screeenshots/actor.png b/Media/Screeenshots/actor.png
diff --git a/Media/Screenshots.meta b/Media/Screenshots.meta
diff --git a/Media/Screenshots/actor.png b/Media/Screenshots/actor.png
diff --git a/Media/Screeenshots/actor.png.meta → Media/Screenshots/actor.png.meta b/Media/Screeenshots/actor.png.meta → Media/Screenshots/actor.png.meta
diff --git a/Media/Screeenshots/editor.png → Media/Screenshots/editor.png b/Media/Screeenshots/editor.png → Media/Screenshots/editor.png
diff --git a/Media/Screeenshots/editor.png.meta → Media/Screenshots/editor.png.meta b/Media/Screeenshots/editor.png.meta → Media/Screenshots/editor.png.meta
diff --git a/Media/Screeenshots/game.png → Media/Screenshots/game.png b/Media/Screeenshots/game.png → Media/Screenshots/game.png
diff --git a/Media/Screeenshots/game.png.meta → Media/Screenshots/game.png.meta b/Media/Screeenshots/game.png.meta → Media/Screenshots/game.png.meta
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.1.1",
+  "version": "1.1.2",
   "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",