diff --git a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity index dc5bedb2..557b78ea 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b63055c7467dd08bc27e1f93e6c2808b0cd746aa8a9124413e91117e494a35a5 -size 79898 +oid sha256:7d6586ca857eeac3d4d13d6394a57d9e97e31015c70268164a28a4d1066a989d +size 76700 diff --git a/Assets/08_Timeline/Timeline_WhaleAttack.playable b/Assets/08_Timeline/Timeline_WhaleAttack.playable index aa8375ee..50d9e696 100644 --- a/Assets/08_Timeline/Timeline_WhaleAttack.playable +++ b/Assets/08_Timeline/Timeline_WhaleAttack.playable @@ -277,106 +277,12 @@ MonoBehaviour: - {fileID: -3706586746334657321} - {fileID: 3718969083211372470} - {fileID: 3564304398118365733} - - {fileID: 34243419373862889} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 m_ScenePreview: 1 m_DurationMode: 0 m_MarkerTrack: {fileID: 0} ---- !u!114 &34243419373862889 -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: 2281746906628976311} - m_Duration: 10.25 - m_TimeScale: 1 - m_ParentTrack: {fileID: 34243419373862889} - 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 &443422495961915861 MonoBehaviour: m_ObjectHideFlags: 1 @@ -584,18 +490,6 @@ MonoBehaviour: m_Retroactive: 0 m_EmitOnce: 0 m_Asset: {fileID: 11400000, guid: 6e675ffab397cd24c88dd218d631c1cd, type: 2} ---- !u!114 &2281746906628976311 -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 &3515210953691807400 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/11_Audio/Source/Etc.meta b/Assets/11_Audio/Source/Etc.meta deleted file mode 100644 index 415abbb7..00000000 --- a/Assets/11_Audio/Source/Etc.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cf76a5bfd97723146a6833189ca4801d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/11_Audio/Source/Etc/WhaleAttack.wav b/Assets/11_Audio/Source/Etc/WhaleAttack.wav deleted file mode 100644 index 69a420c9..00000000 --- a/Assets/11_Audio/Source/Etc/WhaleAttack.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed716c7c4cab10fb9021286bbad2427a84ff6a4b67dfe759ed5268b3021dac84 -size 2152452 diff --git a/Assets/11_Audio/Source/Etc/WhaleAttack.wav.meta b/Assets/11_Audio/Source/Etc/WhaleAttack.wav.meta deleted file mode 100644 index 8ef1810f..00000000 --- a/Assets/11_Audio/Source/Etc/WhaleAttack.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 70017e03c8bc13047af4821bed7cf19c -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: