diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs index 2a75e2f5..2fa6feec 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs @@ -335,6 +335,9 @@ namespace Fungus UnityEngine.Debug.LogError("No Lua interpreter found"); return false; } + + // Remove all tabs from input + input.Replace("\t", ""); MoonSharp.Interpreter.Script interpreter = luaEnvironment.Interpreter; diff --git a/Assets/Tests/Narrative/ConversationTests.unity b/Assets/Tests/Narrative/ConversationTests.unity index 2f10f67a..baa7223e 100644 --- a/Assets/Tests/Narrative/ConversationTests.unity +++ b/Assets/Tests/Narrative/ConversationTests.unity @@ -1,15 +1,15 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 @@ -79,30 +79,31 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &66556859 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 66556860} - - 114: {fileID: 66556865} - - 114: {fileID: 66556864} - - 114: {fileID: 66556863} - - 114: {fileID: 66556862} - - 114: {fileID: 66556861} + - component: {fileID: 66556860} + - component: {fileID: 66556865} + - component: {fileID: 66556864} + - component: {fileID: 66556863} + - component: {fileID: 66556862} + - component: {fileID: 66556861} m_Layer: 0 m_Name: Lua m_TagString: Untagged @@ -119,10 +120,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 215354034} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &66556861 MonoBehaviour: m_ObjectHideFlags: 0 @@ -153,7 +154,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} m_Name: m_EditorClassIdentifier: - remoteDebugger: 0 --- !u!114 &66556863 MonoBehaviour: m_ObjectHideFlags: 0 @@ -186,17 +186,16 @@ MonoBehaviour: - Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.UI.Image, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Fungus.Character, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.RectTransform+ReapplyDrivenProperties, UnityEngine, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null + - UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.Vector3, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.RectTransform+ReapplyDrivenProperties, UnityEngine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null - UnityEngine.RectTransform+Edge, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.RectTransform+Axis, UnityEngine, Version=0.0.0.0, Culture=neutral, @@ -266,10 +265,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 88082917} - - 114: {fileID: 88082918} + - component: {fileID: 88082917} + - component: {fileID: 88082918} m_Layer: 0 m_Name: John m_TagString: Untagged @@ -286,10 +285,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 650544894} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &88082918 MonoBehaviour: m_ObjectHideFlags: 0 @@ -305,7 +304,6 @@ MonoBehaviour: nameText: John nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} - profileSprite: {fileID: 21300000, guid: daa5ae3d727b143f0b42aaa4e6b1e2a5, type: 3} portraits: - {fileID: 21300000, guid: daa5ae3d727b143f0b42aaa4e6b1e2a5, type: 3} - {fileID: 21300000, guid: f0a480312d1664a9d9c7749fed3eb1b5, type: 3} @@ -317,13 +315,13 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 181558819} - - 20: {fileID: 181558818} - - 92: {fileID: 181558817} - - 124: {fileID: 181558816} - - 81: {fileID: 181558815} + - component: {fileID: 181558819} + - component: {fileID: 181558818} + - component: {fileID: 181558817} + - component: {fileID: 181558816} + - component: {fileID: 181558815} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -395,22 +393,22 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &191157550 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 191157551} - - 223: {fileID: 191157555} - - 114: {fileID: 191157554} - - 114: {fileID: 191157553} - - 225: {fileID: 191157552} + - component: {fileID: 191157551} + - component: {fileID: 191157555} + - component: {fileID: 191157554} + - component: {fileID: 191157553} + - component: {fileID: 191157552} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -428,7 +426,6 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 227028111} - {fileID: 782087304} @@ -437,6 +434,7 @@ RectTransform: - {fileID: 1781085154} m_Father: {fileID: 1808696925} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -518,12 +516,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 204332869} - - 222: {fileID: 204332872} - - 114: {fileID: 204332871} - - 114: {fileID: 204332870} + - component: {fileID: 204332869} + - component: {fileID: 204332872} + - component: {fileID: 204332871} + - component: {fileID: 204332870} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -541,10 +539,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1046363305} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 1321.5, y: 263.13} @@ -609,13 +607,13 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 210404269} - - 222: {fileID: 210404273} - - 114: {fileID: 210404272} - - 225: {fileID: 210404271} - - 114: {fileID: 210404270} + - component: {fileID: 210404269} + - component: {fileID: 210404273} + - component: {fileID: 210404272} + - component: {fileID: 210404271} + - component: {fileID: 210404270} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -633,12 +631,12 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 624819109} - {fileID: 1349948626} m_Father: {fileID: 1740854159} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -750.0001, y: 0} @@ -727,10 +725,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 215354034} - - 114: {fileID: 215354033} + - component: {fileID: 215354034} + - component: {fileID: 215354033} m_Layer: 0 m_Name: ConversationTest m_TagString: Untagged @@ -768,7 +766,6 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1583537809} - {fileID: 2146958085} @@ -778,16 +775,17 @@ Transform: - {fileID: 1740854159} m_Father: {fileID: 0} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &227028110 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 227028111} - - 222: {fileID: 227028113} - - 114: {fileID: 227028112} + - component: {fileID: 227028111} + - component: {fileID: 227028113} + - component: {fileID: 227028112} m_Layer: 0 m_Name: Middle m_TagString: Untagged @@ -805,10 +803,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 191157551} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -1000} @@ -854,11 +852,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 286144663} - - 222: {fileID: 286144665} - - 114: {fileID: 286144664} + - component: {fileID: 286144663} + - component: {fileID: 286144665} + - component: {fileID: 286144664} m_Layer: 0 m_Name: Right m_TagString: Untagged @@ -876,10 +874,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 191157551} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 460.43, y: -1000} @@ -925,12 +923,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 624819109} - - 222: {fileID: 624819112} - - 114: {fileID: 624819111} - - 114: {fileID: 624819110} + - component: {fileID: 624819109} + - component: {fileID: 624819112} + - component: {fileID: 624819111} + - component: {fileID: 624819110} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -948,10 +946,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 210404269} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 1321.5, y: 263.13} @@ -1016,10 +1014,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 650544894} - - 114: {fileID: 650544893} + - component: {fileID: 650544894} + - component: {fileID: 650544893} m_Layer: 0 m_Name: InlinePortraitTest m_TagString: Untagged @@ -1057,7 +1055,6 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1479280632} - {fileID: 1143151452} @@ -1065,16 +1062,17 @@ Transform: - {fileID: 1086658919} m_Father: {fileID: 0} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &750318400 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 750318401} - - 222: {fileID: 750318403} - - 114: {fileID: 750318402} + - component: {fileID: 750318401} + - component: {fileID: 750318403} + - component: {fileID: 750318402} m_Layer: 5 m_Name: NameText m_TagString: Untagged @@ -1092,10 +1090,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1349948626} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 553, y: 251} @@ -1147,11 +1145,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 782087304} - - 222: {fileID: 782087306} - - 114: {fileID: 782087305} + - component: {fileID: 782087304} + - component: {fileID: 782087306} + - component: {fileID: 782087305} m_Layer: 0 m_Name: Left m_TagString: Untagged @@ -1169,10 +1167,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 191157551} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -460.43, y: -1000} @@ -1218,12 +1216,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 821329839} - - 222: {fileID: 821329842} - - 114: {fileID: 821329841} - - 114: {fileID: 821329840} + - component: {fileID: 821329839} + - component: {fileID: 821329842} + - component: {fileID: 821329841} + - component: {fileID: 821329840} m_Layer: 5 m_Name: StoryText m_TagString: Untagged @@ -1241,12 +1239,12 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1825659053} - {fileID: 1767600971} m_Father: {fileID: 1046363305} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 753, y: 145.63} @@ -1317,10 +1315,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1019457254} - - 114: {fileID: 1019457253} + - component: {fileID: 1019457254} + - component: {fileID: 1019457253} m_Layer: 0 m_Name: TestRunner m_TagString: Untagged @@ -1349,22 +1347,22 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1046363304 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1046363305} - - 222: {fileID: 1046363309} - - 114: {fileID: 1046363308} - - 225: {fileID: 1046363307} - - 114: {fileID: 1046363306} + - component: {fileID: 1046363305} + - component: {fileID: 1046363309} + - component: {fileID: 1046363308} + - component: {fileID: 1046363307} + - component: {fileID: 1046363306} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -1382,12 +1380,12 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 204332869} - {fileID: 821329839} m_Father: {fileID: 1479280632} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -750.0001, y: 0} @@ -1476,12 +1474,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1050175259} - - 114: {fileID: 1050175258} - - 114: {fileID: 1050175257} - - 114: {fileID: 1050175256} + - component: {fileID: 1050175259} + - component: {fileID: 1050175258} + - component: {fileID: 1050175257} + - component: {fileID: 1050175256} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -1542,23 +1540,23 @@ Transform: 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_LocalEulerAnglesHint: {x: 179.999, y: 179.999, z: 179.999} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 179.999, y: 179.999, z: 179.999} --- !u!1 &1086658918 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1086658919} - - 114: {fileID: 1086658924} - - 114: {fileID: 1086658923} - - 114: {fileID: 1086658922} - - 114: {fileID: 1086658921} - - 114: {fileID: 1086658920} + - component: {fileID: 1086658919} + - component: {fileID: 1086658924} + - component: {fileID: 1086658923} + - component: {fileID: 1086658922} + - component: {fileID: 1086658921} + - component: {fileID: 1086658920} m_Layer: 0 m_Name: Lua m_TagString: Untagged @@ -1575,10 +1573,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 650544894} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1086658920 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1609,7 +1607,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} m_Name: m_EditorClassIdentifier: - remoteDebugger: 0 --- !u!114 &1086658922 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1693,21 +1690,21 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1143151452} - - 114: {fileID: 1143151456} - - 114: {fileID: 1143151455} - - 114: {fileID: 1143151454} - - 114: {fileID: 1143151453} - - 114: {fileID: 1143151459} - - 114: {fileID: 1143151458} - - 114: {fileID: 1143151457} - - 114: {fileID: 1143151462} - - 114: {fileID: 1143151461} - - 114: {fileID: 1143151460} - - 114: {fileID: 1143151463} - - 114: {fileID: 1143151464} + - component: {fileID: 1143151452} + - component: {fileID: 1143151456} + - component: {fileID: 1143151455} + - component: {fileID: 1143151454} + - component: {fileID: 1143151453} + - component: {fileID: 1143151459} + - component: {fileID: 1143151458} + - component: {fileID: 1143151457} + - component: {fileID: 1143151462} + - component: {fileID: 1143151461} + - component: {fileID: 1143151460} + - component: {fileID: 1143151463} + - component: {fileID: 1143151464} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -1724,10 +1721,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 650544894} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1143151453 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1766,6 +1763,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1143151455} + waitForFrames: 1 --- !u!114 &1143151455 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1784,6 +1782,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1816,7 +1816,7 @@ MonoBehaviour: y: -350 width: 1271 height: 869 - selectedBlock: {fileID: 1143151455} + selectedBlocks: [] selectedCommands: - {fileID: 1143151464} variables: [] @@ -1879,6 +1879,8 @@ MonoBehaviour: y: 69 width: 130 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 2 blockName: CheckPortrait1 description: @@ -1934,6 +1936,8 @@ MonoBehaviour: y: 69 width: 130 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 4 blockName: CheckPortrait2 description: @@ -1972,51 +1976,51 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1286795351} - - 114: {fileID: 1286795355} - - 114: {fileID: 1286795354} - - 114: {fileID: 1286795353} - - 114: {fileID: 1286795360} - - 114: {fileID: 1286795365} - - 114: {fileID: 1286795363} - - 114: {fileID: 1286795362} - - 114: {fileID: 1286795361} - - 114: {fileID: 1286795358} - - 114: {fileID: 1286795357} - - 114: {fileID: 1286795356} - - 114: {fileID: 1286795352} - - 114: {fileID: 1286795371} - - 114: {fileID: 1286795369} - - 114: {fileID: 1286795368} - - 114: {fileID: 1286795367} - - 114: {fileID: 1286795374} - - 114: {fileID: 1286795373} - - 114: {fileID: 1286795372} - - 114: {fileID: 1286795377} - - 114: {fileID: 1286795376} - - 114: {fileID: 1286795375} - - 114: {fileID: 1286795381} - - 114: {fileID: 1286795379} - - 114: {fileID: 1286795378} - - 114: {fileID: 1286795382} - - 114: {fileID: 1286795387} - - 114: {fileID: 1286795385} - - 114: {fileID: 1286795384} - - 114: {fileID: 1286795383} - - 114: {fileID: 1286795388} - - 114: {fileID: 1286795389} - - 114: {fileID: 1286795390} - - 114: {fileID: 1286795370} - - 114: {fileID: 1286795364} - - 114: {fileID: 1286795359} - - 114: {fileID: 1286795380} - - 114: {fileID: 1286795391} - - 114: {fileID: 1286795392} - - 114: {fileID: 1286795386} - - 114: {fileID: 1286795393} - - 114: {fileID: 1286795366} + - component: {fileID: 1286795351} + - component: {fileID: 1286795355} + - component: {fileID: 1286795354} + - component: {fileID: 1286795353} + - component: {fileID: 1286795360} + - component: {fileID: 1286795365} + - component: {fileID: 1286795363} + - component: {fileID: 1286795362} + - component: {fileID: 1286795361} + - component: {fileID: 1286795358} + - component: {fileID: 1286795357} + - component: {fileID: 1286795356} + - component: {fileID: 1286795352} + - component: {fileID: 1286795371} + - component: {fileID: 1286795369} + - component: {fileID: 1286795368} + - component: {fileID: 1286795367} + - component: {fileID: 1286795374} + - component: {fileID: 1286795373} + - component: {fileID: 1286795372} + - component: {fileID: 1286795377} + - component: {fileID: 1286795376} + - component: {fileID: 1286795375} + - component: {fileID: 1286795381} + - component: {fileID: 1286795379} + - component: {fileID: 1286795378} + - component: {fileID: 1286795382} + - component: {fileID: 1286795387} + - component: {fileID: 1286795385} + - component: {fileID: 1286795384} + - component: {fileID: 1286795383} + - component: {fileID: 1286795388} + - component: {fileID: 1286795389} + - component: {fileID: 1286795390} + - component: {fileID: 1286795370} + - component: {fileID: 1286795364} + - component: {fileID: 1286795359} + - component: {fileID: 1286795380} + - component: {fileID: 1286795391} + - component: {fileID: 1286795392} + - component: {fileID: 1286795386} + - component: {fileID: 1286795393} + - component: {fileID: 1286795366} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -2033,10 +2037,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 215354034} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1286795352 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2052,6 +2056,9 @@ MonoBehaviour: indentLevel: 0 targetFlowchart: {fileID: 0} targetBlock: {fileID: 1286795361} + startLabel: + stringRef: {fileID: 0} + stringVal: startIndex: 0 callMode: 2 --- !u!114 &1286795353 @@ -2067,6 +2074,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1286795354} + waitForFrames: 1 --- !u!114 &1286795354 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2085,6 +2093,8 @@ MonoBehaviour: y: 76.96158 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -2122,9 +2132,10 @@ MonoBehaviour: y: -385.42166 width: 1563 height: 1097.6444 - selectedBlock: {fileID: 1286795387} + selectedBlocks: + - {fileID: 1286795370} selectedCommands: - - {fileID: 1286795389} + - {fileID: 1286795392} variables: - {fileID: 1286795390} - {fileID: 1286795386} @@ -2153,6 +2164,9 @@ MonoBehaviour: indentLevel: 0 targetFlowchart: {fileID: 0} targetBlock: {fileID: 1286795365} + startLabel: + stringRef: {fileID: 0} + stringVal: startIndex: 0 callMode: 2 --- !u!114 &1286795357 @@ -2249,6 +2263,8 @@ MonoBehaviour: y: 167.1902 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 13 blockName: Single Line description: @@ -2309,6 +2325,9 @@ MonoBehaviour: indentLevel: 0 targetFlowchart: {fileID: 0} targetBlock: {fileID: 1286795370} + startLabel: + stringRef: {fileID: 0} + stringVal: startIndex: 0 callMode: 2 --- !u!114 &1286795365 @@ -2328,6 +2347,8 @@ MonoBehaviour: y: 15.616764 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 9 blockName: Empty String description: @@ -2364,6 +2385,9 @@ MonoBehaviour: indentLevel: 0 targetFlowchart: {fileID: 0} targetBlock: {fileID: 1286795371} + startLabel: + stringRef: {fileID: 0} + stringVal: startIndex: 0 callMode: 2 --- !u!114 &1286795368 @@ -2432,6 +2456,8 @@ MonoBehaviour: y: 269.10748 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 40 blockName: Substitution description: @@ -2458,6 +2484,8 @@ MonoBehaviour: y: 215.03644 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 19 blockName: Multi Line description: @@ -2516,6 +2544,8 @@ MonoBehaviour: y: 214.0749 width: 131 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 24 blockName: CheckJohnText description: @@ -2573,6 +2603,8 @@ MonoBehaviour: y: 214.0749 width: 153 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 26 blockName: CheckSherlockText description: @@ -2654,6 +2686,8 @@ MonoBehaviour: y: 64.4227 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 28 blockName: Story Only description: @@ -2677,6 +2711,9 @@ MonoBehaviour: indentLevel: 0 targetFlowchart: {fileID: 0} targetBlock: {fileID: 1286795381} + startLabel: + stringRef: {fileID: 0} + stringVal: startIndex: 0 callMode: 2 --- !u!114 &1286795383 @@ -2694,6 +2731,9 @@ MonoBehaviour: indentLevel: 0 targetFlowchart: {fileID: 0} targetBlock: {fileID: 1286795387} + startLabel: + stringRef: {fileID: 0} + stringVal: startIndex: 0 callMode: 2 --- !u!114 &1286795384 @@ -2764,6 +2804,8 @@ MonoBehaviour: y: 114.267044 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 33 blockName: Portrait Only description: @@ -2867,16 +2909,8 @@ MonoBehaviour: indentLevel: 0 luaEnvironment: {fileID: 66556862} luaFile: {fileID: 0} - luaScript: 'storytext.text = "" - - - conversation [[ - - sherlock bored right: {$StringVar2}{w=1}{x} - - ]] - -' + luaScript: "storytext.text = \"\"\n\n-- Test var substitution and stripping out + tabs\nconversation [[\nsherlock \tbored \tright: {$StringVar2}{w=1}{x}\n]]\n" runAsCoroutine: 1 waitUntilFinished: 1 returnVariable: {fileID: 0} @@ -2904,12 +2938,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1349948626} - - 222: {fileID: 1349948629} - - 114: {fileID: 1349948628} - - 114: {fileID: 1349948627} + - component: {fileID: 1349948626} + - component: {fileID: 1349948629} + - component: {fileID: 1349948628} + - component: {fileID: 1349948627} m_Layer: 5 m_Name: StoryText m_TagString: Untagged @@ -2927,12 +2961,12 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 750318401} - {fileID: 1841863390} m_Father: {fileID: 210404269} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 753, y: 145.63} @@ -3003,18 +3037,18 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1479280632} - - 223: {fileID: 1479280641} - - 114: {fileID: 1479280640} - - 225: {fileID: 1479280639} - - 114: {fileID: 1479280638} - - 114: {fileID: 1479280637} - - 114: {fileID: 1479280636} - - 114: {fileID: 1479280635} - - 114: {fileID: 1479280633} - - 82: {fileID: 1479280634} + - component: {fileID: 1479280632} + - component: {fileID: 1479280641} + - component: {fileID: 1479280640} + - component: {fileID: 1479280639} + - component: {fileID: 1479280638} + - component: {fileID: 1479280637} + - component: {fileID: 1479280636} + - component: {fileID: 1479280635} + - component: {fileID: 1479280633} + - component: {fileID: 1479280634} m_Layer: 5 m_Name: SayDialog m_TagString: Untagged @@ -3032,11 +3066,11 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1046363305} m_Father: {fileID: 650544894} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -3075,6 +3109,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -3087,12 +3122,14 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -3103,7 +3140,8 @@ AudioSource: panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -3114,7 +3152,8 @@ AudioSource: spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -3125,7 +3164,8 @@ AudioSource: reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -3194,6 +3234,7 @@ MonoBehaviour: storyText: {fileID: 821329841} characterImage: {fileID: 204332871} fitTextWithImage: 1 + closeOtherDialogs: 0 --- !u!114 &1479280638 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3270,10 +3311,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1583537809} - - 114: {fileID: 1583537810} + - component: {fileID: 1583537809} + - component: {fileID: 1583537810} m_Layer: 0 m_Name: Sherlock m_TagString: Untagged @@ -3290,10 +3331,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 215354034} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1583537810 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3309,7 +3350,6 @@ MonoBehaviour: nameText: Sherlock nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} - profileSprite: {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} portraits: - {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} - {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} @@ -3321,10 +3361,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1658702952} - - 114: {fileID: 1658702951} + - component: {fileID: 1658702952} + - component: {fileID: 1658702951} m_Layer: 0 m_Name: _FungusState m_TagString: Untagged @@ -3353,27 +3393,27 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1740854158 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1740854159} - - 223: {fileID: 1740854168} - - 114: {fileID: 1740854167} - - 225: {fileID: 1740854166} - - 114: {fileID: 1740854165} - - 114: {fileID: 1740854164} - - 114: {fileID: 1740854163} - - 114: {fileID: 1740854162} - - 114: {fileID: 1740854160} - - 82: {fileID: 1740854161} + - component: {fileID: 1740854159} + - component: {fileID: 1740854168} + - component: {fileID: 1740854167} + - component: {fileID: 1740854166} + - component: {fileID: 1740854165} + - component: {fileID: 1740854164} + - component: {fileID: 1740854163} + - component: {fileID: 1740854162} + - component: {fileID: 1740854160} + - component: {fileID: 1740854161} m_Layer: 5 m_Name: SayDialog m_TagString: Untagged @@ -3391,11 +3431,11 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 210404269} m_Father: {fileID: 215354034} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -3434,6 +3474,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -3446,12 +3487,14 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -3462,7 +3505,8 @@ AudioSource: panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -3473,7 +3517,8 @@ AudioSource: spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -3484,7 +3529,8 @@ AudioSource: reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -3553,6 +3599,7 @@ MonoBehaviour: storyText: {fileID: 1349948628} characterImage: {fileID: 624819111} fitTextWithImage: 1 + closeOtherDialogs: 0 --- !u!114 &1740854165 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3629,12 +3676,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1767600971} - - 222: {fileID: 1767600974} - - 114: {fileID: 1767600973} - - 114: {fileID: 1767600972} + - component: {fileID: 1767600971} + - component: {fileID: 1767600974} + - component: {fileID: 1767600973} + - component: {fileID: 1767600972} m_Layer: 5 m_Name: Continue m_TagString: Untagged @@ -3652,11 +3699,11 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2067332024} m_Father: {fileID: 821329839} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -38.900024, y: 38.074993} @@ -3755,11 +3802,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1781085154} - - 222: {fileID: 1781085156} - - 114: {fileID: 1781085155} + - component: {fileID: 1781085154} + - component: {fileID: 1781085156} + - component: {fileID: 1781085155} m_Layer: 0 m_Name: Offscreen Right m_TagString: Untagged @@ -3777,10 +3824,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 191157551} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 1300, y: -1000} @@ -3826,11 +3873,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1801706401} - - 222: {fileID: 1801706403} - - 114: {fileID: 1801706402} + - component: {fileID: 1801706401} + - component: {fileID: 1801706403} + - component: {fileID: 1801706402} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3848,10 +3895,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1841863390} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -3903,10 +3950,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1808696925} - - 114: {fileID: 1808696926} + - component: {fileID: 1808696925} + - component: {fileID: 1808696926} m_Layer: 0 m_Name: Stage m_TagString: Untagged @@ -3923,11 +3970,11 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 191157551} m_Father: {fileID: 215354034} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1808696926 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3953,22 +4000,16 @@ MonoBehaviour: - {fileID: 286144663} - {fileID: 1916701316} - {fileID: 1781085154} - cachedPositions: - - {fileID: 782087304} - - {fileID: 227028111} - - {fileID: 286144663} - - {fileID: 1916701316} - - {fileID: 1781085154} --- !u!1 &1825659052 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1825659053} - - 222: {fileID: 1825659055} - - 114: {fileID: 1825659054} + - component: {fileID: 1825659053} + - component: {fileID: 1825659055} + - component: {fileID: 1825659054} m_Layer: 5 m_Name: NameText m_TagString: Untagged @@ -3986,10 +4027,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 821329839} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 553, y: 251} @@ -4041,12 +4082,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1841863390} - - 222: {fileID: 1841863393} - - 114: {fileID: 1841863392} - - 114: {fileID: 1841863391} + - component: {fileID: 1841863390} + - component: {fileID: 1841863393} + - component: {fileID: 1841863392} + - component: {fileID: 1841863391} m_Layer: 5 m_Name: Continue m_TagString: Untagged @@ -4064,11 +4105,11 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1801706401} m_Father: {fileID: 1349948626} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -38.900024, y: 38.074993} @@ -4167,11 +4208,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1916701316} - - 222: {fileID: 1916701318} - - 114: {fileID: 1916701317} + - component: {fileID: 1916701316} + - component: {fileID: 1916701318} + - component: {fileID: 1916701317} m_Layer: 0 m_Name: Offscreen Left m_TagString: Untagged @@ -4189,10 +4230,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 191157551} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -1300, y: -1000} @@ -4238,11 +4279,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 2067332024} - - 222: {fileID: 2067332026} - - 114: {fileID: 2067332025} + - component: {fileID: 2067332024} + - component: {fileID: 2067332026} + - component: {fileID: 2067332025} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4260,10 +4301,10 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1767600971} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -4315,10 +4356,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 2146958085} - - 114: {fileID: 2146958086} + - component: {fileID: 2146958085} + - component: {fileID: 2146958086} m_Layer: 0 m_Name: John m_TagString: Untagged @@ -4335,10 +4376,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 215354034} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2146958086 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4354,7 +4395,6 @@ MonoBehaviour: nameText: John nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} - profileSprite: {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} portraits: - {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} - {fileID: 21300000, guid: 820bab66bb5a044ec961ba8ee3b045cc, type: 3}