diff --git a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset index 024f47db0..b69d99e97 100644 --- a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset +++ b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset @@ -29,6 +29,8 @@ MonoBehaviour: k__BackingField: {fileID: 8300000, guid: ad209d56abe14534ab002d8cc2bbeb6e, type: 3} - k__BackingField: JumpSlam k__BackingField: {fileID: 8300000, guid: 558fbfb24c5221245a28e2e788576ae2, type: 3} + - k__BackingField: JumpSlamDown + k__BackingField: {fileID: 8300000, guid: bba999e50f96520418edd9d14ad56ad6, type: 3} - k__BackingField: HammerSlam k__BackingField: {fileID: 8300000, guid: 1190226caf0381c498c12a1498316f76, type: 3} - k__BackingField: SkyFallSmash diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs b/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs index 561b222ae..59f77824b 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs @@ -189,6 +189,10 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills yield return null; } + if (_titanSlimeState.HasRabbit) + { + AudioManager.Instance.PlaySfx("JumpSlamDown"); + } HideIndicator(); SkillUser.transform.position = endPosition; var randomCooldown = Random.Range(_titanSlimeState.RandomCooldown.x, _titanSlimeState.RandomCooldown.y); diff --git a/Assets/04.Materials/TransparentLit.mat b/Assets/04.Materials/TransparentLit.mat index 61abb0745..f51d2fad7 100644 --- a/Assets/04.Materials/TransparentLit.mat +++ b/Assets/04.Materials/TransparentLit.mat @@ -38,7 +38,6 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly - - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump down.mp3 b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamDownSfx.mp3 similarity index 100% rename from Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump down.mp3 rename to Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamDownSfx.mp3 diff --git a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump down.mp3.meta b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamDownSfx.mp3.meta similarity index 91% rename from Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump down.mp3.meta rename to Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamDownSfx.mp3.meta index 602c8e0df..787257c3a 100644 --- a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump down.mp3.meta +++ b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamDownSfx.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2413f5edfa50a0146a97330c5bb84a23 +guid: bba999e50f96520418edd9d14ad56ad6 AudioImporter: externalObjects: {} serializedVersion: 8 diff --git a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamSfx.mp3 b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamSfx.mp3 index 48197eb94..8b9b0e9dd 100644 Binary files a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamSfx.mp3 and b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/JumpSlamSfx.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump.mp3 b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump.mp3 deleted file mode 100644 index 8b9b0e9dd..000000000 Binary files a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump.mp3 and /dev/null differ diff --git a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump.mp3.meta b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump.mp3.meta deleted file mode 100644 index 0433ab5a3..000000000 --- a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/TitanSlime/slime jump.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: ae500878178179641884679bda482017 -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: