From 4e9ba6bf4fa9d31f351e01a5f2b9ecb535c786c7 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Thu, 20 Aug 2015 11:52:19 +0100 Subject: [PATCH] Updated SayDialog prefab with new components --- .../Narrative/Resources/SayDialog.prefab | 134 +++++++++++------- 1 file changed, 81 insertions(+), 53 deletions(-) diff --git a/Assets/Fungus/Narrative/Resources/SayDialog.prefab b/Assets/Fungus/Narrative/Resources/SayDialog.prefab index a9115820..3c133ab2 100644 --- a/Assets/Fungus/Narrative/Resources/SayDialog.prefab +++ b/Assets/Fungus/Narrative/Resources/SayDialog.prefab @@ -100,8 +100,7 @@ GameObject: - 222: {fileID: 22288900} - 114: {fileID: 11488904} - 225: {fileID: 22588894} - - 114: {fileID: 11488902} - - 114: {fileID: 11439144} + - 114: {fileID: 11478524} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -120,7 +119,10 @@ GameObject: - 223: {fileID: 22388894} - 114: {fileID: 11488906} - 225: {fileID: 22588896} + - 114: {fileID: 11486804} - 114: {fileID: 11488894} + - 114: {fileID: 11487070} + - 114: {fileID: 11481894} - 82: {fileID: 8294266} m_Layer: 5 m_Name: SayDialog @@ -271,26 +273,6 @@ MonoBehaviour: 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 @@ -312,6 +294,83 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11478524 +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: + m_Delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11481894} + 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!114 &11481894 +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: 43b85556abd314f3f870c18c013fdcef, type: 3} + m_Name: + m_EditorClassIdentifier: + clickMode: 2 + keyPressMode: 2 + nextClickDelay: .200000003 + keyList: 0900000020000000 +--- !u!114 &11486804 +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: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &11487070 +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: a676940fce6344af1a70043b089a6c14, type: 3} + m_Name: + m_EditorClassIdentifier: + targetTextObject: {fileID: 188894} + writingSpeed: 60 + punctuationPause: .25 + hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} + writeWholeWords: 0 --- !u!114 &11488894 MonoBehaviour: m_ObjectHideFlags: 1 @@ -338,7 +397,6 @@ MonoBehaviour: startPosition: {x: 0, y: 0} moveSpeed: 1000 moveEaseType: 0 - clickAnywhere: 1 dialogCanvas: {fileID: 22388894} nameText: {fileID: 11488900} storyText: {fileID: 11488896} @@ -419,36 +477,6 @@ MonoBehaviour: 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