diff --git a/Assets/Fungus/Dialog/Sprites/Arrow.png b/Assets/Fungus/Dialog/Deprecated/Arrow.png similarity index 100% rename from Assets/Fungus/Dialog/Sprites/Arrow.png rename to Assets/Fungus/Dialog/Deprecated/Arrow.png diff --git a/Assets/Fungus/Dialog/Sprites/Arrow.png.meta b/Assets/Fungus/Dialog/Deprecated/Arrow.png.meta similarity index 100% rename from Assets/Fungus/Dialog/Sprites/Arrow.png.meta rename to Assets/Fungus/Dialog/Deprecated/Arrow.png.meta diff --git a/Assets/Fungus/Dialog/Deprecated/Choose.cs b/Assets/Fungus/Dialog/Deprecated/Choose.cs index 7e55b94c..a331b837 100644 --- a/Assets/Fungus/Dialog/Deprecated/Choose.cs +++ b/Assets/Fungus/Dialog/Deprecated/Choose.cs @@ -47,14 +47,9 @@ namespace Fungus showBasicGUI = false; if (chooseDialog == null) { - if ( character != null ) { - // Try to get character's choose box - chooseDialog = character.chooseDialogBox; - } - if (chooseDialog == null) { - // Try to get any SayDialog in the scene + // Try to get any ChooseDialog in the scene chooseDialog = GameObject.FindObjectOfType(); } diff --git a/Assets/Fungus/Dialog/Scripts/ChooseDialog.cs b/Assets/Fungus/Dialog/Deprecated/ChooseDialog.cs similarity index 100% rename from Assets/Fungus/Dialog/Scripts/ChooseDialog.cs rename to Assets/Fungus/Dialog/Deprecated/ChooseDialog.cs diff --git a/Assets/Fungus/Dialog/Scripts/ChooseDialog.cs.meta b/Assets/Fungus/Dialog/Deprecated/ChooseDialog.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Scripts/ChooseDialog.cs.meta rename to Assets/Fungus/Dialog/Deprecated/ChooseDialog.cs.meta diff --git a/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab b/Assets/Fungus/Dialog/Deprecated/ChooseDialog.prefab similarity index 99% rename from Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab rename to Assets/Fungus/Dialog/Deprecated/ChooseDialog.prefab index 44558b1c..5d5d6ac2 100644 --- a/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab +++ b/Assets/Fungus/Dialog/Deprecated/ChooseDialog.prefab @@ -338,7 +338,6 @@ MonoBehaviour: m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Priority: 3 ignoreReversedGraphics: 1 blockingObjects: 0 m_BlockingMask: diff --git a/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab.meta b/Assets/Fungus/Dialog/Deprecated/ChooseDialog.prefab.meta similarity index 100% rename from Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab.meta rename to Assets/Fungus/Dialog/Deprecated/ChooseDialog.prefab.meta diff --git a/Assets/Fungus/Dialog/Scripts/Commands/ChooseOption.cs b/Assets/Fungus/Dialog/Deprecated/ChooseOption.cs similarity index 96% rename from Assets/Fungus/Dialog/Scripts/Commands/ChooseOption.cs rename to Assets/Fungus/Dialog/Deprecated/ChooseOption.cs index 5a49f7bc..0383dc68 100644 --- a/Assets/Fungus/Dialog/Scripts/Commands/ChooseOption.cs +++ b/Assets/Fungus/Dialog/Deprecated/ChooseOption.cs @@ -35,11 +35,6 @@ namespace Fungus { if (chooseDialog == null) { - if ( character != null ) { - // Try to get character's choose box - chooseDialog = character.chooseDialogBox; - } - if (chooseDialog == null) { // Try to get any ChooseDialog in the scene diff --git a/Assets/Fungus/Dialog/Scripts/Commands/ChooseOption.cs.meta b/Assets/Fungus/Dialog/Deprecated/ChooseOption.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Scripts/Commands/ChooseOption.cs.meta rename to Assets/Fungus/Dialog/Deprecated/ChooseOption.cs.meta diff --git a/Assets/Fungus/Dialog/Prefabs.meta b/Assets/Fungus/Dialog/Deprecated/Editor.meta similarity index 63% rename from Assets/Fungus/Dialog/Prefabs.meta rename to Assets/Fungus/Dialog/Deprecated/Editor.meta index 6aa2b926..5d044086 100644 --- a/Assets/Fungus/Dialog/Prefabs.meta +++ b/Assets/Fungus/Dialog/Deprecated/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5dc9fe37d5aec4305a124d133294994f +guid: 3565c35600a5b46c0b29c75e85a3e760 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Dialog/Editor/AddOptionEditor.cs b/Assets/Fungus/Dialog/Deprecated/Editor/AddOptionEditor.cs similarity index 100% rename from Assets/Fungus/Dialog/Editor/AddOptionEditor.cs rename to Assets/Fungus/Dialog/Deprecated/Editor/AddOptionEditor.cs diff --git a/Assets/Fungus/Dialog/Editor/AddOptionEditor.cs.meta b/Assets/Fungus/Dialog/Deprecated/Editor/AddOptionEditor.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Editor/AddOptionEditor.cs.meta rename to Assets/Fungus/Dialog/Deprecated/Editor/AddOptionEditor.cs.meta diff --git a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs b/Assets/Fungus/Dialog/Deprecated/Editor/ChooseEditor.cs similarity index 87% rename from Assets/Fungus/Dialog/Editor/ChooseEditor.cs rename to Assets/Fungus/Dialog/Deprecated/Editor/ChooseEditor.cs index 110b36f6..2624d9f4 100644 --- a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs +++ b/Assets/Fungus/Dialog/Deprecated/Editor/ChooseEditor.cs @@ -52,20 +52,9 @@ namespace Fungus t.character.portraits != null && // Character has a portraits field t.character.portraits.Count > 0 ) // Selected Character has at least 1 portrait { - ChooseDialog cd = t.chooseDialog; - if (t.chooseDialog == null) // If default box selected - { - cd = t.character.chooseDialogBox; // Try to get character's default choose dialog box - if (t.chooseDialog == null) // If no default specified, Try to get any ChooseDialog in the scene - { - cd = GameObject.FindObjectOfType(); - } - } - if (cd != null && cd.characterImage != null) // Check that selected choose dialog has a character image - { - showPortraits = true; - } - } + showPortraits = true; + } + if (showPortraits) { CommandEditor.ObjectField(portraitProp, diff --git a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs.meta b/Assets/Fungus/Dialog/Deprecated/Editor/ChooseEditor.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Editor/ChooseEditor.cs.meta rename to Assets/Fungus/Dialog/Deprecated/Editor/ChooseEditor.cs.meta diff --git a/Assets/Fungus/Dialog/Editor/ChooseOptionEditor.cs b/Assets/Fungus/Dialog/Deprecated/Editor/ChooseOptionEditor.cs similarity index 87% rename from Assets/Fungus/Dialog/Editor/ChooseOptionEditor.cs rename to Assets/Fungus/Dialog/Deprecated/Editor/ChooseOptionEditor.cs index 10095078..83e241f4 100644 --- a/Assets/Fungus/Dialog/Editor/ChooseOptionEditor.cs +++ b/Assets/Fungus/Dialog/Deprecated/Editor/ChooseOptionEditor.cs @@ -52,20 +52,9 @@ namespace Fungus t.character.portraits != null && // Character has a portraits field t.character.portraits.Count > 0 ) // Selected Character has at least 1 portrait { - ChooseDialog cd = t.chooseDialog; - if (t.chooseDialog == null) // If default box selected - { - cd = t.character.chooseDialogBox; // Try to get character's default choose dialog box - if (t.chooseDialog == null) // If no default specified, Try to get any ChooseDialog in the scene - { - cd = GameObject.FindObjectOfType(); - } - } - if (cd != null && cd.characterImage != null) // Check that selected choose dialog has a character image - { - showPortraits = true; - } + showPortraits = true; } + if (showPortraits) { CommandEditor.ObjectField(portraitProp, diff --git a/Assets/Fungus/Dialog/Editor/ChooseOptionEditor.cs.meta b/Assets/Fungus/Dialog/Deprecated/Editor/ChooseOptionEditor.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Editor/ChooseOptionEditor.cs.meta rename to Assets/Fungus/Dialog/Deprecated/Editor/ChooseOptionEditor.cs.meta diff --git a/Assets/Fungus/Dialog/Editor/OptionEditor.cs b/Assets/Fungus/Dialog/Deprecated/Editor/OptionEditor.cs similarity index 100% rename from Assets/Fungus/Dialog/Editor/OptionEditor.cs rename to Assets/Fungus/Dialog/Deprecated/Editor/OptionEditor.cs diff --git a/Assets/Fungus/Dialog/Editor/OptionEditor.cs.meta b/Assets/Fungus/Dialog/Deprecated/Editor/OptionEditor.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Editor/OptionEditor.cs.meta rename to Assets/Fungus/Dialog/Deprecated/Editor/OptionEditor.cs.meta diff --git a/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab b/Assets/Fungus/Dialog/Deprecated/NarratorDialog.prefab similarity index 99% rename from Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab rename to Assets/Fungus/Dialog/Deprecated/NarratorDialog.prefab index 191dde9e..ac006ca1 100644 --- a/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab +++ b/Assets/Fungus/Dialog/Deprecated/NarratorDialog.prefab @@ -133,7 +133,6 @@ MonoBehaviour: m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Priority: 3 ignoreReversedGraphics: 1 blockingObjects: 0 m_BlockingMask: @@ -385,6 +384,7 @@ CanvasGroup: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100004} + m_Enabled: 1 m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 diff --git a/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab.meta b/Assets/Fungus/Dialog/Deprecated/NarratorDialog.prefab.meta similarity index 100% rename from Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab.meta rename to Assets/Fungus/Dialog/Deprecated/NarratorDialog.prefab.meta diff --git a/Assets/Fungus/Dialog/Scripts/Commands/Option.cs b/Assets/Fungus/Dialog/Deprecated/Option.cs similarity index 100% rename from Assets/Fungus/Dialog/Scripts/Commands/Option.cs rename to Assets/Fungus/Dialog/Deprecated/Option.cs diff --git a/Assets/Fungus/Dialog/Scripts/Commands/Option.cs.meta b/Assets/Fungus/Dialog/Deprecated/Option.cs.meta similarity index 100% rename from Assets/Fungus/Dialog/Scripts/Commands/Option.cs.meta rename to Assets/Fungus/Dialog/Deprecated/Option.cs.meta diff --git a/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab b/Assets/Fungus/Dialog/Deprecated/SayDialog.prefab similarity index 99% rename from Assets/Fungus/Dialog/Prefabs/SayDialog.prefab rename to Assets/Fungus/Dialog/Deprecated/SayDialog.prefab index 410634a5..5cd7ff6d 100644 --- a/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab +++ b/Assets/Fungus/Dialog/Deprecated/SayDialog.prefab @@ -168,7 +168,6 @@ MonoBehaviour: m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Priority: 3 ignoreReversedGraphics: 1 blockingObjects: 0 m_BlockingMask: @@ -529,6 +528,7 @@ CanvasGroup: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100006} + m_Enabled: 1 m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 diff --git a/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab.meta b/Assets/Fungus/Dialog/Deprecated/SayDialog.prefab.meta similarity index 100% rename from Assets/Fungus/Dialog/Prefabs/SayDialog.prefab.meta rename to Assets/Fungus/Dialog/Deprecated/SayDialog.prefab.meta diff --git a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs index 3a286d1b..2df987f0 100644 --- a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs +++ b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs @@ -23,8 +23,6 @@ namespace Fungus { nameTextProp = serializedObject.FindProperty ("nameText"); nameColorProp = serializedObject.FindProperty ("nameColor"); - sayDialogBoxProp = serializedObject.FindProperty ("sayDialogBox"); - chooseDialogBoxProp = serializedObject.FindProperty ("chooseDialogBox"); soundEffectProp = serializedObject.FindProperty ("soundEffect"); portraitsProp = serializedObject.FindProperty ("portraits"); notesProp = serializedObject.FindProperty ("notes"); @@ -48,8 +46,6 @@ namespace Fungus EditorGUILayout.PropertyField(nameTextProp, new GUIContent("Name Text", "Name of the character display in the dialog")); EditorGUILayout.PropertyField(nameColorProp, new GUIContent("Name Color", "Color of name text display in the dialog")); - EditorGUILayout.PropertyField(sayDialogBoxProp, new GUIContent("Say Dialog", "Say dialog box this character should use")); - EditorGUILayout.PropertyField(chooseDialogBoxProp, new GUIContent("Choose Dialog", "Choose dialog box this character should use")); EditorGUILayout.PropertyField(soundEffectProp, new GUIContent("Sound Effect", "Sound to play when the character is talking. Overrides the setting in the Dialog.")); ReorderableListGUI.Title(new GUIContent("Portraits", "Character image sprites to display in the dialog")); diff --git a/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs b/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs index 035051af..efa047cd 100644 --- a/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs +++ b/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs @@ -5,31 +5,41 @@ using System.Collections; namespace Fungus { + // The prefab names are prefixed with Fungus to avoid clashes with any other prefabs in the project public class DialogMenuItems { [MenuItem("GameObject/Fungus/Dialog/Character")] static void CreateCharacter() { - FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Dialog/Prefabs/Character.prefab"); - } - - [MenuItem("GameObject/Fungus/Dialog/NarratorDialog")] - static void CreateNarratorDialog() - { - FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab"); + GameObject go = Resources.Load("FungusCharacter"); + if (go != null) + { + GameObject spawnedGO = PrefabUtility.InstantiatePrefab(go) as GameObject; + spawnedGO.name = "Character"; + } } [MenuItem("GameObject/Fungus/Dialog/SayDialog")] static void CreateSayDialog() { - FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Dialog/Prefabs/SayDialog.prefab"); + GameObject go = Resources.Load("FungusSayDialog"); + if (go != null) + { + GameObject spawnedGO = PrefabUtility.InstantiatePrefab(go) as GameObject; + spawnedGO.name = "SayDialog"; + } } - [MenuItem("GameObject/Fungus/Dialog/ChooseDialog")] - static void CreateChooseDialog() + [MenuItem("GameObject/Fungus/Dialog/MenuDialog")] + static void CreateMenuDialog() { - FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab"); + GameObject go = Resources.Load("FungusMenuDialog"); + if (go != null) + { + GameObject spawnedGO = PrefabUtility.InstantiatePrefab(go) as GameObject; + spawnedGO.name = "MenuDialog"; + } } } diff --git a/Assets/Fungus/Dialog/Editor/MenuEditor.cs b/Assets/Fungus/Dialog/Editor/MenuEditor.cs new file mode 100644 index 00000000..cbe9425e --- /dev/null +++ b/Assets/Fungus/Dialog/Editor/MenuEditor.cs @@ -0,0 +1,47 @@ +using UnityEditor; +using UnityEngine; +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + + [CustomEditor (typeof(Fungus.Menu))] + public class MenuEditor : CommandEditor + { + protected SerializedProperty textProp; + protected SerializedProperty targetSequenceProp; + protected SerializedProperty hideIfVisitedProp; + + protected virtual void OnEnable() + { + textProp = serializedObject.FindProperty("text"); + targetSequenceProp = serializedObject.FindProperty("targetSequence"); + hideIfVisitedProp = serializedObject.FindProperty("hideIfVisited"); + } + + public override void DrawCommandGUI() + { + FungusScript fungusScript = FungusScriptWindow.GetFungusScript(); + if (fungusScript == null) + { + return; + } + + serializedObject.Update(); + + EditorGUILayout.PropertyField(textProp); + + SequenceEditor.SequenceField(targetSequenceProp, + new GUIContent("Target Sequence", "Sequence to call when option is selected"), + new GUIContent(""), + fungusScript); + + EditorGUILayout.PropertyField(hideIfVisitedProp); + + serializedObject.ApplyModifiedProperties(); + } + } + +} diff --git a/Assets/Fungus/Dialog/Editor/MenuEditor.cs.meta b/Assets/Fungus/Dialog/Editor/MenuEditor.cs.meta new file mode 100644 index 00000000..90e19ca7 --- /dev/null +++ b/Assets/Fungus/Dialog/Editor/MenuEditor.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cda2f9e2356d4f89a34947e7138a492 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Fungus/Dialog/Editor/MenuTimerEditor.cs b/Assets/Fungus/Dialog/Editor/MenuTimerEditor.cs new file mode 100644 index 00000000..e8a5cf18 --- /dev/null +++ b/Assets/Fungus/Dialog/Editor/MenuTimerEditor.cs @@ -0,0 +1,41 @@ +using UnityEditor; +using UnityEngine; +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + [CustomEditor (typeof(MenuTimer))] + public class MenuTimerEditor : CommandEditor + { + protected SerializedProperty durationProp; + protected SerializedProperty targetSequenceProp; + + protected virtual void OnEnable() + { + durationProp = serializedObject.FindProperty("duration"); + targetSequenceProp = serializedObject.FindProperty("targetSequence"); + } + + public override void DrawCommandGUI() + { + FungusScript fungusScript = FungusScriptWindow.GetFungusScript(); + if (fungusScript == null) + { + return; + } + + serializedObject.Update(); + + EditorGUILayout.PropertyField(durationProp); + + SequenceEditor.SequenceField(targetSequenceProp, + new GUIContent("Target Sequence", "Sequence to call when timer expires"), + new GUIContent(""), + fungusScript); + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/Assets/Fungus/Dialog/Editor/MenuTimerEditor.cs.meta b/Assets/Fungus/Dialog/Editor/MenuTimerEditor.cs.meta new file mode 100644 index 00000000..f833146b --- /dev/null +++ b/Assets/Fungus/Dialog/Editor/MenuTimerEditor.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e5657f4bcb4c46f8bed6027c51ef4ba +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Fungus/Dialog/Editor/SayEditor.cs b/Assets/Fungus/Dialog/Editor/SayEditor.cs index c811964c..6502f77b 100644 --- a/Assets/Fungus/Dialog/Editor/SayEditor.cs +++ b/Assets/Fungus/Dialog/Editor/SayEditor.cs @@ -39,7 +39,8 @@ namespace Fungus protected SerializedProperty voiceOverClipProp; protected SerializedProperty showAlwaysProp; protected SerializedProperty showCountProp; - + protected SerializedProperty waitForInputProp; + protected virtual void OnEnable() { characterProp = serializedObject.FindProperty("character"); @@ -49,6 +50,7 @@ namespace Fungus voiceOverClipProp = serializedObject.FindProperty("voiceOverClip"); showAlwaysProp = serializedObject.FindProperty("showAlways"); showCountProp = serializedObject.FindProperty("showCount"); + waitForInputProp = serializedObject.FindProperty("waitForInput"); } public override void DrawCommandGUI() @@ -72,19 +74,7 @@ namespace Fungus t.character.portraits != null && // Character has a portraits field t.character.portraits.Count > 0 ) // Selected Character has at least 1 portrait { - SayDialog sd = t.sayDialog; - if (t.sayDialog == null) // If default box selected - { - sd = t.character.sayDialogBox; // Try to get character's default say dialog box - if (t.sayDialog == null) // If no default specified, try to get any SayDialog in the scene - { - sd = GameObject.FindObjectOfType(); - } - } - if (sd != null && sd.characterImage != null) // Check that selected say dialog has a character image - { - showPortraits = true; - } + showPortraits = true; } if (showPortraits) @@ -127,7 +117,9 @@ namespace Fungus { EditorGUILayout.PropertyField(showCountProp); } - + + EditorGUILayout.PropertyField(waitForInputProp); + if (showPortraits && t.portrait != null) { Texture2D characterTexture = t.portrait.texture; diff --git a/Assets/FungusExamples/TheFacility/Prefabs.meta b/Assets/Fungus/Dialog/Fonts/Exo2.meta similarity index 63% rename from Assets/FungusExamples/TheFacility/Prefabs.meta rename to Assets/Fungus/Dialog/Fonts/Exo2.meta index 7b76494a..67bed7df 100644 --- a/Assets/FungusExamples/TheFacility/Prefabs.meta +++ b/Assets/Fungus/Dialog/Fonts/Exo2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 216f492a9b9ea4a62946946b1f97212b +guid: e3712f6aa5daa46efa690a7288358254 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Bold.ttf b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Bold.ttf new file mode 100644 index 00000000..5e0913ff Binary files /dev/null and b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Bold.ttf differ diff --git a/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Bold.ttf.meta b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Bold.ttf.meta new file mode 100644 index 00000000..3f6468c9 --- /dev/null +++ b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Bold.ttf.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: ee3a4060b74a7fd45b0cc411c99fd8f2 +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + customCharacters: + fontRenderingMode: 0 + userData: diff --git a/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Regular.ttf b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Regular.ttf new file mode 100644 index 00000000..8e09f6fb Binary files /dev/null and b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Regular.ttf differ diff --git a/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Regular.ttf.meta b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Regular.ttf.meta new file mode 100644 index 00000000..41001191 --- /dev/null +++ b/Assets/Fungus/Dialog/Fonts/Exo2/Exo2-Regular.ttf.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 333ca057701a73249850670faef184dc +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + customCharacters: + fontRenderingMode: 0 + userData: diff --git a/Assets/Fungus/Dialog/Fonts/Exo2/OFL.txt b/Assets/Fungus/Dialog/Fonts/Exo2/OFL.txt new file mode 100644 index 00000000..f1a20ac1 --- /dev/null +++ b/Assets/Fungus/Dialog/Fonts/Exo2/OFL.txt @@ -0,0 +1,97 @@ +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Assets/Fungus/Dialog/Fonts/Exo2/OFL.txt.meta b/Assets/Fungus/Dialog/Fonts/Exo2/OFL.txt.meta new file mode 100644 index 00000000..f2c45082 --- /dev/null +++ b/Assets/Fungus/Dialog/Fonts/Exo2/OFL.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 7d156fd4f9c8d4276bddbf2e3c0e820b +TextScriptImporter: + userData: diff --git a/Assets/Fungus/Dialog/Images.meta b/Assets/Fungus/Dialog/Images.meta new file mode 100644 index 00000000..a924da61 --- /dev/null +++ b/Assets/Fungus/Dialog/Images.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: bbcb57c04f3008e4391c6b2866a718fb +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Dialog/Sprites/Attribution.txt b/Assets/Fungus/Dialog/Images/Attribution.txt similarity index 100% rename from Assets/Fungus/Dialog/Sprites/Attribution.txt rename to Assets/Fungus/Dialog/Images/Attribution.txt diff --git a/Assets/Fungus/Dialog/Sprites/Attribution.txt.meta b/Assets/Fungus/Dialog/Images/Attribution.txt.meta similarity index 100% rename from Assets/Fungus/Dialog/Sprites/Attribution.txt.meta rename to Assets/Fungus/Dialog/Images/Attribution.txt.meta diff --git a/Assets/Fungus/Dialog/Images/ContinueIcon.png b/Assets/Fungus/Dialog/Images/ContinueIcon.png new file mode 100644 index 00000000..73d612bb Binary files /dev/null and b/Assets/Fungus/Dialog/Images/ContinueIcon.png differ diff --git a/Assets/Fungus/Dialog/Images/ContinueIcon.png.meta b/Assets/Fungus/Dialog/Images/ContinueIcon.png.meta new file mode 100644 index 00000000..3ef8d3e7 --- /dev/null +++ b/Assets/Fungus/Dialog/Images/ContinueIcon.png.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 226248ac6f184e448af731df91b91958 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Dialog/Images/DialogBox.png b/Assets/Fungus/Dialog/Images/DialogBox.png new file mode 100644 index 00000000..e34fa165 Binary files /dev/null and b/Assets/Fungus/Dialog/Images/DialogBox.png differ diff --git a/Assets/Fungus/Dialog/Images/DialogBox.png.meta b/Assets/Fungus/Dialog/Images/DialogBox.png.meta new file mode 100644 index 00000000..dd264892 --- /dev/null +++ b/Assets/Fungus/Dialog/Images/DialogBox.png.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: eeb00f6cd27e9ef4d9174551b3342dec +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Dialog/Sprites/Mushroom.png b/Assets/Fungus/Dialog/Images/Mushroom.png similarity index 100% rename from Assets/Fungus/Dialog/Sprites/Mushroom.png rename to Assets/Fungus/Dialog/Images/Mushroom.png diff --git a/Assets/Fungus/Dialog/Sprites/Mushroom.png.meta b/Assets/Fungus/Dialog/Images/Mushroom.png.meta similarity index 100% rename from Assets/Fungus/Dialog/Sprites/Mushroom.png.meta rename to Assets/Fungus/Dialog/Images/Mushroom.png.meta diff --git a/Assets/Fungus/Dialog/Images/OptionButton.png b/Assets/Fungus/Dialog/Images/OptionButton.png new file mode 100644 index 00000000..cdf459e4 Binary files /dev/null and b/Assets/Fungus/Dialog/Images/OptionButton.png differ diff --git a/Assets/Fungus/Dialog/Images/OptionButton.png.meta b/Assets/Fungus/Dialog/Images/OptionButton.png.meta new file mode 100644 index 00000000..704d387e --- /dev/null +++ b/Assets/Fungus/Dialog/Images/OptionButton.png.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: c207de86481ff7d48a2fba2fcc374723 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 20, y: 26, z: 20, w: 20} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Dialog/Images/OptionButtonDisabled.png b/Assets/Fungus/Dialog/Images/OptionButtonDisabled.png new file mode 100644 index 00000000..13011820 Binary files /dev/null and b/Assets/Fungus/Dialog/Images/OptionButtonDisabled.png differ diff --git a/Assets/Fungus/Dialog/Images/OptionButtonDisabled.png.meta b/Assets/Fungus/Dialog/Images/OptionButtonDisabled.png.meta new file mode 100644 index 00000000..adaaddf4 --- /dev/null +++ b/Assets/Fungus/Dialog/Images/OptionButtonDisabled.png.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 49d5ccdda7b99e24787c2abc3891294c +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 20, y: 26, z: 20, w: 20} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Dialog/Images/OptionButtonHighlighted.png b/Assets/Fungus/Dialog/Images/OptionButtonHighlighted.png new file mode 100644 index 00000000..a2c8e50e Binary files /dev/null and b/Assets/Fungus/Dialog/Images/OptionButtonHighlighted.png differ diff --git a/Assets/Fungus/Dialog/Images/OptionButtonHighlighted.png.meta b/Assets/Fungus/Dialog/Images/OptionButtonHighlighted.png.meta new file mode 100644 index 00000000..a0c0d810 --- /dev/null +++ b/Assets/Fungus/Dialog/Images/OptionButtonHighlighted.png.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 888feb4a32e3b564fb7e6f9b28cc8e10 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 20, y: 26, z: 20, w: 20} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Dialog/Images/OptionButtonPressed.png b/Assets/Fungus/Dialog/Images/OptionButtonPressed.png new file mode 100644 index 00000000..d96f73d6 Binary files /dev/null and b/Assets/Fungus/Dialog/Images/OptionButtonPressed.png differ diff --git a/Assets/Fungus/Dialog/Images/OptionButtonPressed.png.meta b/Assets/Fungus/Dialog/Images/OptionButtonPressed.png.meta new file mode 100644 index 00000000..5f3de2e9 --- /dev/null +++ b/Assets/Fungus/Dialog/Images/OptionButtonPressed.png.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 20, y: 23, z: 20, w: 23} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Dialog/Resources.meta b/Assets/Fungus/Dialog/Resources.meta new file mode 100644 index 00000000..376badf5 --- /dev/null +++ b/Assets/Fungus/Dialog/Resources.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 92e86c1e0db8e4ea29c05df76d0cff9e +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Dialog/Prefabs/Character.prefab b/Assets/Fungus/Dialog/Resources/FungusCharacter.prefab similarity index 93% rename from Assets/Fungus/Dialog/Prefabs/Character.prefab rename to Assets/Fungus/Dialog/Resources/FungusCharacter.prefab index e3719604..5ccf99ee 100644 --- a/Assets/Fungus/Dialog/Prefabs/Character.prefab +++ b/Assets/Fungus/Dialog/Resources/FungusCharacter.prefab @@ -10,7 +10,7 @@ GameObject: - 4: {fileID: 400000} - 114: {fileID: 11400000} m_Layer: 0 - m_Name: Character + m_Name: FungusCharacter m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -41,7 +41,9 @@ MonoBehaviour: m_EditorClassIdentifier: nameText: Character Name nameColor: {r: 1, g: 1, b: 1, a: 1} - profileSprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + soundEffect: {fileID: 0} + profileSprite: {fileID: 0} + portraits: [] notes: --- !u!1001 &100100000 Prefab: diff --git a/Assets/Fungus/Dialog/Prefabs/Character.prefab.meta b/Assets/Fungus/Dialog/Resources/FungusCharacter.prefab.meta similarity index 100% rename from Assets/Fungus/Dialog/Prefabs/Character.prefab.meta rename to Assets/Fungus/Dialog/Resources/FungusCharacter.prefab.meta diff --git a/Assets/Fungus/Dialog/Resources/FungusEventSystem.prefab b/Assets/Fungus/Dialog/Resources/FungusEventSystem.prefab new file mode 100644 index 00000000..f35bd4bf --- /dev/null +++ b/Assets/Fungus/Dialog/Resources/FungusEventSystem.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &179528 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 479528} + - 114: {fileID: 11479524} + - 114: {fileID: 11479526} + - 114: {fileID: 11479528} + m_Layer: 0 + m_Name: FungusEventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &479528 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179528} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11479524 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!114 &11479526 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_AllowActivationOnMobileDevice: 0 +--- !u!114 &11479528 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowActivationOnStandalone: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 179528} + m_IsPrefabParent: 1 + m_IsExploded: 1 diff --git a/Assets/FungusExamples/TheFacility/Prefabs/CYOAChooseDialog.prefab.meta b/Assets/Fungus/Dialog/Resources/FungusEventSystem.prefab.meta similarity index 58% rename from Assets/FungusExamples/TheFacility/Prefabs/CYOAChooseDialog.prefab.meta rename to Assets/Fungus/Dialog/Resources/FungusEventSystem.prefab.meta index 517c019c..64bd8b52 100644 --- a/Assets/FungusExamples/TheFacility/Prefabs/CYOAChooseDialog.prefab.meta +++ b/Assets/Fungus/Dialog/Resources/FungusEventSystem.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: f1eee15a132714adc82ac08c008b0cf0 +guid: 6ba8287b46c1545a789e1b569cad35eb NativeFormatImporter: userData: diff --git a/Assets/FungusExamples/TheFacility/Prefabs/CYOAChooseDialog.prefab b/Assets/Fungus/Dialog/Resources/FungusMenuDialog.prefab similarity index 65% rename from Assets/FungusExamples/TheFacility/Prefabs/CYOAChooseDialog.prefab rename to Assets/Fungus/Dialog/Resources/FungusMenuDialog.prefab index e4e2a09b..bee5436f 100644 --- a/Assets/FungusExamples/TheFacility/Prefabs/CYOAChooseDialog.prefab +++ b/Assets/Fungus/Dialog/Resources/FungusMenuDialog.prefab @@ -1,17 +1,17 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &100000 +--- !u!1 &115092 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400000} - - 222: {fileID: 22200000} - - 114: {fileID: 11400004} - - 114: {fileID: 11400002} - - 114: {fileID: 11400000} + - 224: {fileID: 22415092} + - 222: {fileID: 22215098} + - 114: {fileID: 11415066} + - 114: {fileID: 11415068} + - 114: {fileID: 11415070} m_Layer: 5 m_Name: OptionButton5 m_TagString: Untagged @@ -19,33 +19,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100002 +--- !u!1 &115094 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400002} - - 222: {fileID: 22200002} - - 114: {fileID: 11400006} + - 224: {fileID: 22415094} + - 222: {fileID: 22215100} + - 114: {fileID: 11415072} + - 114: {fileID: 11415074} + - 114: {fileID: 11415076} m_Layer: 5 - m_Name: Text + m_Name: OptionButton0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100004 +--- !u!1 &115096 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400004} - - 222: {fileID: 22200004} - - 114: {fileID: 11400008} + - 224: {fileID: 22415096} + - 222: {fileID: 22215102} + - 114: {fileID: 11415078} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -53,18 +55,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100006 +--- !u!1 &115098 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400006} - - 222: {fileID: 22200006} - - 114: {fileID: 11400010} - - 114: {fileID: 11400012} - - 114: {fileID: 11400014} + - 224: {fileID: 22415098} + - 222: {fileID: 22215104} + - 114: {fileID: 11415080} + - 114: {fileID: 11415082} + - 114: {fileID: 11415084} m_Layer: 5 m_Name: OptionButton4 m_TagString: Untagged @@ -72,35 +74,16 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100008 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22400008} - - 222: {fileID: 22200008} - - 114: {fileID: 11400020} - - 114: {fileID: 11400018} - - 114: {fileID: 11400016} - m_Layer: 5 - m_Name: OptionButton3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &100010 +--- !u!1 &115100 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400010} - - 222: {fileID: 22200010} - - 114: {fileID: 11400022} + - 224: {fileID: 22415100} + - 222: {fileID: 22215106} + - 114: {fileID: 11415086} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -108,189 +91,179 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100012 +--- !u!1 &115102 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 400000} - - 114: {fileID: 11400024} - m_Layer: 0 - m_Name: CYOAChooseDialog + - 224: {fileID: 22415102} + - 223: {fileID: 22315124} + - 114: {fileID: 11415088} + - 225: {fileID: 22515124} + - 114: {fileID: 11415064} + - 114: {fileID: 11415124} + m_Layer: 5 + m_Name: FungusMenuDialog m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100014 +--- !u!1 &115104 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400012} - - 222: {fileID: 22200012} - - 114: {fileID: 11400026} + - 224: {fileID: 22415104} + - 222: {fileID: 22215108} + - 114: {fileID: 11415090} + - 114: {fileID: 11415092} + - 114: {fileID: 11415094} m_Layer: 5 - m_Name: Text + m_Name: OptionButton3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100016 +--- !u!1 &115106 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400014} - - 222: {fileID: 22200014} - - 114: {fileID: 11400032} - - 114: {fileID: 11400030} - - 114: {fileID: 11400028} + - 224: {fileID: 22415106} + - 222: {fileID: 22215110} + - 114: {fileID: 11415096} + - 114: {fileID: 11415098} + - 114: {fileID: 11415100} m_Layer: 5 - m_Name: OptionButton2 + m_Name: OptionButton1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100018 +--- !u!1 &115108 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400016} - - 222: {fileID: 22200016} - - 114: {fileID: 11400034} + - 224: {fileID: 22415108} + - 222: {fileID: 22215112} + - 114: {fileID: 11415102} + - 114: {fileID: 11415104} + - 114: {fileID: 11404784} m_Layer: 5 - m_Name: Fill + m_Name: TimeoutSlider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100020 +--- !u!1 &115110 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400018} - - 222: {fileID: 22200018} - - 114: {fileID: 11400038} - - 114: {fileID: 11400036} - - 114: {fileID: 11400040} + - 224: {fileID: 22415110} + - 222: {fileID: 22215114} + - 114: {fileID: 11415106} m_Layer: 5 - m_Name: OptionButton0 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100022 +--- !u!1 &115112 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400020} - m_Layer: 5 - m_Name: Fill Area + - 224: {fileID: 22415112} + - 114: {fileID: 11415108} + - 114: {fileID: 11404786} + - 114: {fileID: 11404782} + m_Layer: 0 + m_Name: ButtonGroup m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100024 +--- !u!1 &115114 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400022} - - 222: {fileID: 22200020} - - 114: {fileID: 11400044} - - 114: {fileID: 11400042} + - 224: {fileID: 22415114} + - 222: {fileID: 22215116} + - 114: {fileID: 11415110} + - 114: {fileID: 11415112} + - 114: {fileID: 11415114} m_Layer: 5 - m_Name: TimeoutSlider + m_Name: OptionButton2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100026 +--- !u!1 &115116 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400024} - - 222: {fileID: 22200022} - - 114: {fileID: 11400048} - - 114: {fileID: 11400046} + - 224: {fileID: 22415116} m_Layer: 5 - m_Name: StoryText + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100028 +--- !u!1 &115118 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400026} - - 114: {fileID: 11400050} - m_Layer: 0 - m_Name: ButtonGroup - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &100030 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22400028} - - 223: {fileID: 22300000} - - 114: {fileID: 11400054} - - 114: {fileID: 11400052} + - 224: {fileID: 22415118} + - 222: {fileID: 22215118} + - 114: {fileID: 11415116} m_Layer: 5 - m_Name: Canvas + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!1 &100032 + m_IsActive: 1 +--- !u!1 &115120 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400030} - - 222: {fileID: 22200024} - - 114: {fileID: 11400056} + - 224: {fileID: 22415120} + - 222: {fileID: 22215120} + - 114: {fileID: 11415118} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -298,35 +271,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100034 +--- !u!1 &115122 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400032} - - 222: {fileID: 22200026} - - 114: {fileID: 11400060} - - 114: {fileID: 11400058} - - 114: {fileID: 11400062} + - 224: {fileID: 22415122} + - 222: {fileID: 22215122} + - 114: {fileID: 11415120} m_Layer: 5 - m_Name: OptionButton1 + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &100036 +--- !u!1 &115124 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 224: {fileID: 22400034} - - 222: {fileID: 22200028} - - 114: {fileID: 11400064} + - 224: {fileID: 22415124} + - 222: {fileID: 22215124} + - 114: {fileID: 11415122} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -334,25 +305,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &400000 -Transform: +--- !u!114 &11404782 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100012} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 22400028} - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!114 &11400000 + m_GameObject: {fileID: 115112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &11404784 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100000} + m_GameObject: {fileID: 115108} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -362,64 +333,59 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: -1 + m_PreferredHeight: 50 m_FlexibleWidth: -1 m_FlexibleHeight: -1 ---- !u!114 &11400002 +--- !u!114 &11404786 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100000} + m_GameObject: {fileID: 115112} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} - m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} - m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} - m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} - m_ColorMultiplier: 2 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 11400004} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &11400004 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 +--- !u!114 &11415064 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100000} + m_GameObject: {fileID: 115102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + ignoreReversedGraphics: 1 + blockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &11415066 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115092} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: .862745106} + m_Sprite: {fileID: 21300000, guid: c207de86481ff7d48a2fba2fcc374723, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -427,72 +393,80 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11400006 +--- !u!114 &11415068 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100002} + m_GameObject: {fileID: 115092} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 24 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Continue ---- !u!114 &11400008 + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .145098045, g: .75686276, b: .87843138, a: .698039234} + m_PressedColor: {r: .0784313753, g: .513725519, b: .600000024, a: 1} + m_DisabledColor: {r: .588235319, g: .647058845, b: .666666687, a: .501960814} + m_ColorMultiplier: 2 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 888feb4a32e3b564fb7e6f9b28cc8e10, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11415066} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11415070 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100004} + m_GameObject: {fileID: 115092} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 24 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Continue ---- !u!114 &11400010 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 100 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11415072 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100006} + m_GameObject: {fileID: 115094} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: .862745106} + m_Sprite: {fileID: 21300000, guid: c207de86481ff7d48a2fba2fcc374723, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -500,12 +474,12 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11400012 +--- !u!114 &11415074 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100006} + m_GameObject: {fileID: 115094} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -517,36 +491,37 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} - m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} - m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} - m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .145098045, g: .75686276, b: .87843138, a: .698039234} + m_PressedColor: {r: .0784313753, g: .513725519, b: .600000024, a: 1} + m_DisabledColor: {r: .588235319, g: .647058845, b: .666666687, a: .501960814} m_ColorMultiplier: 2 m_FadeDuration: .100000001 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 888feb4a32e3b564fb7e6f9b28cc8e10, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 11400010} + m_TargetGraphic: {fileID: 11415072} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &11400014 +--- !u!114 &11415076 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100006} + m_GameObject: {fileID: 115094} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -556,33 +531,62 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: -1 + m_PreferredHeight: 100 m_FlexibleWidth: -1 m_FlexibleHeight: -1 ---- !u!114 &11400016 +--- !u!114 &11415078 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100008} + m_GameObject: {fileID: 115096} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!114 &11400018 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FontData: + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Continue +--- !u!114 &11415080 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100008} + m_GameObject: {fileID: 115098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: .862745106} + m_Sprite: {fileID: 21300000, guid: c207de86481ff7d48a2fba2fcc374723, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11415082 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115098} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -594,156 +598,123 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} - m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} - m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} - m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .145098045, g: .75686276, b: .87843138, a: .698039234} + m_PressedColor: {r: .0784313753, g: .513725519, b: .600000024, a: 1} + m_DisabledColor: {r: .588235319, g: .647058845, b: .666666687, a: .501960814} m_ColorMultiplier: 2 m_FadeDuration: .100000001 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 888feb4a32e3b564fb7e6f9b28cc8e10, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 11400020} + m_TargetGraphic: {fileID: 11415080} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &11400020 +--- !u!114 &11415084 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100008} + m_GameObject: {fileID: 115098} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11400022 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 100 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11415086 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100010} + m_GameObject: {fileID: 115100} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 24 + m_MinSize: 30 + m_MaxSize: 40 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Continue ---- !u!114 &11400024 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100012} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7a657dd101e84d9da0a5ee5f934317d, type: 3} - m_Name: - m_EditorClassIdentifier: - writingSpeed: 60 - writingSound: {fileID: 0} - loopWritingSound: 1 - punctuationPause: .400000006 - clickAnywhere: 1 - dialogCanvas: {fileID: 22300000} - nameText: {fileID: 0} - storyText: {fileID: 11400048} - characterImage: {fileID: 0} - characterTypingSound: {fileID: 0} - timeoutSlider: {fileID: 11400042} - optionButtons: - - {fileID: 11400036} - - {fileID: 11400058} - - {fileID: 11400030} - - {fileID: 11400018} - - {fileID: 11400012} - - {fileID: 11400002} ---- !u!114 &11400026 +--- !u!114 &11415088 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100014} + m_GameObject: {fileID: 115102} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 24 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Continue ---- !u!114 &11400028 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 32 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1600, y: 1200} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &11415090 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100016} + m_GameObject: {fileID: 115104} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!114 &11400030 + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: .862745106} + m_Sprite: {fileID: 21300000, guid: c207de86481ff7d48a2fba2fcc374723, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11415092 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100016} + m_GameObject: {fileID: 115104} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -755,65 +726,63 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} - m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} - m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} - m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .145098045, g: .75686276, b: .87843138, a: .698039234} + m_PressedColor: {r: .0784313753, g: .513725519, b: .600000024, a: 1} + m_DisabledColor: {r: .588235319, g: .647058845, b: .666666687, a: .501960814} m_ColorMultiplier: 2 m_FadeDuration: .100000001 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 888feb4a32e3b564fb7e6f9b28cc8e10, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 11400032} + m_TargetGraphic: {fileID: 11415090} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &11400032 +--- !u!114 &11415094 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100016} + m_GameObject: {fileID: 115104} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11400034 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 100 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11415096 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100018} + m_GameObject: {fileID: 115106} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 1, b: .0896551609, a: .588235319} - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: .862745106} + m_Sprite: {fileID: 21300000, guid: c207de86481ff7d48a2fba2fcc374723, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -821,12 +790,12 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11400036 +--- !u!114 &11415098 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100020} + m_GameObject: {fileID: 115106} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -838,75 +807,76 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} - m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} - m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} - m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .145098045, g: .75686276, b: .87843138, a: .698039234} + m_PressedColor: {r: .0784313753, g: .513725519, b: .600000024, a: 1} + m_DisabledColor: {r: .588235319, g: .647058845, b: .666666687, a: .501960814} m_ColorMultiplier: 2 m_FadeDuration: .100000001 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 888feb4a32e3b564fb7e6f9b28cc8e10, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 11400038} + m_TargetGraphic: {fileID: 11415096} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &11400038 +--- !u!114 &11415100 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100020} + m_GameObject: {fileID: 115106} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11400040 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 100 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11415102 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100020} + m_GameObject: {fileID: 115108} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!114 &11400042 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: .588} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11415104 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100024} + m_GameObject: {fileID: 115108} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -920,7 +890,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} + m_NormalColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} @@ -935,11 +905,11 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 11400044} - m_FillRect: {fileID: 22400016} + m_Interactable: 0 + m_TargetGraphic: {fileID: 11415102} + m_FillRect: {fileID: 22415122} m_HandleRect: {fileID: 0} - m_Direction: 0 + m_Direction: 1 m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 @@ -949,47 +919,12 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &11400044 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100024} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11400046 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 1} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &11400048 +--- !u!114 &11415106 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100026} + m_GameObject: {fileID: 115110} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -998,27 +933,27 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 26 + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 26 - m_Alignment: 0 + m_MinSize: 30 + m_MaxSize: 40 + m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Story text ---- !u!114 &11400050 + m_Text: Continue +--- !u!114 &11415108 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100028} - m_Enabled: 1 + m_GameObject: {fileID: 115112} + m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -2095666955, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -1027,127 +962,158 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 ---- !u!114 &11400052 + m_StartCorner: 0 + m_StartAxis: 1 + m_CellSize: {x: 1300, y: 80} + m_Spacing: {x: 0, y: 10} + m_Constraint: 1 + m_ConstraintCount: 1 +--- !u!114 &11415110 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100030} + m_GameObject: {fileID: 115114} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1024, y: 768} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!114 &11400054 + m_Material: {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: .862745106} + m_Sprite: {fileID: 21300000, guid: c207de86481ff7d48a2fba2fcc374723, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11415112 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100030} + m_GameObject: {fileID: 115114} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Priority: 3 - ignoreReversedGraphics: 1 - blockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &11400056 + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .145098045, g: .75686276, b: .87843138, a: .698039234} + m_PressedColor: {r: .0784313753, g: .513725519, b: .600000024, a: 1} + m_DisabledColor: {r: .588235319, g: .647058845, b: .666666687, a: .501960814} + m_ColorMultiplier: 2 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 888feb4a32e3b564fb7e6f9b28cc8e10, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11415110} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11415114 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 100 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11415116 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100032} + m_GameObject: {fileID: 115118} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 24 + m_MinSize: 30 + m_MaxSize: 40 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Continue ---- !u!114 &11400058 +--- !u!114 &11415118 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100034} + m_GameObject: {fileID: 115120} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: .501960814, g: .501960814, b: .501960814, a: .501960814} - m_HighlightedColor: {r: .501960814, g: .501960814, b: .501960814, a: .698039234} - m_PressedColor: {r: .345098048, g: .345098048, b: .345098048, a: .698039234} - m_DisabledColor: {r: .250980407, g: .250980407, b: .250980407, a: .501960814} - m_ColorMultiplier: 2 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 11400060} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &11400060 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FontData: + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Continue +--- !u!114 &11415120 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100034} + m_GameObject: {fileID: 115122} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .588} + m_Color: {r: .200000003, g: .709803939, b: .898039222, a: .945098042} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1156,480 +1122,461 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11400062 +--- !u!114 &11415122 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100034} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!114 &11400064 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100036} + m_GameObject: {fileID: 115124} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 24 + m_MinSize: 30 + m_MaxSize: 40 m_Alignment: 4 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Continue ---- !u!222 &22200000 -CanvasRenderer: +--- !u!114 &11415124 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100000} ---- !u!222 &22200002 + m_GameObject: {fileID: 115102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee8371d2b2fe14a9ca0a9465140027de, type: 3} + m_Name: + m_EditorClassIdentifier: + hasStarted: 0 +--- !u!222 &22215098 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100002} ---- !u!222 &22200004 + m_GameObject: {fileID: 115092} +--- !u!222 &22215100 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100004} ---- !u!222 &22200006 + m_GameObject: {fileID: 115094} +--- !u!222 &22215102 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100006} ---- !u!222 &22200008 + m_GameObject: {fileID: 115096} +--- !u!222 &22215104 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100008} ---- !u!222 &22200010 + m_GameObject: {fileID: 115098} +--- !u!222 &22215106 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100010} ---- !u!222 &22200012 + m_GameObject: {fileID: 115100} +--- !u!222 &22215108 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100014} ---- !u!222 &22200014 + m_GameObject: {fileID: 115104} +--- !u!222 &22215110 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100016} ---- !u!222 &22200016 + m_GameObject: {fileID: 115106} +--- !u!222 &22215112 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100018} ---- !u!222 &22200018 + m_GameObject: {fileID: 115108} +--- !u!222 &22215114 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100020} ---- !u!222 &22200020 + m_GameObject: {fileID: 115110} +--- !u!222 &22215116 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100024} ---- !u!222 &22200022 + m_GameObject: {fileID: 115114} +--- !u!222 &22215118 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100026} ---- !u!222 &22200024 + m_GameObject: {fileID: 115118} +--- !u!222 &22215120 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100032} ---- !u!222 &22200026 + m_GameObject: {fileID: 115120} +--- !u!222 &22215122 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100034} ---- !u!222 &22200028 + m_GameObject: {fileID: 115122} +--- !u!222 &22215124 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100036} ---- !u!223 &22300000 + m_GameObject: {fileID: 115124} +--- !u!223 &22315124 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100030} + m_GameObject: {fileID: 115102} m_Enabled: 1 serializedVersion: 2 m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 - m_PixelPerfect: 0 + m_PixelPerfect: 1 m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!224 &22400000 + m_SortingOrder: 1 +--- !u!224 &22415092 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100000} + m_GameObject: {fileID: 115092} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 22400002} - m_Father: {fileID: 22400026} + - {fileID: 22415110} + m_Father: {fileID: 22415112} m_RootOrder: 5 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 266.5, y: -181.731598} - m_SizeDelta: {x: 533, y: 33.0421066} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400002 +--- !u!224 &22415094 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100002} + m_GameObject: {fileID: 115094} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 22400000} + m_Children: + - {fileID: 22415120} + m_Father: {fileID: 22415112} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400004 +--- !u!224 &22415096 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100004} + m_GameObject: {fileID: 115096} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 22400006} + m_Father: {fileID: 22415104} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400006 +--- !u!224 &22415098 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100006} + m_GameObject: {fileID: 115098} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 22400004} - m_Father: {fileID: 22400026} + - {fileID: 22415100} + m_Father: {fileID: 22415112} m_RootOrder: 4 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 266.5, y: -148.689484} - m_SizeDelta: {x: 533, y: 33.0421066} - m_Pivot: {x: .5, y: .5} ---- !u!224 &22400008 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100008} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 22400034} - m_Father: {fileID: 22400026} - m_RootOrder: 3 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 266.5, y: -115.647369} - m_SizeDelta: {x: 533, y: 33.0421066} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400010 +--- !u!224 &22415100 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100010} + m_GameObject: {fileID: 115100} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 22400018} + m_Father: {fileID: 22415098} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400012 +--- !u!224 &22415102 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100014} + m_GameObject: {fileID: 115102} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 22400032} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 22415112} + m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!224 &22400014 + m_Pivot: {x: 0, y: 0} +--- !u!224 &22415104 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100016} + m_GameObject: {fileID: 115104} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 22400030} - m_Father: {fileID: 22400026} - m_RootOrder: 2 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 266.5, y: -82.6052704} - m_SizeDelta: {x: 533, y: 33.0421066} + - {fileID: 22415096} + m_Father: {fileID: 22415112} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400016 +--- !u!224 &22415106 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100018} + m_GameObject: {fileID: 115106} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 22400020} - m_RootOrder: 0 + m_Children: + - {fileID: 22415118} + m_Father: {fileID: 22415112} + m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400018 +--- !u!224 &22415108 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100020} + m_GameObject: {fileID: 115108} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: .899999976, y: 1, z: 1} m_Children: - - {fileID: 22400010} - m_Father: {fileID: 22400026} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 266.5, y: -16.5210533} - m_SizeDelta: {x: 533, y: 33.0421066} + - {fileID: 22415116} + m_Father: {fileID: 22415112} + m_RootOrder: 6 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400020 +--- !u!224 &22415110 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100022} + m_GameObject: {fileID: 115110} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 22400016} - m_Father: {fileID: 22400022} + m_Children: [] + m_Father: {fileID: 22415092} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -10} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400022 +--- !u!224 &22415112 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100024} + m_GameObject: {fileID: 115112} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 22400020} - m_Father: {fileID: 22400028} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: .0495620109} - m_AnchoredPosition: {x: -1.91000366, y: .499984741} - m_SizeDelta: {x: 532.820007, y: 0} + - {fileID: 22415094} + - {fileID: 22415106} + - {fileID: 22415114} + - {fileID: 22415104} + - {fileID: 22415098} + - {fileID: 22415092} + - {fileID: 22415108} + m_Father: {fileID: 22415102} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -1.84769997e-05, y: 191} + m_SizeDelta: {x: 1300, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400024 +--- !u!224 &22415114 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100026} + m_GameObject: {fileID: 115114} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 22400028} - m_RootOrder: 0 - m_AnchorMin: {x: .0275319796, y: .5} - m_AnchorMax: {x: .960078657, y: .936011195} - m_AnchoredPosition: {x: 0, y: .5} - m_SizeDelta: {x: 0, y: 1} + m_Children: + - {fileID: 22415124} + m_Father: {fileID: 22415112} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400026 +--- !u!224 &22415116 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100028} + m_GameObject: {fileID: 115116} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 22400018} - - {fileID: 22400032} - - {fileID: 22400014} - - {fileID: 22400008} - - {fileID: 22400006} - - {fileID: 22400000} - m_Father: {fileID: 22400028} - m_RootOrder: 2 - m_AnchorMin: {x: .5, y: .074000001} - m_AnchorMax: {x: .5, y: .460350394} - m_AnchoredPosition: {x: -2, y: 0} - m_SizeDelta: {x: 533, y: -1} + - {fileID: 22415122} + m_Father: {fileID: 22415108} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -10} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400028 +--- !u!224 &22415118 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100030} + m_GameObject: {fileID: 115118} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 22400024} - - {fileID: 22400022} - - {fileID: 22400026} - m_Father: {fileID: 400000} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22415106} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!224 &22400030 + m_Pivot: {x: .5, y: .5} +--- !u!224 &22415120 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100032} + m_GameObject: {fileID: 115120} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 22400014} + m_Father: {fileID: 22415094} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400032 +--- !u!224 &22415122 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100034} + m_GameObject: {fileID: 115122} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 22400012} - m_Father: {fileID: 22400026} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 266.5, y: -49.5631599} - m_SizeDelta: {x: 533, y: 33.0421066} + m_Children: [] + m_Father: {fileID: 22415116} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!224 &22400034 +--- !u!224 &22415124 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100036} + m_GameObject: {fileID: 115124} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 22400008} + m_Father: {fileID: 22415114} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!225 &22515124 +CanvasGroup: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115102} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1001 &100100000 Prefab: m_ObjectHideFlags: 1 @@ -1639,6 +1586,6 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 100012} + m_RootGameObject: {fileID: 115102} m_IsPrefabParent: 1 m_IsExploded: 1 diff --git a/Assets/FungusExamples/TheFacility/Prefabs/CYOASayDialog.prefab.meta b/Assets/Fungus/Dialog/Resources/FungusMenuDialog.prefab.meta old mode 100755 new mode 100644 similarity index 58% rename from Assets/FungusExamples/TheFacility/Prefabs/CYOASayDialog.prefab.meta rename to Assets/Fungus/Dialog/Resources/FungusMenuDialog.prefab.meta index badab203..a7c1a4fb --- a/Assets/FungusExamples/TheFacility/Prefabs/CYOASayDialog.prefab.meta +++ b/Assets/Fungus/Dialog/Resources/FungusMenuDialog.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: ab4b363f153c84318915d285f802490c +guid: 9bb64c8df70904eecac3f71f81bf339b NativeFormatImporter: userData: diff --git a/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab b/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab new file mode 100644 index 00000000..a8531ba6 --- /dev/null +++ b/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab @@ -0,0 +1,643 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &139138 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22439138} + - 222: {fileID: 22239138} + - 114: {fileID: 11439140} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &148914 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22448914} + - 222: {fileID: 22248914} + - 114: {fileID: 11448914} + - 114: {fileID: 11439142} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &188894 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22488896} + - 222: {fileID: 22288894} + - 114: {fileID: 11488896} + - 114: {fileID: 11439138} + m_Layer: 5 + m_Name: StoryText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &188896 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22488898} + - 222: {fileID: 22288896} + - 114: {fileID: 11488898} + - 212: {fileID: 21288894} + - 95: {fileID: 9588894} + m_Layer: 5 + m_Name: Continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &188898 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22488894} + - 222: {fileID: 22288898} + - 114: {fileID: 11488900} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &188900 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22488900} + - 222: {fileID: 22288900} + - 114: {fileID: 11488904} + - 225: {fileID: 22588894} + - 114: {fileID: 11488902} + - 114: {fileID: 11439144} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &188902 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22488902} + - 223: {fileID: 22388894} + - 114: {fileID: 11488906} + - 225: {fileID: 22588896} + - 114: {fileID: 11488894} + m_Layer: 5 + m_Name: FungusSayDialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &9588894 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188896} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 +--- !u!114 &11439138 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 1150 + m_PreferredHeight: 200 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 +--- !u!114 &11439140 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 139138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 7 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 +--- !u!114 &11439142 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 148914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 350 + m_PreferredHeight: 350 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11439144 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188900} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 +--- !u!114 &11448914 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 148914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11488894 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} + m_Name: + m_EditorClassIdentifier: + writingSpeed: 30 + writingSound: {fileID: 8300000, guid: 5a3c8e205638142dcb8227abe5f14f1f, type: 3} + loopWritingSound: 1 + punctuationPause: .200000003 + clickAnywhere: 1 + dialogCanvas: {fileID: 22388894} + nameText: {fileID: 11488900} + storyText: {fileID: 11488896} + characterImage: {fileID: 11448914} + characterTypingSound: {fileID: 0} + continueImage: {fileID: 11488898} +--- !u!114 &11488896 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FontData: + m_Font: {fileID: 12800000, guid: 333ca057701a73249850670faef184dc, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Story text +--- !u!114 &11488898 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11488900 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .258823544, g: .254901975, b: .262745112, a: 1} + m_FontData: + m_Font: {fileID: 12800000, guid: ee3a4060b74a7fd45b0cc411c99fd8f2, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Character Name +--- !u!114 &11488902 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_MethodName: OnPointerClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &11488904 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: eeb00f6cd27e9ef4d9174551b3342dec, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11488906 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 32 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1600, y: 1200} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!212 &21288894 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188896} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!222 &22239138 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 139138} +--- !u!222 &22248914 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 148914} +--- !u!222 &22288894 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188894} +--- !u!222 &22288896 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188896} +--- !u!222 &22288898 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188898} +--- !u!222 &22288900 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188900} +--- !u!223 &22388894 +Canvas: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188902} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 +--- !u!224 &22439138 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 139138} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22488896} + - {fileID: 22448914} + m_Father: {fileID: 22488900} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -2, y: -381} + m_SizeDelta: {x: -90, y: -846} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22448914 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 148914} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22439138} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22488894 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22488900} + m_RootOrder: 1 + m_AnchorMin: {x: .0131249959, y: 1} + m_AnchorMax: {x: .785268068, y: 1} + m_AnchoredPosition: {x: -22.25, y: -914} + m_SizeDelta: {x: -68.5, y: 71} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22488896 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188894} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22488898} + m_Father: {fileID: 22439138} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22488898 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188896} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22488896} + m_RootOrder: 0 + m_AnchorMin: {x: .942586243, y: .0550000034} + m_AnchorMax: {x: .988172412, y: .0550000034} + m_AnchoredPosition: {x: -.400008023, y: 21.6499996} + m_SizeDelta: {x: -.400001526, y: 43.2999992} + m_Pivot: {x: .500000417, y: .5} +--- !u!224 &22488900 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188900} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22439138} + - {fileID: 22488894} + m_Father: {fileID: 22488902} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -800, y: -600} + m_SizeDelta: {x: 1600, y: 1200} + m_Pivot: {x: 0, y: 0} +--- !u!224 &22488902 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188902} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 22488900} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!225 &22588894 +CanvasGroup: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188900} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!225 &22588896 +CanvasGroup: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 188902} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 188902} + m_IsPrefabParent: 1 + m_IsExploded: 1 diff --git a/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab.meta b/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab.meta new file mode 100644 index 00000000..0305b764 --- /dev/null +++ b/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 8a005a9e0713f4cc1b5ad29fb07657d3 +NativeFormatImporter: + userData: diff --git a/Assets/Fungus/Dialog/Scripts/Character.cs b/Assets/Fungus/Dialog/Scripts/Character.cs index d5f328ad..0ff20e66 100644 --- a/Assets/Fungus/Dialog/Scripts/Character.cs +++ b/Assets/Fungus/Dialog/Scripts/Character.cs @@ -10,8 +10,6 @@ namespace Fungus { public string nameText; // We need a separate name as the object name is used for character variations (e.g. "Smurf Happy", "Smurf Sad") public Color nameColor = Color.white; - public SayDialog sayDialogBox; - public ChooseDialog chooseDialogBox; public AudioClip soundEffect; public Sprite profileSprite; public List portraits; diff --git a/Assets/Fungus/Dialog/Scripts/Commands/Menu.cs b/Assets/Fungus/Dialog/Scripts/Commands/Menu.cs new file mode 100644 index 00000000..2f9aafd6 --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/Menu.cs @@ -0,0 +1,112 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + [CommandInfo("Dialog", + "Menu", + "Displays a multiple choice menu")] + [AddComponentMenu("")] + public class Menu : Command + { + + // Menu displays a menu button which will execute the target sequence when clicked + // Menu Timeout executes a sequence if the timeout expires + // The 'Hide If Visited' option checks the execution count of the target sequence + // Hide Say dialog when finished? Let Say command handle that + + // Can wrap in an If statement if you need a conditional option + + public string text = "Option"; + public Sequence targetSequence; + public bool hideIfVisited; + + protected static bool eventSystemPresent; + + public override void OnEnter() + { + CheckEventSystem(); + + MenuDialog menuDialog = SetMenuDialog.GetActiveMenuDialog(); + + if (menuDialog != null) + { + menuDialog.gameObject.SetActive(true); + + if (hideIfVisited && + targetSequence != null && + targetSequence.GetExecutionCount() > 0) + { + // Don't show this option + } + else + { + menuDialog.AddOption(text, targetSequence); + } + } + + Continue(); + } + + // There must be an Event System in the scene for Menu input to work. + // This function will automatically instantiate one if none exists. + protected virtual void CheckEventSystem() + { + if (eventSystemPresent) + { + return; + } + + EventSystem eventSystem = GameObject.FindObjectOfType(); + if (eventSystem == null) + { + // Auto spawn an Event System from the prefab + GameObject go = Resources.Load("FungusEventSystem"); + if (go != null) + { + GameObject spawnedGO = Instantiate(go) as GameObject; + spawnedGO.name = "EventSystem"; + } + } + + eventSystemPresent = true; + } + + public override void GetConnectedSequences(ref List connectedSequences) + { + if (targetSequence != null) + { + connectedSequences.Add(targetSequence); + } + } + + public override string GetSummary() + { + if (targetSequence == null) + { + return "Error: No target sequence selected"; + } + + if (text == "") + { + return "Error: No button text selected"; + } + + return text + " : " + targetSequence.sequenceName; + } + + public override Color GetButtonColor() + { + return new Color32(184, 210, 235, 255); + } + + public override bool RunSlowInEditor() + { + return false; + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Dialog/Scripts/Commands/Menu.cs.meta b/Assets/Fungus/Dialog/Scripts/Commands/Menu.cs.meta new file mode 100644 index 00000000..572fcb3a --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/Menu.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 841589fc622bc494aa5405f416fa1301 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Fungus/Dialog/Scripts/Commands/MenuTimer.cs b/Assets/Fungus/Dialog/Scripts/Commands/MenuTimer.cs new file mode 100644 index 00000000..3c6ddf9e --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/MenuTimer.cs @@ -0,0 +1,59 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + [CommandInfo("Dialog", + "Menu Timer", + "Displays a timer bar and executes a target sequence if the player fails to select a menu option in time.")] + [AddComponentMenu("")] + public class MenuTimer : Command + { + public float duration; + public Sequence targetSequence; + + public override void OnEnter() + { + MenuDialog menuDialog = SetMenuDialog.GetActiveMenuDialog(); + if (menuDialog != null && + targetSequence != null) + { + menuDialog.ShowTimer(duration, targetSequence); + } + + Continue(); + } + + public override void GetConnectedSequences(ref List connectedSequences) + { + if (targetSequence != null) + { + connectedSequences.Add(targetSequence); + } + } + + public override string GetSummary() + { + if (targetSequence == null) + { + return "Error: No target sequence selected"; + } + + return targetSequence.sequenceName; + } + + public override Color GetButtonColor() + { + return new Color32(184, 210, 235, 255); + } + + public override bool RunSlowInEditor() + { + return false; + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Dialog/Scripts/Commands/MenuTimer.cs.meta b/Assets/Fungus/Dialog/Scripts/Commands/MenuTimer.cs.meta new file mode 100644 index 00000000..31d25c1a --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/MenuTimer.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab54728d981544842843ba6609b9a80a +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Fungus/Dialog/Scripts/Commands/Say.cs b/Assets/Fungus/Dialog/Scripts/Commands/Say.cs index 3542d60b..99d9d356 100644 --- a/Assets/Fungus/Dialog/Scripts/Commands/Say.cs +++ b/Assets/Fungus/Dialog/Scripts/Commands/Say.cs @@ -20,9 +20,6 @@ namespace Fungus [Tooltip("Speaking character to use when writing the story text")] public Character character; - [Tooltip("Say Dialog to use when writing the story text.")] - public SayDialog sayDialog; - [Tooltip("Portrait that represents speaking character")] public Sprite portrait; @@ -35,9 +32,10 @@ namespace Fungus [Tooltip("Number of times to show this Say text when the command is executed multiple times")] public int showCount = 1; - protected int executionCount; + [Tooltip("Wait for player input before hiding the dialog and continuing. If false then the dialog will display and execution will continue.")] + public bool waitForInput = true; - protected bool showBasicGUI; + protected int executionCount; public override void OnEnter() { @@ -49,25 +47,12 @@ namespace Fungus executionCount++; - showBasicGUI = false; + SayDialog sayDialog = SetSayDialog.GetActiveSayDialog(); + if (sayDialog == null) { - if ( character != null ) { - // Try to get character's dialog box - sayDialog = character.sayDialogBox; - } - - if (sayDialog == null) - { - // Try to get any SayDialog in the scene - sayDialog = GameObject.FindObjectOfType(); - } - if (sayDialog == null) - { - // No custom dialog box exists, just use basic gui - showBasicGUI = true; - return; - } + Continue(); + return; } FungusScript fungusScript = GetFungusScript(); @@ -83,8 +68,11 @@ namespace Fungus string subbedText = fungusScript.SubstituteVariables(storyText); - sayDialog.Say(subbedText, delegate { - sayDialog.ShowDialog(false); + sayDialog.Say(subbedText, waitForInput, delegate { + if (waitForInput) + { + sayDialog.ShowDialog(false); + } Continue(); }); } @@ -99,69 +87,11 @@ namespace Fungus return namePrefix + "\"" + storyText + "\""; } - protected virtual void OnGUI() - { - if (!showBasicGUI) - { - return; - } - - // Draw a basic GUI to use when no uGUI dialog has been set - // Does not support drawing character images - - GUILayout.BeginHorizontal(GUILayout.Width(Screen.width)); - GUILayout.FlexibleSpace(); - - GUILayout.BeginVertical(GUILayout.Height(Screen.height)); - GUILayout.FlexibleSpace(); - - GUILayout.BeginVertical(new GUIStyle(GUI.skin.box)); - - if (character != null) - { - GUILayout.Label(character.nameText); - GUILayout.Space(10); - } - - GUILayout.Label(storyText); - if (GUILayout.Button("Continue")) - { - showBasicGUI = false; - Continue(); - } - - GUILayout.EndVertical(); - - GUILayout.FlexibleSpace(); - GUILayout.EndVertical(); - - GUILayout.FlexibleSpace(); - GUILayout.EndHorizontal(); - } - public override Color GetButtonColor() { return new Color32(184, 210, 235, 255); } - public override void OnCommandAdded(Sequence parentSequence) - { - // Find last Say command in the sequence, then copy the Say dialog it's using. - // This saves a step when adding a new Say command - for (int i = parentSequence.commandList.Count - 1; i >= 0; --i) - { - Say sayCommand = parentSequence.commandList[i] as Say; - if (sayCommand != null) - { - if (sayCommand.sayDialog != null) - { - sayDialog = sayCommand.sayDialog; - break; - } - } - } - } - public override void OnReset() { executionCount = 0; diff --git a/Assets/Fungus/Dialog/Scripts/Commands/SetMenuDialog.cs b/Assets/Fungus/Dialog/Scripts/Commands/SetMenuDialog.cs new file mode 100644 index 00000000..4b551990 --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/SetMenuDialog.cs @@ -0,0 +1,69 @@ +using UnityEngine; +using System; +using System.Collections; + +namespace Fungus +{ + [CommandInfo("Dialog", + "Set Menu Dialog", + "Sets a custom menu dialog to use when displaying multiple choice menus")] + [AddComponentMenu("")] + public class SetMenuDialog : Command + { + public static MenuDialog activeMenuDialog; + + public MenuDialog menuDialog; + + public static MenuDialog GetActiveMenuDialog() + { + if (activeMenuDialog == null) + { + activeMenuDialog = GameObject.FindObjectOfType(); + } + + if (activeMenuDialog == null) + { + // Auto spawn a menu object from the prefab + GameObject go = Resources.Load("FungusMenuDialog"); + if (go != null) + { + GameObject spawnedGO = Instantiate(go) as GameObject; + spawnedGO.name = "MenuDialog"; + spawnedGO.SetActive(false); + activeMenuDialog = spawnedGO.GetComponent(); + } + } + + return activeMenuDialog; + } + + public override void OnEnter() + { + if (menuDialog != null) + { + activeMenuDialog = menuDialog; + } + + // Populate the static cached dialog + GetActiveMenuDialog(); + + Continue(); + } + + public override string GetSummary() + { + if (menuDialog == null) + { + return "Error: No menu dialog selected"; + } + + return menuDialog.name; + } + + public override Color GetButtonColor() + { + return new Color32(170, 204, 169, 255); + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Dialog/Scripts/Commands/SetMenuDialog.cs.meta b/Assets/Fungus/Dialog/Scripts/Commands/SetMenuDialog.cs.meta new file mode 100644 index 00000000..e02c8b64 --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/SetMenuDialog.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b097b9790a8a1456a86bc4d322b487db +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Fungus/Dialog/Scripts/Commands/SetSayDialog.cs b/Assets/Fungus/Dialog/Scripts/Commands/SetSayDialog.cs new file mode 100644 index 00000000..9ddc3961 --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/SetSayDialog.cs @@ -0,0 +1,69 @@ +using UnityEngine; +using System; +using System.Collections; + +namespace Fungus +{ + [CommandInfo("Dialog", + "Set Say Dialog", + "Sets a custom say dialog to use when displaying story text")] + [AddComponentMenu("")] + public class SetSayDialog : Command + { + public static SayDialog activeDialog; + + public SayDialog sayDialog; + + public static SayDialog GetActiveSayDialog() + { + if (activeDialog == null) + { + activeDialog = GameObject.FindObjectOfType(); + } + + if (activeDialog == null) + { + // Auto spawn a say dialog from the prefab + GameObject go = Resources.Load("FungusSayDialog"); + if (go != null) + { + GameObject spawnedGO = Instantiate(go) as GameObject; + spawnedGO.name = "SayDialog"; + spawnedGO.SetActive(false); + activeDialog = spawnedGO.GetComponent(); + } + } + + return activeDialog; + } + + public override void OnEnter() + { + if (sayDialog != null) + { + activeDialog = sayDialog; + } + + // Populate the static cached dialog + GetActiveSayDialog(); + + Continue(); + } + + public override string GetSummary() + { + if (sayDialog == null) + { + return "Error: No say dialog selected"; + } + + return sayDialog.name; + } + + public override Color GetButtonColor() + { + return new Color32(184, 210, 235, 255); + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Dialog/Scripts/Commands/SetSayDialog.cs.meta b/Assets/Fungus/Dialog/Scripts/Commands/SetSayDialog.cs.meta new file mode 100644 index 00000000..5c3ac7f3 --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/Commands/SetSayDialog.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d65d551a201c94bc79950076ff3eaf2e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Fungus/Dialog/Scripts/Dialog.cs b/Assets/Fungus/Dialog/Scripts/Dialog.cs index 2eba086b..545d726e 100644 --- a/Assets/Fungus/Dialog/Scripts/Dialog.cs +++ b/Assets/Fungus/Dialog/Scripts/Dialog.cs @@ -76,7 +76,7 @@ namespace Fungus if (character == null) { if (characterImage != null) - characterImage.enabled = false; + characterImage.gameObject.SetActive(false); if (nameText != null) nameText.text = ""; characterTypingSound = null; @@ -110,11 +110,11 @@ namespace Fungus if (image != null) { characterImage.sprite = image; - characterImage.enabled = true; + characterImage.gameObject.SetActive(true); } else { - characterImage.enabled = false; + characterImage.gameObject.SetActive(false); } } } diff --git a/Assets/Fungus/Dialog/Scripts/MenuDialog.cs b/Assets/Fungus/Dialog/Scripts/MenuDialog.cs new file mode 100644 index 00000000..4354087d --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts/MenuDialog.cs @@ -0,0 +1,152 @@ +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.Events; +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + + public class MenuDialog : MonoBehaviour + { + protected Button[] cachedButtons; + protected Slider cachedSlider; + + public virtual void Awake() + { + Button[] optionButtons = GetComponentsInChildren