From 716ee5bf2bca1f753f96b65aa4e16e457d79b9e4 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 25 Aug 2015 14:29:21 +0100 Subject: [PATCH] Added Stop() method to Say Dialog and Writer Can now stop writing mid sentence --- Assets/Fungus/Narrative/Scripts/SayDialog.cs | 12 + Assets/Fungus/UI/Scripts/Writer.cs | 21 +- Assets/Tests/Narrative/NarrativeTests.unity | 1521 +++++++++++++++--- 3 files changed, 1349 insertions(+), 205 deletions(-) diff --git a/Assets/Fungus/Narrative/Scripts/SayDialog.cs b/Assets/Fungus/Narrative/Scripts/SayDialog.cs index 3b338f6f..f9f8e8bf 100644 --- a/Assets/Fungus/Narrative/Scripts/SayDialog.cs +++ b/Assets/Fungus/Narrative/Scripts/SayDialog.cs @@ -138,11 +138,23 @@ namespace Fungus } } + /** + * Tell dialog to fade out if it's finished writing. + */ public virtual void FadeOut() { fadeWhenDone = true; } + /** + * Stop a Say Dialog while its writing text. + */ + public virtual void Stop() + { + fadeWhenDone = true; + GetWriter().Stop(); + } + protected virtual void UpdateAlpha() { if (GetWriter().isWriting) diff --git a/Assets/Fungus/UI/Scripts/Writer.cs b/Assets/Fungus/UI/Scripts/Writer.cs index fe10cd10..6e8bdd79 100644 --- a/Assets/Fungus/UI/Scripts/Writer.cs +++ b/Assets/Fungus/UI/Scripts/Writer.cs @@ -64,6 +64,7 @@ namespace Fungus protected bool colorActive = false; protected string colorText = ""; protected bool inputFlag; + protected bool exitFlag; protected List writerListeners = new List(); @@ -237,7 +238,12 @@ namespace Fungus textMesh.color = tempColor; } } - + + public virtual void Stop() + { + exitFlag = true; + } + public virtual void Write(string content, bool clear, bool waitForInput, AudioClip audioClip, Action onComplete) { if (clear) @@ -275,11 +281,11 @@ namespace Fungus currentPunctuationPause = punctuationPause; currentWritingSpeed = writingSpeed; + exitFlag = false; isWriting = true; foreach (TextTagParser.Token token in tokens) { - bool exit = false; switch (token.type) { @@ -351,7 +357,7 @@ namespace Fungus break; case TextTagParser.TokenType.Exit: - exit = true; + exitFlag = true; break; case TextTagParser.TokenType.Message: @@ -436,13 +442,14 @@ namespace Fungus break; } - if (exit) + if (exitFlag) { break; } } inputFlag = false; + exitFlag = false; isWriting = false; NotifyEnd(); @@ -463,6 +470,12 @@ namespace Fungus for (int i = 0; i < param.Length; ++i) { + // Exit immediately if the exit flag has been set + if (exitFlag) + { + break; + } + string left = ""; string right = ""; diff --git a/Assets/Tests/Narrative/NarrativeTests.unity b/Assets/Tests/Narrative/NarrativeTests.unity index ba1c4ce1..502738ed 100644 --- a/Assets/Tests/Narrative/NarrativeTests.unity +++ b/Assets/Tests/Narrative/NarrativeTests.unity @@ -114,7 +114,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 736071350} + selectedFlowchart: {fileID: 861253873} --- !u!4 &11556238 Transform: m_ObjectHideFlags: 1 @@ -127,6 +127,90 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1 &18001252 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 18001253} + - 222: {fileID: 18001256} + - 114: {fileID: 18001255} + - 114: {fileID: 18001254} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &18001253 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 18001252} + 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: 700088255} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1435, y: 404} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: .5, y: .5} +--- !u!114 &18001254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 18001252} + 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 &18001255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 18001252} + 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: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &18001256 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 18001252} --- !u!1 &24983354 GameObject: m_ObjectHideFlags: 0 @@ -823,6 +907,75 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 93721126} +--- !u!1 &134022279 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 134022280} + - 222: {fileID: 134022282} + - 114: {fileID: 134022281} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &134022280 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 134022279} + 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: 700088255} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 622.25, y: 281} + m_SizeDelta: {x: 1178.5, y: 71} + m_Pivot: {x: .5, y: .5} +--- !u!114 &134022281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 134022279} + 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: bb145366ce7024469a5758b08d31802c, 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!222 &134022282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 134022279} --- !u!114 &137767004 MonoBehaviour: m_ObjectHideFlags: 0 @@ -874,6 +1027,125 @@ MonoBehaviour: other: {fileID: 0} otherPropertyPath: constantValueGeneric: 1 +--- !u!1 &206980752 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 206980756} + - 222: {fileID: 206980755} + - 114: {fileID: 206980754} + - 114: {fileID: 206980753} + m_Layer: 5 + m_Name: Continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &206980753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 206980752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, 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: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + 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: 206980754} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1125936940} + m_MethodName: SetButtonClickedFlag + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &206980754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 206980752} + 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: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &206980755 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 206980752} +--- !u!224 &206980756 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 206980752} + 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: 2101400351} + m_Father: {fileID: 700088255} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1533.59998, y: 83.8300018} + m_SizeDelta: {x: 77.9000015, y: 77} + m_Pivot: {x: .5, y: .5} --- !u!1 &290123699 GameObject: m_ObjectHideFlags: 0 @@ -925,43 +1197,132 @@ Transform: m_Children: [] m_Father: {fileID: 2084461895} m_RootOrder: 1 ---- !u!224 &325077208 stripped -RectTransform: - m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1450066430} ---- !u!1 &362523161 +--- !u!1 &319877265 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 362523162} - - 114: {fileID: 362523163} - m_Layer: 0 - m_Name: JohnCharacter + - 224: {fileID: 319877266} + - 222: {fileID: 319877269} + - 114: {fileID: 319877267} + - 114: {fileID: 319877268} + m_Layer: 5 + m_Name: StoryText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &362523162 -Transform: +--- !u!224 &319877266 +RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 362523161} + m_GameObject: {fileID: 319877265} 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: 2084461895} + m_Father: {fileID: 700088255} m_RootOrder: 2 ---- !u!114 &362523163 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 803, y: 145.630005} + m_SizeDelta: {x: 1539, y: 199.75} + m_Pivot: {x: .5, y: .5} +--- !u!114 &319877267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 319877265} + 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: 79197ecfbc3a4294a89ce589dac02cf2, 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: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Story text +--- !u!114 &319877268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 319877265} + 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!222 &319877269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 319877265} +--- !u!224 &325077208 stripped +RectTransform: + m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 1450066430} +--- !u!1 &362523161 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 362523162} + - 114: {fileID: 362523163} + m_Layer: 0 + m_Name: JohnCharacter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &362523162 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 362523161} + 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: 2084461895} + m_RootOrder: 2 +--- !u!114 &362523163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 362523161} @@ -1292,6 +1653,119 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 658513471} +--- !u!1 &700088254 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 700088255} + - 222: {fileID: 700088259} + - 114: {fileID: 700088258} + - 225: {fileID: 700088257} + - 114: {fileID: 700088256} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &700088255 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700088254} + 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: 134022280} + - {fileID: 18001253} + - {fileID: 319877266} + - {fileID: 206980756} + m_Father: {fileID: 1125936941} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: 0} + m_AnchorMax: {x: .5, y: 0} + m_AnchoredPosition: {x: -805, y: 0} + m_SizeDelta: {x: 1605, y: 335} + m_Pivot: {x: 0, y: 0} +--- !u!114 &700088256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700088254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1125936940} + m_MethodName: SetDialogClickedFlag + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!225 &700088257 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700088254} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &700088258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700088254} + 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: 0 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &700088259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700088254} --- !u!1 &736071346 GameObject: m_ObjectHideFlags: 0 @@ -1832,44 +2306,23 @@ MonoBehaviour: errorMessage: indentLevel: 0 duration: 2 ---- !u!1 &891159641 +--- !u!1 &861253871 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 891159645} - - 114: {fileID: 891159642} - - 114: {fileID: 891159643} - - 114: {fileID: 891159676} - - 114: {fileID: 891159675} - - 114: {fileID: 891159674} - - 114: {fileID: 891159673} - - 114: {fileID: 891159672} - - 114: {fileID: 891159671} - - 114: {fileID: 891159670} - - 114: {fileID: 891159669} - - 114: {fileID: 891159668} - - 114: {fileID: 891159667} - - 114: {fileID: 891159666} - - 114: {fileID: 891159665} - - 114: {fileID: 891159664} - - 114: {fileID: 891159663} - - 114: {fileID: 891159662} - - 114: {fileID: 891159661} - - 114: {fileID: 891159646} - - 114: {fileID: 891159648} - - 114: {fileID: 891159647} - - 114: {fileID: 891159649} - - 114: {fileID: 891159651} - - 114: {fileID: 891159644} - - 114: {fileID: 891159654} - - 114: {fileID: 891159653} - - 114: {fileID: 891159652} - - 114: {fileID: 891159650} - - 114: {fileID: 891159655} - - 114: {fileID: 891159656} + - 4: {fileID: 861253872} + - 114: {fileID: 861253873} + - 114: {fileID: 861253875} + - 114: {fileID: 861253877} + - 114: {fileID: 861253876} + - 114: {fileID: 861253874} + - 114: {fileID: 861253878} + - 114: {fileID: 861253881} + - 114: {fileID: 861253880} + - 114: {fileID: 861253879} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -1877,13 +2330,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &891159642 +--- !u!4 &861253872 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + 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: 1028729102} + m_RootOrder: 0 +--- !u!114 &861253873 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 891159641} + m_GameObject: {fileID: 861253871} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} @@ -1893,17 +2358,16 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 505 + blockViewHeight: 400 zoom: 1 scrollViewRect: serializedVersion: 2 x: -350 - y: -350 - width: 1502 - height: 989 - selectedBlock: {fileID: 891159643} - selectedCommands: - - {fileID: 891159656} + y: -352 + width: 1132 + height: 871 + selectedBlock: {fileID: 861253875} + selectedCommands: [] variables: [] description: stepPause: 0 @@ -1911,13 +2375,28 @@ MonoBehaviour: hideComponents: 1 saveSelection: 1 localizationId: ---- !u!114 &891159643 +--- !u!114 &861253874 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d65d551a201c94bc79950076ff3eaf2e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + errorMessage: + indentLevel: 0 + sayDialog: {fileID: 1125936944} +--- !u!114 &861253875 MonoBehaviour: m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 891159641} + m_GameObject: {fileID: 861253871} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} @@ -1925,21 +2404,241 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 372 - y: 87 + x: 67 + y: 68 width: 120 height: 40 itemId: 0 blockName: Start - description: - eventHandler: {fileID: 891159651} + description: Test interrupting a Say command while it's executing + eventHandler: {fileID: 861253877} commandList: - - {fileID: 891159656} - - {fileID: 891159646} - - {fileID: 891159655} - - {fileID: 891159647} - - {fileID: 891159648} ---- !u!114 &891159644 + - {fileID: 861253874} + - {fileID: 861253876} +--- !u!114 &861253876 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + storyText: Write out a long piece of text that we want to interrupt before it's + finished. + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeOut: 1 + waitForClick: 0 + setSayDialog: {fileID: 0} +--- !u!114 &861253877 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 861253875} +--- !u!114 &861253878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 258 + y: 66 + width: 120 + height: 40 + itemId: 5 + blockName: Do Stop Call + description: + eventHandler: {fileID: 861253881} + commandList: + - {fileID: 861253880} + - {fileID: 861253879} +--- !u!114 &861253879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 688e35811870d403f9e2b1ab2a699d98, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 7 + errorMessage: + indentLevel: 0 + targetObject: {fileID: 1125936939} + targetComponentAssemblyName: Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + targetComponentFullname: UnityEngine.Component[] + targetComponentText: SayDialog + targetMethod: Stop + targetMethodText: 'Stop (): Void' + methodParameters: [] + saveReturnValue: 0 + returnValueVariableKey: + returnValueType: System.Void + showInherited: 0 + callMode: 0 +--- !u!114 &861253880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + errorMessage: + indentLevel: 0 + duration: .5 +--- !u!114 &861253881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861253871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 861253878} +--- !u!1 &891159641 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 891159645} + - 114: {fileID: 891159642} + - 114: {fileID: 891159643} + - 114: {fileID: 891159676} + - 114: {fileID: 891159675} + - 114: {fileID: 891159674} + - 114: {fileID: 891159673} + - 114: {fileID: 891159672} + - 114: {fileID: 891159671} + - 114: {fileID: 891159670} + - 114: {fileID: 891159669} + - 114: {fileID: 891159668} + - 114: {fileID: 891159667} + - 114: {fileID: 891159666} + - 114: {fileID: 891159665} + - 114: {fileID: 891159664} + - 114: {fileID: 891159663} + - 114: {fileID: 891159662} + - 114: {fileID: 891159661} + - 114: {fileID: 891159646} + - 114: {fileID: 891159648} + - 114: {fileID: 891159647} + - 114: {fileID: 891159649} + - 114: {fileID: 891159651} + - 114: {fileID: 891159644} + - 114: {fileID: 891159654} + - 114: {fileID: 891159653} + - 114: {fileID: 891159652} + - 114: {fileID: 891159650} + - 114: {fileID: 891159655} + - 114: {fileID: 891159656} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &891159642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 891159641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1.0 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 505 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 + y: -350 + width: 1502 + height: 989 + selectedBlock: {fileID: 891159643} + selectedCommands: + - {fileID: 891159656} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: +--- !u!114 &891159643 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 891159641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 372 + y: 87 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 891159651} + commandList: + - {fileID: 891159656} + - {fileID: 891159646} + - {fileID: 891159655} + - {fileID: 891159647} + - {fileID: 891159648} +--- !u!114 &891159644 MonoBehaviour: m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} @@ -2766,6 +3465,58 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1024293038} +--- !u!1 &1028729100 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1028729102} + - 114: {fileID: 1028729101} + m_Layer: 0 + m_Name: StopTest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1028729101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1028729100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1dba0b27b0864740a8720e920aa88c0, type: 3} + m_Name: + m_EditorClassIdentifier: + timeout: 5 + ignored: 0 + succeedAfterAllAssertionsAreExecuted: 1 + expectException: 0 + expectedExceptionList: + succeedWhenExceptionIsThrown: 0 + includedPlatforms: -1 + platformsToIgnore: [] + dynamic: 0 + dynamicTypeName: +--- !u!4 &1028729102 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1028729100} + 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: 861253872} + - {fileID: 1125936941} + - {fileID: 1685415951} + m_Father: {fileID: 0} + m_RootOrder: 6 --- !u!224 &1029277842 stripped RectTransform: m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, @@ -2849,32 +3600,366 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1090798152 +--- !u!224 &1090798152 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + 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: 1648578757} + m_Father: {fileID: 2084461895} + m_RootOrder: 4 + 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!82 &1090798153 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 +--- !u!114 &1090798154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3} + m_Name: + m_EditorClassIdentifier: + clickMode: 1 + keyPressMode: 2 + shiftKeyEnabled: 1 + nextClickDelay: 0 + keyList: 0900000020000000 +--- !u!114 &1090798155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3} + m_Name: + m_EditorClassIdentifier: + targetTextObject: {fileID: 658513471} + writingSpeed: 60 + punctuationPause: .25 + hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} + writeWholeWords: 0 +--- !u!114 &1090798156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeDuration: .25 + continueButton: {fileID: 0} + dialogCanvas: {fileID: 1090798160} + nameText: {fileID: 2082946105} + storyText: {fileID: 658513473} + characterImage: {fileID: 1112648895} +--- !u!114 &1090798157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!225 &1090798158 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1090798159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + 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!223 &1090798160 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1090798151} + 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!1 &1112648893 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1112648894} + - 222: {fileID: 1112648897} + - 114: {fileID: 1112648895} + - 114: {fileID: 1112648896} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1112648894 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1112648893} + 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: 1648578757} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1435, y: 404} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1112648895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1112648893} + 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: ea8f56c43254d41728f5ac4e8299b6c9, 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 &1112648896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1112648893} + 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!222 &1112648897 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1112648893} +--- !u!1 &1125936939 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1125936941} + - 223: {fileID: 1125936948} + - 114: {fileID: 1125936947} + - 225: {fileID: 1125936946} + - 114: {fileID: 1125936945} + - 114: {fileID: 1125936944} + - 114: {fileID: 1125936943} + - 114: {fileID: 1125936940} + - 82: {fileID: 1125936942} + m_Layer: 5 + m_Name: SayDialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1125936940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1125936939} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3} + m_Name: + m_EditorClassIdentifier: + clickMode: 1 + keyPressMode: 2 + shiftKeyEnabled: 1 + nextClickDelay: 0 + keyList: 0900000020000000 +--- !u!224 &1125936941 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} 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: 1648578757} - m_Father: {fileID: 2084461895} - m_RootOrder: 4 + - {fileID: 700088255} + m_Father: {fileID: 1028729102} + 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: 0, y: 0} ---- !u!82 &1090798153 +--- !u!82 &1125936942 AudioSource: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} @@ -2938,47 +4023,30 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 ---- !u!114 &1090798154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3} - m_Name: - m_EditorClassIdentifier: - clickMode: 1 - keyPressMode: 2 - shiftKeyEnabled: 1 - nextClickDelay: 0 - keyList: 0900000020000000 ---- !u!114 &1090798155 +--- !u!114 &1125936943 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3} m_Name: m_EditorClassIdentifier: - targetTextObject: {fileID: 658513471} + targetTextObject: {fileID: 319877265} writingSpeed: 60 punctuationPause: .25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 ---- !u!114 &1090798156 +--- !u!114 &1125936944 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} @@ -2986,17 +4054,17 @@ MonoBehaviour: m_EditorClassIdentifier: fadeDuration: .25 continueButton: {fileID: 0} - dialogCanvas: {fileID: 1090798160} - nameText: {fileID: 2082946105} - storyText: {fileID: 658513473} - characterImage: {fileID: 1112648895} ---- !u!114 &1090798157 + dialogCanvas: {fileID: 1125936948} + nameText: {fileID: 134022281} + storyText: {fileID: 319877267} + characterImage: {fileID: 18001255} +--- !u!114 &1125936945 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -3007,25 +4075,25 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!225 &1090798158 +--- !u!225 &1125936946 CanvasGroup: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &1090798159 +--- !u!114 &1125936947 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -3041,13 +4109,13 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 ---- !u!223 &1090798160 +--- !u!223 &1125936948 Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1090798151} + m_GameObject: {fileID: 1125936939} m_Enabled: 1 serializedVersion: 2 m_RenderMode: 0 @@ -3059,90 +4127,6 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 1 ---- !u!1 &1112648893 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1112648894} - - 222: {fileID: 1112648897} - - 114: {fileID: 1112648895} - - 114: {fileID: 1112648896} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1112648894 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1112648893} - 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: 1648578757} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1435, y: 404} - m_SizeDelta: {x: 300, y: 300} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1112648895 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1112648893} - 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: ea8f56c43254d41728f5ac4e8299b6c9, 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 &1112648896 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1112648893} - 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!222 &1112648897 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1112648893} --- !u!4 &1155926874 stripped Transform: m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} @@ -3604,6 +4588,55 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!1 &1685415950 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1685415951} + - 114: {fileID: 1685415952} + m_Layer: 0 + m_Name: TestAssertions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1685415951 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1685415950} + 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: 1028729102} + m_RootOrder: 2 +--- !u!114 &1685415952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1685415950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} + m_Name: + m_EditorClassIdentifier: + checkAfterTime: 1 + repeatCheckTime: 0 + repeatEveryTime: 1 + checkAfterFrames: 1 + repeatCheckFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + checkMethods: 1 + m_ActionBase: {fileID: 1931935703} + checksPerformed: 0 --- !u!1 &1714427702 GameObject: m_ObjectHideFlags: 0 @@ -3747,7 +4780,7 @@ MonoBehaviour: m_EditorClassIdentifier: volume: .538999975 loop: 1 - audioSource: {fileID: 0} + targetAudioSource: {fileID: 0} audioMode: 1 beepSounds: - {fileID: 8300000, guid: 0cec78902391f4944881c028a5bd61e2, type: 3} @@ -3993,7 +5026,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1929911610 Transform: m_ObjectHideFlags: 0 @@ -4031,6 +5064,23 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!114 &1931935703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2586c8e41f35d2f4fadde53020bf4207, type: 3} + m_Name: + m_EditorClassIdentifier: + go: {fileID: 1125936939} + thisPropertyPath: Writer.isWriting + compareToType: 1 + other: {fileID: 0} + otherPropertyPath: + constantValueGeneric: 0 --- !u!1 &1982302732 GameObject: m_ObjectHideFlags: 0 @@ -4404,3 +5454,72 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!1 &2101400350 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2101400351} + - 222: {fileID: 2101400353} + - 114: {fileID: 2101400352} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2101400351 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2101400350} + 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: 206980756} + 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!114 &2101400352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2101400350} + 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: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &2101400353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2101400350}