diff --git a/Assets/AddressableAssetsData/AssetGroups/UIAudio.asset b/Assets/AddressableAssetsData/AssetGroups/UIAudio.asset index 7c54ba9b..a088b208 100644 --- a/Assets/AddressableAssetsData/AssetGroups/UIAudio.asset +++ b/Assets/AddressableAssetsData/AssetGroups/UIAudio.asset @@ -90,6 +90,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 6f9e7ca8526d9244bb10f4882e325c10 + m_Address: card_albumdrop_deep + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 72ca46326838bfe43b55d95211f99673 m_Address: shimmering_loop m_ReadOnly: 0 @@ -100,6 +105,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: b4e6dffc2e91cea44a82334fa76f3706 + m_Address: card_albumdrop + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: b715285f6383cc84396f68bf7c7e4056 m_Address: Buildup3 m_ReadOnly: 0 diff --git a/Assets/Prefabs/UI/CardsSystem/Cards/NewCard.prefab b/Assets/Prefabs/UI/CardsSystem/Cards/NewCard.prefab index 9631d1ac..e76bf166 100644 --- a/Assets/Prefabs/UI/CardsSystem/Cards/NewCard.prefab +++ b/Assets/Prefabs/UI/CardsSystem/Cards/NewCard.prefab @@ -1023,7 +1023,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 270} + m_SizeDelta: {x: 200, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5882185627204126092 MonoBehaviour: @@ -1369,7 +1369,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7441149886460635393, guid: 6d6e64f153ccde149bede8e82351d3c4, type: 3} propertyPath: m_fontSize - value: 0.1 + value: 23 objectReference: {fileID: 0} - target: {fileID: 7619421269260494372, guid: 6d6e64f153ccde149bede8e82351d3c4, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs b/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs index 6d20387b..e1cb9b58 100644 --- a/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs +++ b/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs @@ -57,7 +57,8 @@ namespace UI.CardSystem.StateMachine.States // Enlarge using settings-controlled scale _context.Animator.PlayEnlarge(_settings.AlbumCardEnlargedScale, _settings.ScaleDuration); } - + // Play pick up card audio + AudioManager.Instance.LoadAndPlayUIAudio("card_albumdrop_deep", false); Logging.Debug($"[CardAlbumEnlargedState] Card enlarged from album: {_context.CardData?.Name}"); } diff --git a/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs b/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs index f3dd85d8..c6fe9c08 100644 --- a/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs +++ b/Assets/Scripts/CardSystem/StateMachine/States/CardPlacedInSlotState.cs @@ -30,6 +30,7 @@ namespace UI.CardSystem.StateMachine.States public override void OnEnterState() { + // Ensure card front is visible and facing camera if (_context.CardDisplay != null) { @@ -43,6 +44,8 @@ namespace UI.CardSystem.StateMachine.States // Animated placement - play tween to slot Logging.Debug($"[CardPlacedInSlotState] Animating card '{_context.CardData?.Name}' to slot"); AnimateToSlot(_targetSlotForAnimation); + // Play card drop in album sound + AudioManager.Instance.LoadAndPlayUIAudio("card_albumdrop", false); } else { @@ -54,6 +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); } } diff --git a/Assets/Scripts/CardSystem/UI/Pages/AlbumViewPage.cs b/Assets/Scripts/CardSystem/UI/Pages/AlbumViewPage.cs index 31e3a6f8..58668e8c 100644 --- a/Assets/Scripts/CardSystem/UI/Pages/AlbumViewPage.cs +++ b/Assets/Scripts/CardSystem/UI/Pages/AlbumViewPage.cs @@ -362,12 +362,16 @@ namespace UI.CardSystem // Entering album proper and no cards spawned yet - spawn them with animation Logging.Debug("[AlbumViewPage] Entering album proper - spawning pending cards with animation"); SpawnPendingCornerCards(); + // Play flip audio + AudioManager.Instance.LoadAndPlayUIAudio("random_paper_pickup", false); } else if (!isInAlbum && CornerCards.PendingCards.Count > 0) { // Returning to menu page - cleanup cards Logging.Debug("[AlbumViewPage] Returning to menu page - cleaning up pending cards"); CleanupPendingCornerCards(); + // Play flip audio + AudioManager.Instance.LoadAndPlayUIAudio("random_paper_putdown", false); } else { diff --git a/Assets/Sound/UI/569679__marokki__plop-effect.wav b/Assets/Sound/UI/569679__marokki__plop-effect.wav new file mode 100644 index 00000000..8d17e652 Binary files /dev/null and b/Assets/Sound/UI/569679__marokki__plop-effect.wav differ diff --git a/Assets/Sound/UI/569679__marokki__plop-effect.wav.meta b/Assets/Sound/UI/569679__marokki__plop-effect.wav.meta new file mode 100644 index 00000000..7e0b2f2b --- /dev/null +++ b/Assets/Sound/UI/569679__marokki__plop-effect.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9ab0fc24437016e41bdae865ac8acfa9 +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: diff --git a/Assets/Sound/UI/card_albumdrop.asset b/Assets/Sound/UI/card_albumdrop.asset new file mode 100644 index 00000000..8c053ef9 --- /dev/null +++ b/Assets/Sound/UI/card_albumdrop.asset @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1307931743 &6418180475301049370 +AudioRandomContainer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: card_albumdrop + m_Volume: 0 + m_Pitch: 0 + m_AutomaticTriggerTime: 0 + m_LoopCount: 1 + m_VolumeRandomizationRange: {x: 0, y: 0} + m_PitchRandomizationRange: {x: -285.93643, y: 261.8562} + m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0} + m_LoopCountRandomizationRange: {x: 0, y: 0} + m_Elements: + - {fileID: 8886531884490723528} + m_AvoidRepeatingLast: 0 + m_PlaybackMode: 2 + m_TriggerMode: 0 + m_AutomaticTriggerMode: 1 + m_LoopMode: 2 + m_VolumeRandomizationEnabled: 0 + m_PitchRandomizationEnabled: 1 + m_AutomaticTriggerTimeRandomizationEnabled: 0 + m_LoopCountRandomizationEnabled: 0 +--- !u!1233149941 &8886531884490723528 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 569679__marokki__plop-effect_{8886531884490723528} + m_AudioClip: {fileID: 8300000, guid: 9ab0fc24437016e41bdae865ac8acfa9, type: 3} + m_Volume: 0 + m_Enabled: 1 diff --git a/Assets/Sound/UI/card_albumdrop.asset.meta b/Assets/Sound/UI/card_albumdrop.asset.meta new file mode 100644 index 00000000..02675bd8 --- /dev/null +++ b/Assets/Sound/UI/card_albumdrop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4e6dffc2e91cea44a82334fa76f3706 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6418180475301049370 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/UI/card_albumdrop_deep.asset b/Assets/Sound/UI/card_albumdrop_deep.asset new file mode 100644 index 00000000..6e9e5651 --- /dev/null +++ b/Assets/Sound/UI/card_albumdrop_deep.asset @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1307931743 &6418180475301049370 +AudioRandomContainer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: card_albumdrop_deep + m_Volume: 0 + m_Pitch: -901 + m_AutomaticTriggerTime: 0 + m_LoopCount: 1 + m_VolumeRandomizationRange: {x: 0, y: 0} + m_PitchRandomizationRange: {x: -582.9265, y: 293.96317} + m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0} + m_LoopCountRandomizationRange: {x: 0, y: 0} + m_Elements: + - {fileID: 8886531884490723528} + m_AvoidRepeatingLast: 0 + m_PlaybackMode: 2 + m_TriggerMode: 0 + m_AutomaticTriggerMode: 1 + m_LoopMode: 2 + m_VolumeRandomizationEnabled: 0 + m_PitchRandomizationEnabled: 1 + m_AutomaticTriggerTimeRandomizationEnabled: 0 + m_LoopCountRandomizationEnabled: 0 +--- !u!1233149941 &8886531884490723528 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 569679__marokki__plop-effect_{8886531884490723528} + m_AudioClip: {fileID: 8300000, guid: 9ab0fc24437016e41bdae865ac8acfa9, type: 3} + m_Volume: 0 + m_Enabled: 1 diff --git a/Assets/Sound/UI/card_albumdrop_deep.asset.meta b/Assets/Sound/UI/card_albumdrop_deep.asset.meta new file mode 100644 index 00000000..2ba0818e --- /dev/null +++ b/Assets/Sound/UI/card_albumdrop_deep.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f9e7ca8526d9244bb10f4882e325c10 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6418180475301049370 + userData: + assetBundleName: + assetBundleVariant: