diff --git a/Assets/Art/Cinematics/Intro/BlokkemonIntroSlideshow.anim b/Assets/Art/Cinematics/Intro/BlokkemonIntroSlideshow.anim index 8d5873fa..572131a8 100644 --- a/Assets/Art/Cinematics/Intro/BlokkemonIntroSlideshow.anim +++ b/Assets/Art/Cinematics/Intro/BlokkemonIntroSlideshow.anim @@ -22,28 +22,6 @@ AnimationClip: curve: - time: 0 value: {fileID: 8506890780563501092, guid: 53e7fc5fdcf364043978c64cd7cd1cbe, type: 3} - - time: 2.5166667 - value: {fileID: 7058679718232470575, guid: 4ce7605333e27114098be92f7694e4ca, type: 3} - - time: 5.0333333 - value: {fileID: -5854921675770542000, guid: a71ffaa3c2690bd4c9117ffe396fe643, type: 3} - - time: 6.1 - value: {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} - - time: 6.1833334 - value: {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} - - time: 6.266667 - value: {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} - - time: 6.35 - value: {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} - - time: 6.4333334 - value: {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} - - time: 6.516667 - value: {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} - - time: 6.6 - value: {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} - - time: 6.6833334 - value: {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} - - time: 6.766667 - value: {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} attribute: m_Sprite path: classID: 114 @@ -67,23 +45,12 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 8506890780563501092, guid: 53e7fc5fdcf364043978c64cd7cd1cbe, type: 3} - - {fileID: 7058679718232470575, guid: 4ce7605333e27114098be92f7694e4ca, type: 3} - - {fileID: -5854921675770542000, guid: a71ffaa3c2690bd4c9117ffe396fe643, type: 3} - - {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} - - {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} - - {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} - - {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} - - {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} - - {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} - - {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} - - {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} - - {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 6.783334 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art/Cinematics/Intro/Blokkemonintro2.anim b/Assets/Art/Cinematics/Intro/Blokkemonintro2.anim new file mode 100644 index 00000000..7a998795 --- /dev/null +++ b/Assets/Art/Cinematics/Intro/Blokkemonintro2.anim @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blokkemonintro2 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 7058679718232470575, guid: 4ce7605333e27114098be92f7694e4ca, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 7058679718232470575, guid: 4ce7605333e27114098be92f7694e4ca, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Cinematics/Intro/Blokkemonintro2.anim.meta b/Assets/Art/Cinematics/Intro/Blokkemonintro2.anim.meta new file mode 100644 index 00000000..3881c5f4 --- /dev/null +++ b/Assets/Art/Cinematics/Intro/Blokkemonintro2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70dffe19d1d87a2489a3f109f70bcae2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Cinematics/Intro/Blokkemonintro3.anim b/Assets/Art/Cinematics/Intro/Blokkemonintro3.anim new file mode 100644 index 00000000..bd2a43dc --- /dev/null +++ b/Assets/Art/Cinematics/Intro/Blokkemonintro3.anim @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blokkemonintro3 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -5854921675770542000, guid: a71ffaa3c2690bd4c9117ffe396fe643, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -5854921675770542000, guid: a71ffaa3c2690bd4c9117ffe396fe643, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Cinematics/Intro/Blokkemonintro3.anim.meta b/Assets/Art/Cinematics/Intro/Blokkemonintro3.anim.meta new file mode 100644 index 00000000..c50d1734 --- /dev/null +++ b/Assets/Art/Cinematics/Intro/Blokkemonintro3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cf845dc8280dfb459b9c67650ef9824 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Cinematics/Intro/IntroSequencePlayable.playable b/Assets/Art/Cinematics/Intro/IntroSequencePlayable.playable index a9eb3f5b..b2a07435 100644 --- a/Assets/Art/Cinematics/Intro/IntroSequencePlayable.playable +++ b/Assets/Art/Cinematics/Intro/IntroSequencePlayable.playable @@ -43,57 +43,6 @@ MonoBehaviour: m_Parent: {fileID: 11400000} m_Children: [] m_Clips: - - m_Version: 1 - m_Start: 9.773958333333333 - m_ClipIn: 9.509375000000002 - m_Asset: {fileID: -7791591795383527341} - m_Duration: 7.109375 - m_TimeScale: 1 - m_ParentTrack: {fileID: -8222318252314758605} - m_EaseInDuration: 0 - m_EaseOutDuration: 0.39 - m_BlendInDuration: -1 - m_BlendOutDuration: -1 - m_MixInCurve: - serializedVersion: 2 - m_Curve: [] - 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: "\xC6blerup Intro - Final Master - VKmix02-LIM" - m_Version: 1 m_Start: 0 m_ClipIn: 0 @@ -145,29 +94,219 @@ MonoBehaviour: m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 m_DisplayName: Applehils_intro_cut_1 + - m_Version: 1 + m_Start: 9.773958333333333 + m_ClipIn: 0 + m_Asset: {fileID: 6242996987179308332} + m_Duration: 15.101041666666667 + m_TimeScale: 1 + m_ParentTrack: {fileID: -8222318252314758605} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + 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_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: IntroVO1 + - m_Version: 1 + m_Start: 24.875 + m_ClipIn: 0 + m_Asset: {fileID: -1405809786086911003} + m_Duration: 8.886229166666666 + m_TimeScale: 1 + m_ParentTrack: {fileID: -8222318252314758605} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + 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_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: IntroVO2 + - m_Version: 1 + m_Start: 33.774999999999494 + m_ClipIn: 0 + m_Asset: {fileID: 5485301007490855783} + m_Duration: 4.977854166666667 + m_TimeScale: 1 + m_ParentTrack: {fileID: -8222318252314758605} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + 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_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: IntroVO3 m_Markers: m_Objects: [] m_TrackProperties: volume: 1 stereoPan: 0 spatialBlend: 0 ---- !u!114 &-7791591795383527341 -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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} - m_Name: AudioPlayableAsset - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset - m_Clip: {fileID: 8300000, guid: 199d97dcce562104e9379743c0233035, type: 3} - m_Loop: 0 - m_bufferingTime: 0.1 - m_ClipProperties: - volume: 0.497 --- !u!114 &-7237764696823809611 MonoBehaviour: m_ObjectHideFlags: 1 @@ -207,6 +346,23 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-1405809786086911003 +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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset + m_Clip: {fileID: 8300000, guid: 9a278eed437ed7c4d8d5b284fc0985ff, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 --- !u!114 &-38993752814118673 MonoBehaviour: m_ObjectHideFlags: 1 @@ -301,7 +457,7 @@ MonoBehaviour: m_Start: 10.083333333333334 m_ClipIn: 0 m_Asset: {fileID: -1500376889730680002} - m_Duration: 6.799999999999999 + m_Duration: 14.791666666666666 m_TimeScale: 1 m_ParentTrack: {fileID: -38993752814118673} m_EaseInDuration: 0 @@ -363,9 +519,198 @@ MonoBehaviour: m_Recordable: 0 m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: Infinity + m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 m_DisplayName: BlokkemonIntroSlideshow + - m_Version: 1 + m_Start: 38.794562499999714 + m_ClipIn: 0 + m_Asset: {fileID: 8298418873323155383} + m_Duration: 1.2000000000000028 + m_TimeScale: 1 + m_ParentTrack: {fileID: -38993752814118673} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + 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_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: 2 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: Infinity + m_PreExtrapolationTime: 0 + m_DisplayName: Static + - m_Version: 1 + m_Start: 24.875 + m_ClipIn: 0 + m_Asset: {fileID: 67628409970732867} + m_Duration: 8.899999999999494 + m_TimeScale: 1 + m_ParentTrack: {fileID: -38993752814118673} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: 0.013770833332827692 + 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: [] + 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: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Blokkemonintro2 + - m_Version: 1 + m_Start: 33.761229166666666 + m_ClipIn: 0 + m_Asset: {fileID: 2103454760024143481} + m_Duration: 5.033333333333047 + m_TimeScale: 1 + m_ParentTrack: {fileID: -38993752814118673} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0.013770833332827692 + 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_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: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Blokkemonintro3 m_Markers: m_Objects: [] m_InfiniteClipPreExtrapolation: 0 @@ -402,9 +747,137 @@ MonoBehaviour: m_Tracks: - {fileID: -38993752814118673} - {fileID: -8222318252314758605} + - {fileID: 139419469794405637} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 24 m_ScenePreview: 1 m_DurationMode: 0 m_MarkerTrack: {fileID: 0} +--- !u!114 &67628409970732867 +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: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AnimationPlayableAsset + m_Clip: {fileID: 7400000, guid: 70dffe19d1d87a2489a3f109f70bcae2, type: 2} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &139419469794405637 +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: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track (1) + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioTrack + 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_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 +--- !u!114 &2103454760024143481 +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: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AnimationPlayableAsset + m_Clip: {fileID: 7400000, guid: 5cf845dc8280dfb459b9c67650ef9824, type: 2} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &5485301007490855783 +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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset + m_Clip: {fileID: 8300000, guid: 51535c303b3ebef49bd2259ed444db53, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 +--- !u!114 &6242996987179308332 +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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset + m_Clip: {fileID: 8300000, guid: c8a81699e085de54188a05f117ee7bcb, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 +--- !u!114 &8298418873323155383 +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: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AnimationPlayableAsset + m_Clip: {fileID: 7400000, guid: 9ac9ec62c1802ee49a0d27fe2d3403bf, type: 2} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} diff --git a/Assets/Art/Cinematics/Intro/Static.anim b/Assets/Art/Cinematics/Intro/Static.anim new file mode 100644 index 00000000..925338da --- /dev/null +++ b/Assets/Art/Cinematics/Intro/Static.anim @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Static + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} + - time: 0.083333336 + value: {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} + - time: 0.16666667 + value: {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} + - time: 0.25 + value: {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} + - time: 0.33333334 + value: {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} + - time: 0.41666666 + value: {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} + - time: 0.5 + value: {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} + - time: 0.5833333 + value: {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} + - {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} + - {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} + - {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} + - {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} + - {fileID: -9164562174607044419, guid: 28cfd219d9e13d841894037f2c835920, type: 3} + - {fileID: 2971705505264714255, guid: fb17c53a602136448bef5fdafc89152e, type: 3} + - {fileID: 4275675568253587765, guid: 4e53d5a5cc9d29b4f81e29f659f8ad44, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.59999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Cinematics/Intro/Static.anim.meta b/Assets/Art/Cinematics/Intro/Static.anim.meta new file mode 100644 index 00000000..7d57f509 --- /dev/null +++ b/Assets/Art/Cinematics/Intro/Static.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ac9ec62c1802ee49a0d27fe2d3403bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Cinematics/Quarry/CinematicSprites.controller b/Assets/Art/Cinematics/Quarry/CinematicSprites.controller index 8479db98..5452d283 100644 --- a/Assets/Art/Cinematics/Quarry/CinematicSprites.controller +++ b/Assets/Art/Cinematics/Quarry/CinematicSprites.controller @@ -12,6 +12,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1764196853123557444} m_Position: {x: 80, y: 290, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6372181148355266043} + m_Position: {x: 115, y: 355, z: 0} + - serializedVersion: 1 + m_State: {fileID: -735680430011430491} + m_Position: {x: 150, y: 420, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -22,6 +28,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1764196853123557444} +--- !u!1102 &-735680430011430491 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blokkemonintro3 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5cf845dc8280dfb459b9c67650ef9824, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -70,3 +102,29 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &6372181148355266043 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blokkemonintro2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 70dffe19d1d87a2489a3f109f70bcae2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Prefabs/Managers/CinematicsManager.prefab b/Assets/Prefabs/Managers/CinematicsManager.prefab index 5f3829a5..c9ffc5b1 100644 --- a/Assets/Prefabs/Managers/CinematicsManager.prefab +++ b/Assets/Prefabs/Managers/CinematicsManager.prefab @@ -424,7 +424,7 @@ PlayableDirector: m_GameObject: {fileID: 2755712733105741372} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 400e13ef8f17b5841acd92120f67a092, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 2 @@ -442,6 +442,8 @@ PlayableDirector: value: {fileID: 2900690403017929526} - key: {fileID: -4231233231006537291, guid: 400e13ef8f17b5841acd92120f67a092, type: 2} value: {fileID: 0} + - key: {fileID: 139419469794405637, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2} + value: {fileID: 0} m_ExposedReferences: m_References: [] --- !u!1 &3025814654250773583 @@ -1523,7 +1525,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9166576207668444836} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: diff --git a/Assets/Sound/Quarry/Voices/IntroVO1.wav b/Assets/Sound/Quarry/Voices/IntroVO1.wav new file mode 100644 index 00000000..0d9ff63b Binary files /dev/null and b/Assets/Sound/Quarry/Voices/IntroVO1.wav differ diff --git a/Assets/Sound/Quarry/Voices/IntroVO1.wav.meta b/Assets/Sound/Quarry/Voices/IntroVO1.wav.meta new file mode 100644 index 00000000..34c961c7 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/IntroVO1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c8a81699e085de54188a05f117ee7bcb +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Quarry/Voices/IntroVO2.wav b/Assets/Sound/Quarry/Voices/IntroVO2.wav new file mode 100644 index 00000000..dd91b70b Binary files /dev/null and b/Assets/Sound/Quarry/Voices/IntroVO2.wav differ diff --git a/Assets/Sound/Quarry/Voices/IntroVO2.wav.meta b/Assets/Sound/Quarry/Voices/IntroVO2.wav.meta new file mode 100644 index 00000000..2012d3ed --- /dev/null +++ b/Assets/Sound/Quarry/Voices/IntroVO2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9a278eed437ed7c4d8d5b284fc0985ff +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Quarry/Voices/IntroVO3.wav b/Assets/Sound/Quarry/Voices/IntroVO3.wav new file mode 100644 index 00000000..b2c8dc1e Binary files /dev/null and b/Assets/Sound/Quarry/Voices/IntroVO3.wav differ diff --git a/Assets/Sound/Quarry/Voices/IntroVO3.wav.meta b/Assets/Sound/Quarry/Voices/IntroVO3.wav.meta new file mode 100644 index 00000000..07f4d53c --- /dev/null +++ b/Assets/Sound/Quarry/Voices/IntroVO3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 51535c303b3ebef49bd2259ed444db53 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: