diff --git a/Assets/Art/Cinematics/Factory/FactoryIntroTimeline.playable b/Assets/Art/Cinematics/Factory/FactoryIntroTimeline.playable index 3543648a..341e770a 100644 --- a/Assets/Art/Cinematics/Factory/FactoryIntroTimeline.playable +++ b/Assets/Art/Cinematics/Factory/FactoryIntroTimeline.playable @@ -126,6 +126,99 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &-6272534478882868843 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (1) + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -1211865804559072499} + m_Duration: 13.833333333333334 + m_TimeScale: 1 + m_ParentTrack: {fileID: -6272534478882868843} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &-4849378385594947304 MonoBehaviour: m_ObjectHideFlags: 1 @@ -234,6 +327,18 @@ MonoBehaviour: m_Loop: 1 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-1211865804559072499 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset --- !u!114 &-727781528643406096 MonoBehaviour: m_ObjectHideFlags: 1 @@ -292,25 +397,7 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -325,37 +412,52 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: DollyCamera - m_Version: 1 - m_Start: 12.766666666666667 + m_Start: 8 m_ClipIn: 0 - m_Asset: {fileID: 8206857746475279820} - m_Duration: 1.3666666666666671 + m_Asset: {fileID: 3402378795820184593} + m_Duration: 5.833333333333334 m_TimeScale: 1 m_ParentTrack: {fileID: -727781528643406096} m_EaseInDuration: 0 m_EaseOutDuration: 0 - m_BlendInDuration: 1.0666666666666664 + m_BlendInDuration: 1.5666666666666664 + m_BlendOutDuration: 1.8000000000000007 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: FocusCamera + - m_Version: 1 + m_Start: 12.033333333333333 + m_ClipIn: 0 + m_Asset: {fileID: 6519620860306194181} + m_Duration: 1.9666666666666668 + m_TimeScale: 1 + m_ParentTrack: {fileID: -727781528643406096} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 1.8000000000000007 m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -393,75 +495,6 @@ MonoBehaviour: m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 m_DisplayName: GameplayCamera - - m_Version: 1 - m_Start: 8 - m_ClipIn: 0 - m_Asset: {fileID: 3402378795820184593} - m_Duration: 5.833333333333334 - m_TimeScale: 1 - m_ParentTrack: {fileID: -727781528643406096} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: 1.5666666666666664 - m_BlendOutDuration: 1.0666666666666664 - m_MixInCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: FocusCamera m_Markers: m_Objects: [] TrackPriority: 0 @@ -611,6 +644,8 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.TimelineAsset m_Version: 0 m_Tracks: + - {fileID: 4729252056977678481} + - {fileID: -6272534478882868843} - {fileID: -727781528643406096} - {fileID: 6171170372369797488} - {fileID: 3174414979484781440} @@ -806,6 +841,99 @@ MonoBehaviour: m_Retroactive: 0 m_EmitOnce: 0 m_Asset: {fileID: 11400000, guid: 50cc58e8ee01bf841a920508fe336516, type: 2} +--- !u!114 &4729252056977678481 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 8687914112232772499} + m_Duration: 13.833333333333334 + m_TimeScale: 1 + m_ParentTrack: {fileID: 4729252056977678481} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &5452827367277067926 MonoBehaviour: m_ObjectHideFlags: 1 @@ -932,7 +1060,7 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 ---- !u!114 &8206857746475279820 +--- !u!114 &6519620860306194181 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -946,5 +1074,17 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineShot DisplayName: VirtualCamera: - exposedName: 860ba266c6b8cab4f9529fabe8f8f1e1 + exposedName: d88b5310ac3f22a46a9c5f0ec05b2cc8 defaultValue: {fileID: 0} +--- !u!114 &8687914112232772499 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset diff --git a/Assets/Prefabs/Levels/LevelIntroDirector.prefab b/Assets/Prefabs/Levels/LevelIntroDirector.prefab index 42d670be..a7958172 100644 --- a/Assets/Prefabs/Levels/LevelIntroDirector.prefab +++ b/Assets/Prefabs/Levels/LevelIntroDirector.prefab @@ -48,8 +48,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera Priority: - Enabled: 0 - m_Value: 0 + Enabled: 1 + m_Value: -1 OutputChannel: 1 StandbyUpdate: 2 m_StreamingVersion: 20241001 @@ -374,6 +374,7 @@ GameObject: m_Component: - component: {fileID: 4013966011268908366} - component: {fileID: 8417332413312608776} + - component: {fileID: 741350484225047764} m_Layer: 0 m_Name: LevelIntroDirector m_TagString: Untagged @@ -409,7 +410,7 @@ PlayableDirector: m_Enabled: 1 serializedVersion: 3 m_PlayableAsset: {fileID: 11400000, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2} - m_InitialState: 1 + m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 m_InitialTime: 0 @@ -435,6 +436,22 @@ PlayableDirector: - a684498915499c04b900cfe3c0192908: {fileID: 400409417890847843} - b8c4445982b298446983c59e031f7889: {fileID: 0} - 6283adbc9ff37874fb5f6c24d698acf5: {fileID: 4242692913154398155} +--- !u!114 &741350484225047764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3317763283033734452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b57bc17ff80ee534c93ed5676dd794ff, type: 3} + m_Name: + m_EditorClassIdentifier: '::' + playOnSceneReady: 1 + dollyCam: {fileID: 400409417890847843} + focusCam: {fileID: 4242692913154398155} + introPlayableDirector: {fileID: 0} --- !u!1 &3965318653236547925 GameObject: m_ObjectHideFlags: 0 @@ -484,8 +501,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera Priority: - Enabled: 0 - m_Value: 1 + Enabled: 1 + m_Value: -1 OutputChannel: 1 StandbyUpdate: 2 m_StreamingVersion: 20241001 diff --git a/Assets/Scenes/Levels/CementFactory.unity b/Assets/Scenes/Levels/CementFactory.unity index 3ca4dba9..5e717785 100644 --- a/Assets/Scenes/Levels/CementFactory.unity +++ b/Assets/Scenes/Levels/CementFactory.unity @@ -474,6 +474,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &75496601 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3965318653236547925, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + m_PrefabInstance: {fileID: 2301579471450207868} + m_PrefabAsset: {fileID: 0} --- !u!1 &79920937 GameObject: m_ObjectHideFlags: 0 @@ -3251,25 +3256,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &341969444 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3317763283033734452, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} - m_PrefabInstance: {fileID: 2301579471450207868} - m_PrefabAsset: {fileID: 0} ---- !u!114 &341969447 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 341969444} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b57bc17ff80ee534c93ed5676dd794ff, type: 3} - m_Name: - m_EditorClassIdentifier: '::' - playOnSceneReady: 0 - introPlayableDirector: {fileID: 0} --- !u!1001 &342494751 PrefabInstance: m_ObjectHideFlags: 0 @@ -320582,6 +320568,22 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &1487412684 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1556656459464491038, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + m_PrefabInstance: {fileID: 2301579471450207868} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1487412685 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4242692913154398155, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + m_PrefabInstance: {fileID: 2301579471450207868} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1487412684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera --- !u!1 &1495504782 GameObject: m_ObjectHideFlags: 0 @@ -327468,17 +327470,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 400409417890847843, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: Priority.Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2718684908169034320, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_LocalPosition.x - value: 35.05065 + value: -4.3 objectReference: {fileID: 0} - target: {fileID: 2718684908169034320, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_LocalPosition.y - value: -46.560646 + value: -24.6 objectReference: {fileID: 0} - target: {fileID: 2718684908169034320, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_LocalPosition.z - value: -100.0126 + value: -100 objectReference: {fileID: 0} - target: {fileID: 3317763283033734452, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_Name @@ -327524,10 +327530,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4242692913154398155, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: Priority.Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_InitialState value: 0 objectReference: {fileID: 0} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_SceneBindings.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_SceneBindings.Array.data[7].key + value: + objectReference: {fileID: 4729252056977678481, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_SceneBindings.Array.data[8].key + value: + objectReference: {fileID: -6272534478882868843, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2} - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_SceneBindings.Array.data[1].value value: @@ -327548,17 +327570,42 @@ PrefabInstance: propertyPath: m_SceneBindings.Array.data[5].value value: objectReference: {fileID: 1885945952} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_SceneBindings.Array.data[7].value + value: + objectReference: {fileID: 75496601} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_SceneBindings.Array.data[8].value + value: + objectReference: {fileID: 1487412684} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_ExposedReferences.m_References.Array.size + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_ExposedReferences.m_References.Array.data[4].first + value: d88b5310ac3f22a46a9c5f0ec05b2cc8 + objectReference: {fileID: 0} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_ExposedReferences.m_References.Array.data[5].first + value: 6283adbc9ff37874fb5f6c24d698acf5 + objectReference: {fileID: 0} - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} propertyPath: m_ExposedReferences.m_References.Array.data[1].second value: objectReference: {fileID: 1676982115} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_ExposedReferences.m_References.Array.data[4].second + value: + objectReference: {fileID: 1676982115} + - target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} + propertyPath: m_ExposedReferences.m_References.Array.data[5].second + value: + objectReference: {fileID: 1487412685} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3317763283033734452, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} - insertIndex: -1 - addedObject: {fileID: 341969447} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3} --- !u!1001 &2360027994006890769 PrefabInstance: diff --git a/Assets/Scripts/Cinematics/LevelIntroDirector.cs b/Assets/Scripts/Cinematics/LevelIntroDirector.cs index 554b8df4..7a9a07f6 100644 --- a/Assets/Scripts/Cinematics/LevelIntroDirector.cs +++ b/Assets/Scripts/Cinematics/LevelIntroDirector.cs @@ -3,6 +3,7 @@ using Core; using Core.Lifecycle; using UnityEngine.Playables; using Input; +using Unity.Cinemachine; public class LevelIntroDirector : ManagedBehaviour { @@ -14,17 +15,21 @@ public class LevelIntroDirector : ManagedBehaviour internal override void OnSceneReady() { base.OnSceneReady(); - introPlayableDirector = GetComponent(); - introPlayableDirector.stopped += IntroTimelineStopped; if (playOnSceneReady) { + introPlayableDirector = GetComponent(); + introPlayableDirector.stopped += IntroTimelineStopped; PlayIntroTimeline(); } + else { gameObject.SetActive(false); } } private void IntroTimelineStopped(PlayableDirector director) { InputManager.Instance.SetInputMode(InputMode.Game); + introPlayableDirector.stopped -= IntroTimelineStopped; + gameObject.SetActive(false); + } public void PlayIntroTimeline()