diff --git a/Assets/Scenes/Levels/AppleHillsOverworld.unity b/Assets/Scenes/Levels/AppleHillsOverworld.unity index c60aae0a..eb3e8a51 100644 --- a/Assets/Scenes/Levels/AppleHillsOverworld.unity +++ b/Assets/Scenes/Levels/AppleHillsOverworld.unity @@ -624,6 +624,152 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 22.76, y: 5.53} m_EdgeRadius: 0 +--- !u!1 &228350454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 228350457} + - component: {fileID: 228350456} + - component: {fileID: 228350455} + m_Layer: 0 + m_Name: OverworldAmbience + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &228350455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228350454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 2 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 +--- !u!82 &228350456 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228350454} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: bb67ff08b534f514e9f2e58a25caf3b4, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + 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: 0 + 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!4 &228350457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228350454} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.87961, y: 18.79944, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &232338985 GameObject: m_ObjectHideFlags: 0 @@ -6289,3 +6435,4 @@ SceneRoots: - {fileID: 77638903} - {fileID: 1460027141} - {fileID: 688311978817356604} + - {fileID: 228350457} diff --git a/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs b/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs index c6fe9c08..ec648550 100644 --- a/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs +++ b/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs @@ -57,7 +57,7 @@ namespace UI.CardSystem.StateMachine.States card.SetDraggingEnabled(false); } Logging.Debug($"[CardPlacedInSlotState] Card '{_context.CardData?.Name}' directly placed in slot"); - AudioManager.Instance.LoadAndPlayUIAudio("card_albumdrop_deep", false); + AudioManager.Instance.LoadAndPlayUIAudio("card_albumdrop", false); } } diff --git a/Assets/Sound/General/quiet-town-ambience-31063.mp3 b/Assets/Sound/General/quiet-town-ambience-31063.mp3 new file mode 100644 index 00000000..30be47f1 Binary files /dev/null and b/Assets/Sound/General/quiet-town-ambience-31063.mp3 differ diff --git a/Assets/Sound/General/quiet-town-ambience-31063.mp3.meta b/Assets/Sound/General/quiet-town-ambience-31063.mp3.meta new file mode 100644 index 00000000..4b309bfe --- /dev/null +++ b/Assets/Sound/General/quiet-town-ambience-31063.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bb67ff08b534f514e9f2e58a25caf3b4 +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: