diff --git a/Assets/Fungus/Narrative/Resources/SayDialog.prefab b/Assets/Fungus/Narrative/Resources/SayDialog.prefab index 0857f2ff..c17c4f7f 100644 --- a/Assets/Fungus/Narrative/Resources/SayDialog.prefab +++ b/Assets/Fungus/Narrative/Resources/SayDialog.prefab @@ -146,6 +146,7 @@ AudioSource: m_Pitch: 1 Loop: 0 Mute: 0 + Spatialize: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -170,6 +171,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -180,6 +182,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -190,6 +193,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -200,6 +204,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!114 &11404316 MonoBehaviour: m_ObjectHideFlags: 1 @@ -241,11 +246,11 @@ MonoBehaviour: 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_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -285,7 +290,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -294,6 +305,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -348,6 +360,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -430,10 +448,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetTextObject: {fileID: 188894} + punchObject: {fileID: 188900} writingSpeed: 60 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 + forceRichText: 1 + instantComplete: 1 --- !u!114 &11488894 MonoBehaviour: m_ObjectHideFlags: 1 @@ -445,14 +466,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} m_Name: m_EditorClassIdentifier: - fadeDuration: .25 + fadeDuration: 0.25 continueButton: {fileID: 11419088} dialogCanvas: {fileID: 22388894} nameText: {fileID: 11488900} storyText: {fileID: 11488896} characterImage: {fileID: 11448914} fitTextWithImage: 1 - textWidthScale: .800000012 --- !u!114 &11488896 MonoBehaviour: m_ObjectHideFlags: 1 @@ -466,14 +486,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_MaxSize: 50 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -491,15 +518,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .258823544, g: .254901975, b: .262745112, a: 1} + m_Color: {r: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_MaxSize: 50 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 0 @@ -518,6 +552,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: eeb00f6cd27e9ef4d9174551b3342dec, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -560,6 +600,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -621,6 +667,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!224 &22433354 RectTransform: m_ObjectHideFlags: 1 @@ -636,9 +683,9 @@ RectTransform: 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} + m_AnchoredPosition: {x: -38.900024, y: 38.074993} + m_SizeDelta: {x: 77.900024, y: 77} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22443574 RectTransform: m_ObjectHideFlags: 1 @@ -655,7 +702,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22448914 RectTransform: m_ObjectHideFlags: 1 @@ -670,9 +717,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1386, y: 263.130005} + m_AnchoredPosition: {x: 1386, y: 263.13} m_SizeDelta: {x: 357, y: 435} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22488894 RectTransform: m_ObjectHideFlags: 1 @@ -689,7 +736,7 @@ RectTransform: 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} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22488896 RectTransform: m_ObjectHideFlags: 1 @@ -706,9 +753,9 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 799, y: 145.630005} + m_AnchoredPosition: {x: 799, y: 145.63} m_SizeDelta: {x: 1531, y: 200} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22488900 RectTransform: m_ObjectHideFlags: 1 @@ -723,8 +770,8 @@ RectTransform: - {fileID: 22488896} m_Father: {fileID: 22488902} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -805, y: 0} m_SizeDelta: {x: 1605, y: 335} m_Pivot: {x: 0, y: 0} diff --git a/Assets/Fungus/UI/Scripts/Writer.cs b/Assets/Fungus/UI/Scripts/Writer.cs index 0e88efe3..7a9dfcd0 100644 --- a/Assets/Fungus/UI/Scripts/Writer.cs +++ b/Assets/Fungus/UI/Scripts/Writer.cs @@ -38,6 +38,9 @@ namespace Fungus [Tooltip("Gameobject containing a Text, Inout Field or Text Mesh object to write to")] public GameObject targetTextObject; + [Tooltip("Gameobject to punch when the punch tags are displayed. If none is set, the main camera will shake instead.")] + public GameObject punchObject; + [Tooltip("Writing characters per second")] public float writingSpeed = 60; @@ -752,11 +755,16 @@ namespace Fungus protected virtual void Punch(Vector3 axis, float time) { - if (Camera.main == null) + GameObject go = punchObject; + if (go == null) { - return; + go = Camera.main.gameObject; + } + + if (go != null) + { + iTween.ShakePosition(go, axis, time); } - iTween.ShakePosition(Camera.main.gameObject, axis, time); } protected virtual void Flash(float duration) diff --git a/Assets/FungusExamples/Sherlock/TheExperiment.unity b/Assets/FungusExamples/Sherlock/TheExperiment.unity index 1210c005..d6a75dc5 100644 --- a/Assets/FungusExamples/Sherlock/TheExperiment.unity +++ b/Assets/FungusExamples/Sherlock/TheExperiment.unity @@ -8,25 +8,25 @@ SceneSettings: m_PVSPortalsArray: [] m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 6 m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 - m_FogDensity: .00999999978 + m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} - m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} - m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: .5 + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -40,7 +40,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 6 m_GIWorkflowMode: 1 m_LightmapsMode: 1 m_GISettings: @@ -66,7 +66,7 @@ LightmapSettings: m_FinalGather: 0 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 - m_LightmapSnapshot: {fileID: 0} + m_LightingDataAsset: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: @@ -74,15 +74,15 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666657 + cellSize: 0.16666666 manualCellSize: 0 m_NavMeshData: {fileID: 0} --- !u!1 &20194184 @@ -131,7 +131,7 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 - m_RepeatDelay: .5 + m_RepeatDelay: 0.5 m_ForceModuleActive: 0 --- !u!114 &20194187 MonoBehaviour: @@ -158,7 +158,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 --- !u!1 &31336593 GameObject: m_ObjectHideFlags: 0 @@ -193,14 +193,18 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 4cb7c889915644b22a94212146500698, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 --- !u!4 &31336595 Transform: m_ObjectHideFlags: 0 @@ -208,8 +212,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 31336593} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.53999996, y: -.649999976, z: 0} - m_LocalScale: {x: .924913228, y: .924913228, z: .924913228} + m_LocalPosition: {x: 4.54, y: -0.65, z: 0} + m_LocalScale: {x: 0.9249132, y: 0.9249132, z: 0.9249132} m_Children: [] m_Father: {fileID: 1782167289} m_RootOrder: 3 @@ -256,7 +260,7 @@ MonoBehaviour: m_EditorClassIdentifier: tagStartSymbol: '{annoyed}' tagEndSymbol: - replaceTagStartWith: '{audio=annoyed}{shake=10}' + replaceTagStartWith: '{audio=annoyed}{shake=20}' replaceTagEndWith: --- !u!82 &44771033 AudioSource: @@ -298,6 +302,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -308,6 +313,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -318,6 +324,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -328,6 +335,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &45494602 GameObject: m_ObjectHideFlags: 0 @@ -413,6 +421,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -423,6 +432,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -433,6 +443,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -443,6 +454,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &96969494 GameObject: m_ObjectHideFlags: 0 @@ -467,7 +479,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 96969494} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -480.924713, y: -314.928009, z: 0} + m_LocalPosition: {x: -480.9247, y: -314.928, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 684540985} @@ -528,6 +540,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -538,6 +551,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -548,6 +562,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -558,6 +573,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &137130842 GameObject: m_ObjectHideFlags: 0 @@ -599,7 +615,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nameText: SHERLOCK - nameColor: {r: .258823544, g: .254901975, b: .262745112, a: 1} + nameColor: {r: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1} soundEffect: {fileID: 8300000, guid: 0eb825d5775aa234280e50db9a33cffe, type: 3} profileSprite: {fileID: 21300000, guid: c27113fd8a09c7c45a856e5d3c843c11, type: 3} portraits: @@ -637,6 +653,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 58f5b79d262f6814bb4ebb44e29efe90, type: 3} - {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} portraitsFace: 1 + setSayDialog: {fileID: 0} description: --- !u!1 &170680003 GameObject: @@ -767,6 +784,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -777,6 +795,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -787,6 +806,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -797,6 +817,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &236204400 GameObject: m_ObjectHideFlags: 0 @@ -854,6 +875,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -864,6 +886,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -874,6 +897,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -884,6 +908,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!4 &236204402 Transform: m_ObjectHideFlags: 0 @@ -981,6 +1006,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -991,6 +1017,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -1001,6 +1028,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -1011,6 +1039,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &370749684 GameObject: m_ObjectHideFlags: 0 @@ -1309,6 +1338,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -1319,6 +1349,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -1329,6 +1360,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -1339,6 +1371,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &551306621 GameObject: m_ObjectHideFlags: 0 @@ -1408,6 +1441,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -1418,6 +1452,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -1428,6 +1463,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -1438,6 +1474,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &562066060 GameObject: m_ObjectHideFlags: 1 @@ -1563,6 +1600,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -1573,6 +1611,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -1583,6 +1622,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -1593,6 +1633,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &666196620 GameObject: m_ObjectHideFlags: 0 @@ -1662,6 +1703,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -1672,6 +1714,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -1682,6 +1725,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -1692,6 +1736,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &673632344 GameObject: m_ObjectHideFlags: 0 @@ -1864,6 +1909,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -1874,6 +1920,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -1884,6 +1931,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -1894,6 +1942,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!4 &720879694 Transform: m_ObjectHideFlags: 0 @@ -2023,6 +2072,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -2033,6 +2083,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -2043,6 +2094,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -2053,6 +2105,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &884427799 GameObject: m_ObjectHideFlags: 0 @@ -2076,7 +2129,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 884427799} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -.310000002, y: 3.88000011, z: 0} + m_LocalPosition: {x: -0.31, y: 3.88, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1782167289} @@ -2099,14 +2152,18 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 4b0730798d1d046d19e939e0717e5704, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 --- !u!1 &898034485 GameObject: m_ObjectHideFlags: 0 @@ -2192,6 +2249,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -2202,6 +2260,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -2212,6 +2271,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -2222,6 +2282,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &900000110 GameObject: m_ObjectHideFlags: 0 @@ -2251,7 +2312,7 @@ Transform: - {fileID: 491891010} - {fileID: 684540985} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 --- !u!1 &950051498 GameObject: m_ObjectHideFlags: 0 @@ -2317,14 +2378,14 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .367647052, g: .367647052, b: .367647052, a: .0196078438} + m_BackGroundColor: {r: 0.36764705, g: 0.36764705, b: 0.36764705, a: 0.019607844} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: .300000012 + near clip plane: 0.3 far clip plane: 1000 field of view: 60 orthographic: 1 @@ -2340,7 +2401,7 @@ Camera: m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 + m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 --- !u!1 &955843138 GameObject: @@ -2415,7 +2476,7 @@ Transform: - {fileID: 720879694} - {fileID: 1167501258} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 --- !u!1 &1103817140 GameObject: m_ObjectHideFlags: 0 @@ -2501,6 +2562,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -2511,6 +2573,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -2521,6 +2584,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -2531,6 +2595,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1105015582 GameObject: m_ObjectHideFlags: 0 @@ -2644,6 +2709,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -2654,6 +2720,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -2664,6 +2731,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -2674,6 +2742,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1167501257 GameObject: m_ObjectHideFlags: 0 @@ -2847,6 +2916,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -2857,6 +2927,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -2867,6 +2938,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -2877,6 +2949,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1001 &1297790152 Prefab: m_ObjectHideFlags: 0 @@ -3012,6 +3085,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -3022,6 +3096,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -3032,6 +3107,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -3042,6 +3118,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &1361872517 GameObject: m_ObjectHideFlags: 0 @@ -3111,6 +3188,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -3121,6 +3199,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -3131,6 +3210,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -3141,6 +3221,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1390555290 GameObject: m_ObjectHideFlags: 0 @@ -3335,19 +3416,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1.0 - scrollPos: {x: 2985.33252, y: 1207.83801} + scrollPos: {x: 2985.3325, y: 1207.838} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 blockViewHeight: 280 - zoom: 1 + zoom: 0.98599917 scrollViewRect: serializedVersion: 2 - x: -4071.38501 - y: -1729.35046 - width: 5969.4458 - height: 2818.85034 + x: -4071.385 + y: -1729.3505 + width: 5969.446 + height: 2818.8503 selectedBlock: {fileID: 1390555440} - selectedCommands: [] + selectedCommands: + - {fileID: 1390555300} variables: - {fileID: 1390555396} description: 'Example scene from Sherlock: The Game Is On' @@ -3368,7 +3450,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 --- !u!114 &1390555297 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3409,8 +3491,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2592.33252 - y: -1082.83801 + x: -2590.3325 + y: -1083.838 width: 120 height: 40 itemId: 96 @@ -3497,7 +3579,7 @@ MonoBehaviour: showAlways: 1 showCount: 1 extendPrevious: 0 - fadeWhenDone: 1 + fadeWhenDone: 0 waitForClick: 0 setSayDialog: {fileID: 0} --- !u!114 &1390555301 @@ -3536,8 +3618,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2429.33252 - y: -947.838013 + x: -2429.3325 + y: -947.838 width: 120 height: 40 itemId: 95 @@ -3586,8 +3668,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2430.33252 - y: -879.838013 + x: -2430.3325 + y: -879.838 width: 120 height: 40 itemId: 98 @@ -3660,8 +3742,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2592.33252 - y: -1152.83801 + x: -2592.3325 + y: -1152.838 width: 120 height: 40 itemId: 101 @@ -3694,8 +3776,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2440.33252 - y: -800.838013 + x: -2440.3325 + y: -800.838 width: 135 height: 40 itemId: 97 @@ -3790,8 +3872,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2745.33252 - y: -951.838013 + x: -2745.3325 + y: -951.838 width: 120 height: 40 itemId: 94 @@ -5084,8 +5166,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2289.33252 - y: -878.838013 + x: -2289.3325 + y: -878.838 width: 152 height: 40 itemId: 99 @@ -5300,8 +5382,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2754.33252 - y: -883.838013 + x: -2754.3325 + y: -883.838 width: 132 height: 40 itemId: 100 @@ -5880,6 +5962,7 @@ MonoBehaviour: indentLevel: 0 spriteRenderer: {fileID: 884427801} visible: 0 + affectChildren: 1 --- !u!114 &1390555394 MonoBehaviour: m_ObjectHideFlags: 2 @@ -5896,6 +5979,7 @@ MonoBehaviour: indentLevel: 0 spriteRenderer: {fileID: 31336594} visible: 0 + affectChildren: 1 --- !u!114 &1390555395 MonoBehaviour: m_ObjectHideFlags: 2 @@ -5912,6 +5996,7 @@ MonoBehaviour: indentLevel: 0 spriteRenderer: {fileID: 1612042692} visible: 0 + affectChildren: 1 --- !u!114 &1390555396 MonoBehaviour: m_ObjectHideFlags: 2 @@ -5940,7 +6025,7 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2599.41992 + x: -2599.42 y: -1010.35046 width: 142 height: 40 @@ -6022,6 +6107,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -6032,6 +6118,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -6042,6 +6129,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -6052,6 +6140,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1612042690 GameObject: m_ObjectHideFlags: 0 @@ -6075,8 +6164,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1612042690} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5, y: -.790000021, z: 0} - m_LocalScale: {x: .737242758, y: .737242758, z: .737242758} + m_LocalPosition: {x: -5, y: -0.79, z: 0} + m_LocalScale: {x: 0.73724276, y: 0.73724276, z: 0.73724276} m_Children: [] m_Father: {fileID: 1782167289} m_RootOrder: 1 @@ -6098,14 +6187,18 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: eea3b26b25ca249f58d5659aabf1114c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 --- !u!1 &1632237022 GameObject: m_ObjectHideFlags: 0 @@ -6175,6 +6268,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -6185,6 +6279,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -6195,6 +6290,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -6205,6 +6301,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1657662358 GameObject: m_ObjectHideFlags: 0 @@ -6283,14 +6380,18 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 11c1465344d894bf0b62fe226620a7ab, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 --- !u!4 &1675553599 Transform: m_ObjectHideFlags: 0 @@ -6298,11 +6399,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1675553597} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .0260436535, y: -.0699744225, z: 0} + m_LocalPosition: {x: 0.026043653, y: -0.06997442, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 --- !u!1 &1782167288 GameObject: m_ObjectHideFlags: 0 @@ -6334,7 +6435,7 @@ Transform: - {fileID: 31336595} - {fileID: 2016355052} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 --- !u!1 &1789234733 GameObject: m_ObjectHideFlags: 0 @@ -6370,14 +6471,18 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: bcd5b5f11de95ec4ba92005e4a404502, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} + m_FlipX: 0 + m_FlipY: 0 --- !u!4 &1789234735 Transform: m_ObjectHideFlags: 0 @@ -6419,7 +6524,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nameText: JOHN - nameColor: {r: .258823544, g: .254901975, b: .262745112, a: 1} + nameColor: {r: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1} soundEffect: {fileID: 8300000, guid: 3f244b0ea8fc90446baebef62dfd285b, type: 3} profileSprite: {fileID: 21300000, guid: a79a4c2e96ba5fd418c637fe852e92d9, type: 3} portraits: @@ -6453,6 +6558,7 @@ MonoBehaviour: - {fileID: 21300000, guid: d7af8fdea3ead3c4b8a4e54d014b255d, type: 3} - {fileID: 21300000, guid: d38d394fe4d92ae4da3d41e6ff3b0385, type: 3} portraitsFace: 2 + setSayDialog: {fileID: 0} description: --- !u!4 &1880195409 Transform: @@ -6494,7 +6600,7 @@ Transform: - {fileID: 1880195409} - {fileID: 137130843} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 --- !u!1 &1986911339 GameObject: m_ObjectHideFlags: 0 @@ -6538,7 +6644,7 @@ MonoBehaviour: m_EditorClassIdentifier: tagStartSymbol: '{worried}' tagEndSymbol: - replaceTagStartWith: '{audio=worried}{vpunch=4}' + replaceTagStartWith: '{audio=worried}{vpunch=20}' replaceTagEndWith: --- !u!82 &1986911342 AudioSource: @@ -6580,6 +6686,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -6590,6 +6697,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -6600,6 +6708,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -6610,6 +6719,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &2016355051 GameObject: m_ObjectHideFlags: 0 @@ -6656,14 +6766,18 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e9767bc88b404362852d1a4d5c0d103, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 --- !u!1 &2021409966 GameObject: m_ObjectHideFlags: 0 @@ -6749,6 +6863,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -6759,6 +6874,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -6769,6 +6885,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -6779,6 +6896,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &2072265256 GameObject: m_ObjectHideFlags: 0 @@ -6850,7 +6968,7 @@ Transform: - {fileID: 950051499} - {fileID: 2072265257} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 2 --- !u!1 &2143908450 GameObject: m_ObjectHideFlags: 0