From a79b1240ac5f9901dbf4ba8e2fc1d45020f3b64d Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 28 Aug 2015 15:37:12 +0100 Subject: [PATCH 1/2] Add a graphic ray caster if none exists --- Assets/Fungus/Narrative/Scripts/SayDialog.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assets/Fungus/Narrative/Scripts/SayDialog.cs b/Assets/Fungus/Narrative/Scripts/SayDialog.cs index 6420a2ea..b14699d7 100644 --- a/Assets/Fungus/Narrative/Scripts/SayDialog.cs +++ b/Assets/Fungus/Narrative/Scripts/SayDialog.cs @@ -120,6 +120,13 @@ namespace Fungus { // Dialog always starts invisible, will be faded in when writing starts GetCanvasGroup().alpha = 0f; + + // Add a raycaster if none already exists so we can handle dialog input + GraphicRaycaster raycaster = GetComponent(); + if (raycaster == null) + { + gameObject.AddComponent(); + } } public virtual void Say(string text, bool clearPrevious, bool waitForInput, bool fadeWhenDone, AudioClip audioClip, Action onComplete) From 22c259398514e409527a6c33b957a30474114063 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 28 Aug 2015 16:25:54 +0100 Subject: [PATCH 2/2] Updated integration tests Tested all example scenes from previous Fungus version. Everything works fine except for expected issues from changes to the Say Dialog. The Facility scene no longer works because of the custom Say Dialogs. --- .../Localisation/LocalisationTests.unity | 899 +++++++++++++++++- Assets/Tests/Narrative/NarrativeTests.unity | 83 +- 2 files changed, 882 insertions(+), 100 deletions(-) diff --git a/Assets/Tests/Localisation/LocalisationTests.unity b/Assets/Tests/Localisation/LocalisationTests.unity index 0d2b6256..469958ec 100644 --- a/Assets/Tests/Localisation/LocalisationTests.unity +++ b/Assets/Tests/Localisation/LocalisationTests.unity @@ -148,6 +148,125 @@ MonoBehaviour: compareType: 0 comparisonType: 4 ignoreCase: 0 +--- !u!1 &75149103 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 75149104} + - 222: {fileID: 75149107} + - 114: {fileID: 75149106} + - 114: {fileID: 75149105} + m_Layer: 5 + m_Name: Continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &75149104 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75149103} + 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: 413396327} + m_Father: {fileID: 573033565} + m_RootOrder: 1 + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -38.9000244, y: 38.0749931} + m_SizeDelta: {x: 77.9000244, y: 77} + m_Pivot: {x: .5, y: .5} +--- !u!114 &75149105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75149103} + 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: 75149106} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 550373452} + 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 &75149106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75149103} + 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 &75149107 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75149103} --- !u!114 &99307093 MonoBehaviour: m_ObjectHideFlags: 0 @@ -364,7 +483,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &292727466 Transform: m_ObjectHideFlags: 0 @@ -375,6 +494,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 550373449} - {fileID: 331926889} - {fileID: 679750563} - {fileID: 1141038908} @@ -429,7 +549,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 292727466} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!114 &331926890 MonoBehaviour: m_ObjectHideFlags: 0 @@ -471,7 +591,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 810272373} + selectedFlowchart: {fileID: 679750556} --- !u!4 &365459146 Transform: m_ObjectHideFlags: 1 @@ -484,6 +604,75 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1 &413396326 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 413396327} + - 222: {fileID: 413396329} + - 114: {fileID: 413396328} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &413396327 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 413396326} + 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: 75149104} + 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 &413396328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 413396326} + 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 &413396329 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 413396326} --- !u!1 &453921373 GameObject: m_ObjectHideFlags: 0 @@ -537,6 +726,117 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!1 &459263862 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 459263863} + - 222: {fileID: 459263867} + - 114: {fileID: 459263866} + - 225: {fileID: 459263865} + - 114: {fileID: 459263864} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &459263863 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 459263862} + 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: 1202770049} + - {fileID: 573033565} + m_Father: {fileID: 550373449} + 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 &459263864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 459263862} + 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: 550373452} + 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 &459263865 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 459263862} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &459263866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 459263862} + 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 &459263867 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 459263862} --- !u!1 &493422606 GameObject: m_ObjectHideFlags: 0 @@ -544,8 +844,308 @@ GameObject: m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 493422607} - - 114: {fileID: 493422608} + - 4: {fileID: 493422607} + - 114: {fileID: 493422608} + m_Layer: 0 + m_Name: Localization + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &493422607 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 480768, guid: ffbd0831d997545eab75c364da082c1b, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 493422606} + 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: 2137889470} + m_RootOrder: 2 +--- !u!114 &493422608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11438504, guid: ffbd0831d997545eab75c364da082c1b, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 493422606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5724422a635e425bae0af9ffe2615d6, type: 3} + m_Name: + m_EditorClassIdentifier: + activeLanguage: + localizationFile: {fileID: 4900000, guid: 78fdd98dfc41844f78e4f9bf7d24b99f, type: 3} +--- !u!1 &550373448 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 550373449} + - 223: {fileID: 550373451} + - 114: {fileID: 550373458} + - 225: {fileID: 550373457} + - 114: {fileID: 550373456} + - 114: {fileID: 550373450} + - 114: {fileID: 550373455} + - 114: {fileID: 550373454} + - 114: {fileID: 550373452} + - 82: {fileID: 550373453} + m_Layer: 5 + m_Name: SayDialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &550373449 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + 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: 459263863} + m_Father: {fileID: 292727466} + 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!114 &550373450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeDuration: .25 + continueButton: {fileID: 75149105} + dialogCanvas: {fileID: 550373451} + nameText: {fileID: 1167023090} + storyText: {fileID: 573033563} + characterImage: {fileID: 1202770050} + fitTextWithImage: 1 + textWidthScale: .800000012 +--- !u!223 &550373451 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + 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!114 &550373452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + 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!82 &550373453 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + 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 &550373454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11404316, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4782cf42f2644447b9631f6e522160b, type: 3} + m_Name: + m_EditorClassIdentifier: + volume: 1 + loop: 1 + targetAudioSource: {fileID: 0} + audioMode: 0 + beepSounds: + - {fileID: 8300000, guid: 774486030b696474e8b3cf7f178123da, type: 3} + - {fileID: 8300000, guid: f637c5ce9d10e45c7855ed89bfc6b97e, type: 3} + - {fileID: 8300000, guid: c53b7c20372e444c6bd7f2ac0729bbe2, type: 3} + soundEffect: {fileID: 0} + inputSound: {fileID: 8300000, guid: 14a396b1562834718b2d52b9c4639264, type: 3} +--- !u!114 &550373455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3} + m_Name: + m_EditorClassIdentifier: + targetTextObject: {fileID: 573033561} + writingSpeed: 60 + punctuationPause: .25 + hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} + writeWholeWords: 0 +--- !u!114 &550373456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + 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 &550373457 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &550373458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550373448} + 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!1 &550868902 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 149266, guid: ffbd0831d997545eab75c364da082c1b, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 550868903} + - 114: {fileID: 550868904} m_Layer: 0 m_Name: Localization m_TagString: Untagged @@ -553,74 +1153,123 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &493422607 +--- !u!4 &550868903 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 480768, guid: ffbd0831d997545eab75c364da082c1b, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 493422606} + m_GameObject: {fileID: 550868902} 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: 2137889470} + m_Father: {fileID: 453921374} m_RootOrder: 2 ---- !u!114 &493422608 +--- !u!114 &550868904 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11438504, guid: ffbd0831d997545eab75c364da082c1b, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 493422606} + m_GameObject: {fileID: 550868902} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5724422a635e425bae0af9ffe2615d6, type: 3} m_Name: m_EditorClassIdentifier: activeLanguage: - localizationFile: {fileID: 4900000, guid: 78fdd98dfc41844f78e4f9bf7d24b99f, type: 3} ---- !u!1 &550868902 + localizationFile: {fileID: 4900000, guid: f4a19faae37354696ad9363ee85617eb, type: 3} +--- !u!1 &573033561 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 149266, guid: ffbd0831d997545eab75c364da082c1b, type: 2} + m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 550868903} - - 114: {fileID: 550868904} - m_Layer: 0 - m_Name: Localization + - 224: {fileID: 573033565} + - 222: {fileID: 573033564} + - 114: {fileID: 573033563} + - 114: {fileID: 573033562} + m_Layer: 5 + m_Name: StoryText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &550868903 -Transform: +--- !u!114 &573033562 +MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 480768, guid: ffbd0831d997545eab75c364da082c1b, type: 2} + m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 550868902} - 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: 453921374} - m_RootOrder: 2 ---- !u!114 &550868904 + m_GameObject: {fileID: 573033561} + 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 &573033563 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11438504, guid: ffbd0831d997545eab75c364da082c1b, + m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 550868902} + m_GameObject: {fileID: 573033561} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5724422a635e425bae0af9ffe2615d6, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - activeLanguage: - localizationFile: {fileID: 4900000, guid: f4a19faae37354696ad9363ee85617eb, type: 3} + 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!222 &573033564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 573033561} +--- !u!224 &573033565 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 573033561} + 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: 1167023089} + - {fileID: 75149104} + m_Father: {fileID: 459263863} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 799, y: 145.630005} + m_SizeDelta: {x: 1531, y: 200} + m_Pivot: {x: .5, y: .5} --- !u!1 &587159254 GameObject: m_ObjectHideFlags: 0 @@ -905,7 +1554,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 292727466} - m_RootOrder: 3 + m_RootOrder: 4 --- !u!114 &622392414 MonoBehaviour: m_ObjectHideFlags: 0 @@ -945,6 +1594,7 @@ GameObject: - 114: {fileID: 679750561} - 114: {fileID: 679750566} - 114: {fileID: 679750565} + - 114: {fileID: 679750567} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -976,9 +1626,9 @@ MonoBehaviour: y: -363 width: 1151 height: 1014 - selectedBlock: {fileID: 679750558} + selectedBlock: {fileID: 679750564} selectedCommands: - - {fileID: 679750557} + - {fileID: 679750567} variables: [] description: 'This is a manual test to check that localization @@ -1124,7 +1774,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 292727466} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!114 &679750564 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1147,6 +1797,7 @@ MonoBehaviour: description: eventHandler: {fileID: 679750561} commandList: + - {fileID: 679750567} - {fileID: 679750562} --- !u!114 &679750565 MonoBehaviour: @@ -1180,6 +1831,21 @@ MonoBehaviour: errorMessage: indentLevel: 0 languageCode: FR +--- !u!114 &679750567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 679750555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d65d551a201c94bc79950076ff3eaf2e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 10 + errorMessage: + indentLevel: 0 + sayDialog: {fileID: 550373450} --- !u!1 &810272371 GameObject: m_ObjectHideFlags: 0 @@ -1402,6 +2068,8 @@ MonoBehaviour: nameText: {fileID: 1909138197} storyText: {fileID: 1225097381} characterImage: {fileID: 1252195753} + fitTextWithImage: 1 + textWidthScale: .800000012 --- !u!223 &852108035 Canvas: m_ObjectHideFlags: 0 @@ -1775,7 +2443,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 292727466} - m_RootOrder: 2 + m_RootOrder: 3 --- !u!114 &1141038909 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1795,6 +2463,75 @@ MonoBehaviour: portraits: [] portraitsFace: 0 description: +--- !u!1 &1167023088 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1167023089} + - 222: {fileID: 1167023091} + - 114: {fileID: 1167023090} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1167023089 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1167023088} + 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: 573033565} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 588.75, y: 235.37001} + m_SizeDelta: {x: 1178.5, y: 71} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1167023090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1167023088} + 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 &1167023091 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1167023088} --- !u!1 &1201920632 GameObject: m_ObjectHideFlags: 0 @@ -1914,6 +2651,90 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1201920632} +--- !u!1 &1202770048 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1202770049} + - 222: {fileID: 1202770052} + - 114: {fileID: 1202770050} + - 114: {fileID: 1202770051} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1202770049 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1202770048} + 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: 459263863} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1386, y: 263.130005} + m_SizeDelta: {x: 357, y: 435} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1202770050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1202770048} + 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 &1202770051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1202770048} + 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 &1202770052 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1202770048} --- !u!1 &1225097379 GameObject: m_ObjectHideFlags: 0 @@ -2764,7 +3585,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2137889469 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Tests/Narrative/NarrativeTests.unity b/Assets/Tests/Narrative/NarrativeTests.unity index 54407f2d..443f1e5f 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: 1913435020} + selectedFlowchart: {fileID: 736071350} --- !u!4 &11556238 Transform: m_ObjectHideFlags: 1 @@ -1910,7 +1910,6 @@ GameObject: - 114: {fileID: 594837302} - 114: {fileID: 594837303} - 114: {fileID: 594837304} - - 114: {fileID: 594837305} m_Layer: 0 m_Name: TestAssertions m_TagString: Untagged @@ -2035,27 +2034,6 @@ MonoBehaviour: checkMethods: 1 m_ActionBase: {fileID: 1613545005} checksPerformed: 0 ---- !u!114 &594837305 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 594837298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} - m_Name: - m_EditorClassIdentifier: - checkAfterTime: 12.5 - repeatCheckTime: 0 - repeatEveryTime: 1 - checkAfterFrames: 1 - repeatCheckFrame: 1 - repeatEveryFrame: 1 - hasFailed: 0 - checkMethods: 1 - m_ActionBase: {fileID: 1216870120} - checksPerformed: 0 --- !u!1 &620765065 GameObject: m_ObjectHideFlags: 0 @@ -2268,7 +2246,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &685425359 Transform: m_ObjectHideFlags: 0 @@ -2550,9 +2528,9 @@ MonoBehaviour: y: -350 width: 1121 height: 870 - selectedBlock: {fileID: 736071355} + selectedBlock: {fileID: 736071349} selectedCommands: - - {fileID: 736071368} + - {fileID: 736071366} variables: [] description: stepPause: 0 @@ -2599,7 +2577,7 @@ MonoBehaviour: setSayDialog: {fileID: 0} --- !u!114 &736071353 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2626,7 +2604,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &736071354 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2641,7 +2619,7 @@ MonoBehaviour: duration: 2 --- !u!114 &736071355 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2673,7 +2651,7 @@ MonoBehaviour: - {fileID: 736071367} --- !u!114 &736071356 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2700,7 +2678,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &736071357 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2715,7 +2693,7 @@ MonoBehaviour: duration: 4 --- !u!114 &736071358 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2742,7 +2720,7 @@ MonoBehaviour: sayDialog: {fileID: 1714427708} --- !u!114 &736071360 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2767,7 +2745,7 @@ MonoBehaviour: setSayDialog: {fileID: 0} --- !u!114 &736071361 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2794,7 +2772,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &736071362 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2809,7 +2787,7 @@ MonoBehaviour: duration: 2 --- !u!114 &736071363 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2836,7 +2814,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &736071364 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2851,7 +2829,7 @@ MonoBehaviour: duration: 2 --- !u!114 &736071365 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2876,7 +2854,7 @@ MonoBehaviour: setSayDialog: {fileID: 0} --- !u!114 &736071366 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2920,7 +2898,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &736071367 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -2947,7 +2925,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &736071368 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736071346} @@ -5050,23 +5028,6 @@ MonoBehaviour: otherPropertyPath: constantValueGeneric: 4 compareType: 0 ---- !u!114 &1216870120 -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: 1714427702} - thisPropertyPath: AudioSource.isPlaying - compareToType: 1 - other: {fileID: 0} - otherPropertyPath: - constantValueGeneric: 0 --- !u!114 &1300618896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6298,8 +6259,8 @@ MonoBehaviour: indentLevel: 0 storyText: A long block of text that runs all the way to the end of the text box{w=1}{x} description: - character: {fileID: 1045375690} - portrait: {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} + character: {fileID: 0} + portrait: {fileID: 0} voiceOverClip: {fileID: 0} showAlways: 1 showCount: 1 @@ -6337,7 +6298,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1929911610 Transform: m_ObjectHideFlags: 0