From f7019377a7935d40cc7e53b5fcc6a47602d57311 Mon Sep 17 00:00:00 2001 From: Cristiano Piemontese Date: Sat, 24 Aug 2024 00:19:01 +0200 Subject: [PATCH] fix some music stuff --- Assets/_Scenes/AIWin.unity | 107 ++++++++++++++++++++++++++++++++ Assets/_Scenes/Game.unity | 2 +- Assets/_Scenes/PlayerWin.unity | 102 ++++++++++++++++++++++++++++++ Assets/_Scenes/Start Menu.unity | 102 ++++++++++++++++++++++++++++++ 4 files changed, 312 insertions(+), 1 deletion(-) diff --git a/Assets/_Scenes/AIWin.unity b/Assets/_Scenes/AIWin.unity index 4928590..527f042 100644 --- a/Assets/_Scenes/AIWin.unity +++ b/Assets/_Scenes/AIWin.unity @@ -131,6 +131,7 @@ GameObject: - component: {fileID: 14724808} - component: {fileID: 14724807} - component: {fileID: 14724806} + - component: {fileID: 14724809} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -203,6 +204,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &14724809 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14724805} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3cb0a16784fa7864f97cb714ff3a6528, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 1 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 1 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &92338370 GameObject: m_ObjectHideFlags: 0 @@ -1027,6 +1124,16 @@ PrefabInstance: propertyPath: winningScore value: 10 objectReference: {fileID: 0} + - target: {fileID: 9175822297736086646, guid: 8c333de40ae158fdeb4abff8fdfac6cb, + type: 3} + propertyPath: gamePausedUI + value: + objectReference: {fileID: 14724805} + - target: {fileID: 9175822297736086646, guid: 8c333de40ae158fdeb4abff8fdfac6cb, + type: 3} + propertyPath: musicSource + value: + objectReference: {fileID: 14724809} - target: {fileID: 9175822297736086647, guid: 8c333de40ae158fdeb4abff8fdfac6cb, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/_Scenes/Game.unity b/Assets/_Scenes/Game.unity index 755c0e7..2b46680 100644 --- a/Assets/_Scenes/Game.unity +++ b/Assets/_Scenes/Game.unity @@ -1719,7 +1719,7 @@ PrefabInstance: - target: {fileID: 9175822297736086646, guid: 8c333de40ae158fdeb4abff8fdfac6cb, type: 3} propertyPath: winningScore - value: 10 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9175822297736086647, guid: 8c333de40ae158fdeb4abff8fdfac6cb, type: 3} diff --git a/Assets/_Scenes/PlayerWin.unity b/Assets/_Scenes/PlayerWin.unity index 6856e31..c00131b 100644 --- a/Assets/_Scenes/PlayerWin.unity +++ b/Assets/_Scenes/PlayerWin.unity @@ -162,6 +162,11 @@ PrefabInstance: propertyPath: musicToggle value: objectReference: {fileID: 1390860142} + - target: {fileID: 9175822297736086646, guid: 8c333de40ae158fdeb4abff8fdfac6cb, + type: 3} + propertyPath: musicSource + value: + objectReference: {fileID: 408751532} - target: {fileID: 9175822297736086647, guid: 8c333de40ae158fdeb4abff8fdfac6cb, type: 3} propertyPath: m_LocalPosition.x @@ -242,6 +247,7 @@ GameObject: - component: {fileID: 408751531} - component: {fileID: 408751530} - component: {fileID: 408751529} + - component: {fileID: 408751532} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -314,6 +320,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &408751532 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408751528} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3cb0a16784fa7864f97cb714ff3a6528, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 1 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 1 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &589308309 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Scenes/Start Menu.unity b/Assets/_Scenes/Start Menu.unity index a0743cf..a215ce5 100644 --- a/Assets/_Scenes/Start Menu.unity +++ b/Assets/_Scenes/Start Menu.unity @@ -625,6 +625,7 @@ GameObject: - component: {fileID: 394972523} - component: {fileID: 394972522} - component: {fileID: 394972521} + - component: {fileID: 394972524} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -697,6 +698,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &394972524 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394972520} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3cb0a16784fa7864f97cb714ff3a6528, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 1 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &410614415 GameObject: m_ObjectHideFlags: 0 @@ -1459,6 +1556,11 @@ PrefabInstance: propertyPath: musicToggle value: objectReference: {fileID: 615780449} + - target: {fileID: 9175822297736086646, guid: 8c333de40ae158fdeb4abff8fdfac6cb, + type: 3} + propertyPath: musicSource + value: + objectReference: {fileID: 394972524} - target: {fileID: 9175822297736086647, guid: 8c333de40ae158fdeb4abff8fdfac6cb, type: 3} propertyPath: m_LocalPosition.x