diff --git a/Assets/Examples/BasicConversation/Actors/FemalePortrait.png.meta b/Assets/Examples/BasicConversation/Actors/FemalePortrait.png.meta index b2cad8a..2c76832 100644 --- a/Assets/Examples/BasicConversation/Actors/FemalePortrait.png.meta +++ b/Assets/Examples/BasicConversation/Actors/FemalePortrait.png.meta @@ -58,7 +58,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,13 +81,14 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Examples/BasicConversation/Actors/MalePortrait.png.meta b/Assets/Examples/BasicConversation/Actors/MalePortrait.png.meta index 9d39c8d..89a5e2f 100644 --- a/Assets/Examples/BasicConversation/Actors/MalePortrait.png.meta +++ b/Assets/Examples/BasicConversation/Actors/MalePortrait.png.meta @@ -58,7 +58,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,13 +81,14 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Examples/BasicConversation/ExampleConversation.asset b/Assets/Examples/BasicConversation/ExampleConversation.asset index 9aebb50..d04ad65 100644 --- a/Assets/Examples/BasicConversation/ExampleConversation.asset +++ b/Assets/Examples/BasicConversation/ExampleConversation.asset @@ -85,6 +85,21 @@ MonoBehaviour: choices: [] actor: {fileID: 11400000, guid: d6a8e0fd1eb801d4ca00320f6b2e9e8b, type: 2} dialogue: What of the king's enemies. They said they'd send reinforcements. +--- !u!114 &-7811679642350466681 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 949d12ec87ffe584496e1a35ca4c038f, type: 3} + m_Name: ExampleAction + m_EditorClassIdentifier: + _title: ExampleAction + _uniqueId: e12b3421-1683-4814-b40e-28a913c61d5c + _text: Example action ran --- !u!114 &-7347677369531188231 MonoBehaviour: m_ObjectHideFlags: 0 @@ -410,7 +425,7 @@ MonoBehaviour: - {fileID: -1807495471838374980} - {fileID: -7347677369531188231} root: {fileID: 426936237664981933} - scrollPosition: {x: 51823.676, y: 50046} + scrollPosition: {x: 49972.676, y: 49968} --- !u!114 &373158185418196577 MonoBehaviour: m_ObjectHideFlags: 0 @@ -650,7 +665,8 @@ MonoBehaviour: children: - {fileID: 373158185418196577} conditions: [] - enterActions: [] + enterActions: + - {fileID: -7811679642350466681} exitActions: [] choices: [] actor: {fileID: 11400000, guid: aebb863e25cae0a4495c09b6a617ecf6, type: 2} diff --git a/Assets/Examples/ExampleAction.cs b/Assets/Examples/ExampleAction.cs new file mode 100644 index 0000000..e056aba --- /dev/null +++ b/Assets/Examples/ExampleAction.cs @@ -0,0 +1,13 @@ +using CleverCrow.Fluid.Dialogues.Actions; +using UnityEngine; + +namespace CleverCrow.Fluid.Dialogues.Examples { + [CreateMenu("Example/Action")] + public class ExampleAction : ActionDataBase { + [SerializeField] private string _text; + + public override void OnStart () { + Debug.Log(_text); + } + } +} diff --git a/Assets/Examples/ExampleAction.cs.meta b/Assets/Examples/ExampleAction.cs.meta new file mode 100644 index 0000000..be2a0c7 --- /dev/null +++ b/Assets/Examples/ExampleAction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 949d12ec87ffe584496e1a35ca4c038f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta deleted file mode 100644 index fa95ce9..0000000 --- a/Assets/Plugins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c8eb0b4b8a4e074a8edad3e4d9a0733 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Editor.meta b/Assets/Plugins/Editor.meta deleted file mode 100644 index 2f0d802..0000000 --- a/Assets/Plugins/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0cfc184154d58409b9519b9e613f0722 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.fluid.dialogue/Editor/Inspectors/NodeDataBase/SortableLists/TypesToMenu.cs b/Assets/com.fluid.dialogue/Editor/Inspectors/NodeDataBase/SortableLists/TypesToMenu.cs index 411b4d4..3651fa0 100644 --- a/Assets/com.fluid.dialogue/Editor/Inspectors/NodeDataBase/SortableLists/TypesToMenu.cs +++ b/Assets/com.fluid.dialogue/Editor/Inspectors/NodeDataBase/SortableLists/TypesToMenu.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using UnityEngine; namespace CleverCrow.Fluid.Dialogues.Editors.Inspectors { public class TypesToMenu { @@ -18,19 +19,21 @@ public TypesToMenu () { } private static List GetTypeEntries () { - return Assembly - .GetAssembly(typeof(T)) - .GetTypes() - .Where(t => t.IsSubclassOf(typeof(T)) && !t.IsAbstract) - .Select(t => { - var attr = t.GetCustomAttribute(); + var list = new List(); + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { + foreach (var type in assembly.GetTypes()) { + if (!type.IsSubclassOf(typeof(T)) || type.IsAbstract) continue; + var attr = type.GetCustomAttribute(); - return new TypeEntry { - type = t, - path = attr?.Path ?? t.FullName, + list.Add(new TypeEntry { + type = type, + path = attr?.Path ?? type.FullName, priority = attr?.Priority ?? 0, - }; - }) + }); + } + } + + return list .OrderByDescending(t => t.priority) .ToList(); } diff --git a/Assets/com.fluid.dialogue/Tests/Editor/Nodes/NodeChoiceHubTest.cs b/Assets/com.fluid.dialogue/Tests/Editor/Nodes/NodeChoiceHubTest.cs index 3022259..4a9c63f 100644 --- a/Assets/com.fluid.dialogue/Tests/Editor/Nodes/NodeChoiceHubTest.cs +++ b/Assets/com.fluid.dialogue/Tests/Editor/Nodes/NodeChoiceHubTest.cs @@ -47,6 +47,7 @@ public class HubChoicesProperty : NodeChoiceHubTest { [Test] public void It_should_return_choices_with_a_valid_child_node () { var choice = Substitute.For(); + choice.IsValid.Returns(true); choice.GetValidChildNode() .Returns(x => A.Node.Build()); _choiceList.Add(choice); diff --git a/Assets/com.fluid.dialogue/Tests/Editor/com.fluid.dialogue.Editor.Tests.asmdef b/Assets/com.fluid.dialogue/Tests/Editor/com.fluid.dialogue.Editor.Tests.asmdef index 7b3c8b6..bdb0c3d 100644 --- a/Assets/com.fluid.dialogue/Tests/Editor/com.fluid.dialogue.Editor.Tests.asmdef +++ b/Assets/com.fluid.dialogue/Tests/Editor/com.fluid.dialogue.Editor.Tests.asmdef @@ -4,18 +4,23 @@ "com.fluid.dialogue", "com.fluid.dialogue.Editor", "com.fluid.database", - "com.fluid.unity-event-plus" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "com.fluid.unity-event-plus", + "UnityEngine.TestRunner", + "UnityEditor.TestRunner" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] -} + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll", + "NSubstitute.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [] +} \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 92906cd..cdf7c3f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -13,14 +13,22 @@ "clever-crow.nsubstitute": "2.0.3", "com.fluid.database": "2.0.0", "com.fluid.unity-event-plus": "1.1.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "2.0.8", "com.unity.analytics": "3.3.2", "com.unity.collab-proxy": "1.2.16", - "com.unity.package-manager-ui": "2.1.2", + "com.unity.ext.nunit": "1.0.0", + "com.unity.ide.rider": "1.1.0", + "com.unity.ide.vscode": "1.1.3", + "com.unity.package-manager-ui": "2.2.0", "com.unity.purchasing": "2.0.6", + "com.unity.test-framework": "1.0.13", "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.0.0", + "com.unity.timeline": "1.1.0", + "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 00a3cf8..5c5c469 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.1.14f1 -m_EditorVersionWithRevision: 2019.1.14f1 (148b5891095a) +m_EditorVersion: 2019.2.17f1 +m_EditorVersionWithRevision: 2019.2.17f1 (8e603399ca02)