diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity index 3cd5c480..6478820d 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:216689432b62a12c7e1d7456c494637f2db4766175ce1995ab0bac21227c6b6c -size 73504 +oid sha256:91c35a095e2428046ea830405711d3717fedf4633880dd56a5c30a2425af920f +size 74106 diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity index 9da16397..211c7c72 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42aec8ed97ba2063e05b17b946db8b2ff33e7d28a9c32e28690867b050068613 -size 44265 +oid sha256:47681e0abe6b4963dade9857c5e97a1753fe68ee0e2201ac3e17e6dcba724a84 +size 44612 diff --git a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity index 557b78ea..aed33dc0 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:7d6586ca857eeac3d4d13d6394a57d9e97e31015c70268164a28a4d1066a989d -size 76700 +oid sha256:230c9a49488b225a48adfb8d84646d9955190dc27047b3836da8af7088699a01 +size 79899 diff --git a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs index 66f0f007..db381d38 100644 --- a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs +++ b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs @@ -48,6 +48,8 @@ public class GeppettoRunTriggerZone : MonoBehaviour private GameObject blackQuad; private Material blackMat; + [SerializeField] private AudioClip lastSFX; + private void Start() { if (geppetto != null) @@ -99,6 +101,8 @@ private void OnTriggerEnter(Collider other) col.enabled = false; StartCoroutine(FadeWhileRunning()); + + SoundManager.Instance.PlaySFX(lastSFX); } private void Update() diff --git a/Assets/08_Timeline/Timeline_WhaleAttack.playable b/Assets/08_Timeline/Timeline_WhaleAttack.playable index 50d9e696..c4b059df 100644 --- a/Assets/08_Timeline/Timeline_WhaleAttack.playable +++ b/Assets/08_Timeline/Timeline_WhaleAttack.playable @@ -259,6 +259,99 @@ MonoBehaviour: - {fileID: -5093034910319972417} - {fileID: 1527162216503881011} - {fileID: 443422495961915861} +--- !u!114 &-1242708206412736045 +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: 7487203833369125730} + m_Duration: 10.25 + m_TimeScale: 1 + m_ParentTrack: {fileID: -1242708206412736045} + 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 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -277,6 +370,7 @@ MonoBehaviour: - {fileID: -3706586746334657321} - {fileID: 3718969083211372470} - {fileID: 3564304398118365733} + - {fileID: -1242708206412736045} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -677,3 +771,15 @@ 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 &7487203833369125730 +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/11_Audio/Source/BGM/WhaleAttack.wav b/Assets/11_Audio/Source/BGM/WhaleAttack.wav new file mode 100644 index 00000000..69a420c9 --- /dev/null +++ b/Assets/11_Audio/Source/BGM/WhaleAttack.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed716c7c4cab10fb9021286bbad2427a84ff6a4b67dfe759ed5268b3021dac84 +size 2152452 diff --git a/Assets/11_Audio/Source/BGM/WhaleAttack.wav.meta b/Assets/11_Audio/Source/BGM/WhaleAttack.wav.meta new file mode 100644 index 00000000..f9bb0df8 --- /dev/null +++ b/Assets/11_Audio/Source/BGM/WhaleAttack.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1c13c9828af26bf4ba48ae80a9569f08 +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: