diff --git a/Assets/Scenes/SecondTry.unity b/Assets/Scenes/SecondTry.unity index aa8c163..72aff4d 100644 --- a/Assets/Scenes/SecondTry.unity +++ b/Assets/Scenes/SecondTry.unity @@ -14825,7 +14825,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &666077052 Transform: m_ObjectHideFlags: 0 @@ -21273,7 +21273,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &915646717 Transform: m_ObjectHideFlags: 0 @@ -22007,6 +22007,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicTurnAroundPlusJeremyLives + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 _clickSound: {fileID: 416576483} _outlineFx: {fileID: 1012237403} isActive: 1 diff --git a/Assets/Scripts/MusicManager.cs b/Assets/Scripts/MusicManager.cs index d494d17..d3fc314 100644 --- a/Assets/Scripts/MusicManager.cs +++ b/Assets/Scripts/MusicManager.cs @@ -120,31 +120,34 @@ public class MusicManager : MonoBehaviour } - if (currentTrack is Track.TurnAround or Track.TurnAroundPlusJeremyLives) + if (currentTrack == Track.TurnAround) { if (!_TurnAroundSource.isPlaying) _TurnAroundSource.Play(); - if(!_AdditiveJeremyLivesSource.isPlaying) - _AdditiveJeremyLivesSource.Play(); + _TurnAroundSource.volume = Mathf.Clamp(_TurnAroundSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1); } else { + _TurnAroundSource.volume = Mathf.Clamp(_TurnAroundSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1); if (_TurnAroundSource.volume == 0 && _TurnAroundSource.isPlaying) _TurnAroundSource.Stop(); + } + + if(currentTrack == Track.TurnAroundPlusJeremyLives) + { + if (!_AdditiveJeremyLivesSource.isPlaying) + _AdditiveJeremyLivesSource.Play(); + _AdditiveJeremyLivesSource.volume = Mathf.Clamp(_AdditiveJeremyLivesSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1); + } + else + { + _AdditiveJeremyLivesSource.volume = Mathf.Clamp(_AdditiveJeremyLivesSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1); if (_AdditiveJeremyLivesSource.volume == 0 && _AdditiveJeremyLivesSource.isPlaying) _AdditiveJeremyLivesSource.Stop(); } - _TurnAroundSource.volume = currentTrack == Track.TurnAround || currentTrack == Track.TurnAroundPlusJeremyLives ? - Mathf.Clamp(_TurnAroundSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1) : - Mathf.Clamp(_TurnAroundSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1); - - _AdditiveJeremyLivesSource.volume = currentTrack == Track.TurnAroundPlusJeremyLives ? - Mathf.Clamp(_AdditiveJeremyLivesSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1) : - Mathf.Clamp(_AdditiveJeremyLivesSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1); - if(currentTrack == Track.FinaleBuildUp) { diff --git a/Assets/Timelines/22-DoggyOPDetailTimeline.playable b/Assets/Timelines/22-DoggyOPDetailTimeline.playable index a865618..4ba5024 100644 --- a/Assets/Timelines/22-DoggyOPDetailTimeline.playable +++ b/Assets/Timelines/22-DoggyOPDetailTimeline.playable @@ -405,8 +405,7 @@ MonoBehaviour: m_Children: [] m_Clips: [] m_Markers: - m_Objects: - - {fileID: 4680375421581920961} + m_Objects: [] --- !u!114 &3788056184702097699 MonoBehaviour: m_ObjectHideFlags: 1 @@ -511,22 +510,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: ---- !u!114 &4680375421581920961 -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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} - m_Name: Signal Emitter - m_EditorClassIdentifier: - m_Time: 3.066666666666667 - m_Retroactive: 0 - m_EmitOnce: 0 - m_Asset: {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &6245622514681690319 MonoBehaviour: m_ObjectHideFlags: 1