diff --git a/Assets/_Project/Audio/buildings/general.meta b/Assets/_Project/Audio/buildings/general.meta new file mode 100644 index 0000000..f7994dd --- /dev/null +++ b/Assets/_Project/Audio/buildings/general.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09acbe3c28493f2e3be6d1f0f743ee30 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Audio/buildings/general/building_landed_boom.ogg b/Assets/_Project/Audio/buildings/general/building_landed_boom.ogg new file mode 100644 index 0000000..1459ebc --- /dev/null +++ b/Assets/_Project/Audio/buildings/general/building_landed_boom.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:637d457da0a901b61346844411bd8994e3e4f2951fdb5ac4fd8990817e578054 +size 60433 diff --git a/Assets/_Project/Audio/buildings/general/building_landed_boom.ogg.meta b/Assets/_Project/Audio/buildings/general/building_landed_boom.ogg.meta new file mode 100644 index 0000000..2022fd5 --- /dev/null +++ b/Assets/_Project/Audio/buildings/general/building_landed_boom.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4ee1b63f27ea04451802bafd35ecef89 +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/_Project/Prefabs/Towers/Tower_TeslaCoil.prefab b/Assets/_Project/Prefabs/Towers/Tower_TeslaCoil.prefab index 77b630e..640d249 100644 --- a/Assets/_Project/Prefabs/Towers/Tower_TeslaCoil.prefab +++ b/Assets/_Project/Prefabs/Towers/Tower_TeslaCoil.prefab @@ -269,9 +269,10 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::TD.Combat.TowerBuiltSound builtSound: clip: {fileID: 8300000, guid: 6ff2e0ba45ef5eb6abeb34bd2c6e2da8, type: 3} - volume: 0.496 + volume: 0.3 minPitch: 1 maxPitch: 1 + delaySeconds: 0.3 --- !u!114 &1829137298732744432 MonoBehaviour: m_ObjectHideFlags: 0 @@ -285,10 +286,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::TD.Combat.TowerLandedSound landedSound: - clip: {fileID: 0} - volume: 0 - minPitch: 0 - maxPitch: 0 + clip: {fileID: 8300000, guid: 4ee1b63f27ea04451802bafd35ecef89, type: 3} + volume: 0.663 + minPitch: 0.96 + maxPitch: 1.04 --- !u!114 &8125712573731754244 MonoBehaviour: m_ObjectHideFlags: 0 @@ -326,7 +327,7 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 impactVfxPrefab: {fileID: 6874992557687165507, guid: a9080df4046b863c8b07b3ad73d76bf4, type: 3} - impactVfxLifetime: 3 + impactVfxLifetime: 4 --- !u!1 &7101790219931971190 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Project/Scenes/Levels/9Player.unity b/Assets/_Project/Scenes/Levels/9Player.unity index bfb0d2a..14f1ebc 100644 --- a/Assets/_Project/Scenes/Levels/9Player.unity +++ b/Assets/_Project/Scenes/Levels/9Player.unity @@ -9116,124 +9116,6 @@ Transform: m_Children: [] m_Father: {fileID: 1097152085} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &599469378 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 599469379} - - component: {fileID: 599469381} - - component: {fileID: 599469380} - m_Layer: 0 - m_Name: Visual Effect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &599469379 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599469378} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1339671004} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!73398921 &599469380 -VFXRenderer: - serializedVersion: 1 - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599469378} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 ---- !u!2083052967 &599469381 -VisualEffect: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599469378} - m_Enabled: 1 - m_Asset: {fileID: 8926484042661614526, guid: 9be8cca0a26062700863614752c39b8b, type: 3} - m_InitialEventName: OnPlay - m_InitialEventNameOverriden: 0 - m_StartSeed: 0 - m_ResetSeedOnPlay: 1 - m_AllowInstancing: 1 - m_ResourceVersion: 1 - m_PropertySheet: - m_Float: - m_Array: [] - m_Vector2f: - m_Array: [] - m_Vector3f: - m_Array: [] - m_Vector4f: - m_Array: [] - m_Uint: - m_Array: [] - m_Int: - m_Array: [] - m_Matrix4x4f: - m_Array: [] - m_AnimationCurve: - m_Array: [] - m_Gradient: - m_Array: [] - m_NamedObject: - m_Array: [] - m_Bool: - m_Array: [] --- !u!43 &616621804 Mesh: m_ObjectHideFlags: 0 @@ -17774,38 +17656,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!1 &1339671003 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1339671004} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1339671004 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339671003} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.71021, y: -1.75, z: -0.9095} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 599469379} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1350863286 GameObject: m_ObjectHideFlags: 0 @@ -29064,4 +28914,3 @@ SceneRoots: - {fileID: 2139601601} - {fileID: 176580462} - {fileID: 516125087} - - {fileID: 1339671004} diff --git a/Assets/_Project/Scripts/Combat/TowerBuiltSound.cs b/Assets/_Project/Scripts/Combat/TowerBuiltSound.cs index 30f3376..e76a289 100644 --- a/Assets/_Project/Scripts/Combat/TowerBuiltSound.cs +++ b/Assets/_Project/Scripts/Combat/TowerBuiltSound.cs @@ -15,6 +15,7 @@ namespace TD.Combat public class TowerBuiltSound : MonoBehaviour { [SerializeField] private SoundConfig builtSound; + [SerializeField] private float delaySeconds = 0.3f; private TowerInstance towerInstance; @@ -34,6 +35,11 @@ namespace TD.Combat } private void HandleBuilt() + { + Invoke(nameof(PlayBuiltSound), delaySeconds); + } + + private void PlayBuiltSound() { AudioManager.Instance?.Play(builtSound.clip, AudioCategory.UI, builtSound.RandomPitch(), builtSound.volume); }