From 5e1abdaf2be70db22f2ea2f4ce4306695c9b73a7 Mon Sep 17 00:00:00 2001
From: Alifia Rahmah <alifiarahmah03@gmail.com>
Date: Thu, 13 Apr 2023 10:34:04 +0700
Subject: [PATCH] feat(pet): add custom sfx to pet
---
Assets/Audio/Effects/Pet Bird Death.wav | 3 +++
Assets/Audio/Effects/Pet Bird Death.wav.meta | 22 +++++++++++++++++++
Assets/Audio/Effects/Pet Bird Hurt.wav | 3 +++
Assets/Audio/Effects/Pet Bird Hurt.wav.meta | 22 +++++++++++++++++++
Assets/Audio/Effects/Pet Bird Spawn.mp3 | 3 +++
Assets/Audio/Effects/Pet Bird Spawn.mp3.meta | 22 +++++++++++++++++++
Assets/Audio/Effects/Pet Cultist Hurt.wav | 3 +++
.../Audio/Effects/Pet Cultist Hurt.wav.meta | 22 +++++++++++++++++++
.../Audio/Effects/Pet Cultist Spawn Death.wav | 3 +++
.../Effects/Pet Cultist Spawn Death.wav.meta | 22 +++++++++++++++++++
Assets/Audio/Effects/Pet Rabbit Death.wav | 3 +++
.../Audio/Effects/Pet Rabbit Death.wav.meta | 22 +++++++++++++++++++
Assets/Audio/Effects/Pet Rabbit Hurt.wav | 3 +++
Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta | 22 +++++++++++++++++++
Assets/Audio/Effects/Pet Rabbit Spawn.wav | 3 +++
.../Audio/Effects/Pet Rabbit Spawn.wav.meta | 22 +++++++++++++++++++
Assets/Prefabs/PetCultist.prefab | 7 +++---
Assets/Prefabs/PetRabbit.prefab | 7 +++---
Assets/Prefabs/PetSparrow.prefab | 7 ++++--
Assets/Scripts/Pet/PetHealth.cs | 13 ++++++++++-
20 files changed, 225 insertions(+), 9 deletions(-)
create mode 100644 Assets/Audio/Effects/Pet Bird Death.wav
create mode 100644 Assets/Audio/Effects/Pet Bird Death.wav.meta
create mode 100644 Assets/Audio/Effects/Pet Bird Hurt.wav
create mode 100644 Assets/Audio/Effects/Pet Bird Hurt.wav.meta
create mode 100644 Assets/Audio/Effects/Pet Bird Spawn.mp3
create mode 100644 Assets/Audio/Effects/Pet Bird Spawn.mp3.meta
create mode 100644 Assets/Audio/Effects/Pet Cultist Hurt.wav
create mode 100644 Assets/Audio/Effects/Pet Cultist Hurt.wav.meta
create mode 100644 Assets/Audio/Effects/Pet Cultist Spawn Death.wav
create mode 100644 Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta
create mode 100644 Assets/Audio/Effects/Pet Rabbit Death.wav
create mode 100644 Assets/Audio/Effects/Pet Rabbit Death.wav.meta
create mode 100644 Assets/Audio/Effects/Pet Rabbit Hurt.wav
create mode 100644 Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta
create mode 100644 Assets/Audio/Effects/Pet Rabbit Spawn.wav
create mode 100644 Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta
diff --git a/Assets/Audio/Effects/Pet Bird Death.wav b/Assets/Audio/Effects/Pet Bird Death.wav
new file mode 100644
index 00000000..ac2458d9
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Bird Death.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb0388ec477673a6e29b23f9f4bdce5051850032270542f31427ec23191ece62
+size 214000
diff --git a/Assets/Audio/Effects/Pet Bird Death.wav.meta b/Assets/Audio/Effects/Pet Bird Death.wav.meta
new file mode 100644
index 00000000..18dffae5
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Bird Death.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 60cc90360f82f7449ba5c170e9e5b24a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Bird Hurt.wav b/Assets/Audio/Effects/Pet Bird Hurt.wav
new file mode 100644
index 00000000..2bc6fe6e
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Bird Hurt.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d8914e16563e1b12e095da31e1922cb8cffe667941d05ee668b650063106583
+size 63984
diff --git a/Assets/Audio/Effects/Pet Bird Hurt.wav.meta b/Assets/Audio/Effects/Pet Bird Hurt.wav.meta
new file mode 100644
index 00000000..1ff03034
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Bird Hurt.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 029cdcf307c84e544abc3f3ef027536b
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Bird Spawn.mp3 b/Assets/Audio/Effects/Pet Bird Spawn.mp3
new file mode 100644
index 00000000..b96a9d62
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Bird Spawn.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:410ea3cb8ca7178b8265a86018112409b664b98f0ed3b86993aeff4e84800614
+size 18389
diff --git a/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta b/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta
new file mode 100644
index 00000000..6506b2cd
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 7cc82443bebe5eb4098ee825e607ee1a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Cultist Hurt.wav b/Assets/Audio/Effects/Pet Cultist Hurt.wav
new file mode 100644
index 00000000..bc3ca65c
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Cultist Hurt.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:200c71bb20fecb05f4cc31ef4e55e8fa5a949087b2a90e11d51ab37e5bdac6e5
+size 45446
diff --git a/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta b/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta
new file mode 100644
index 00000000..3b8c0b8a
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 09176acc9bf91d6439bc3245068619f3
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Cultist Spawn Death.wav b/Assets/Audio/Effects/Pet Cultist Spawn Death.wav
new file mode 100644
index 00000000..2c1a100d
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Cultist Spawn Death.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:958ff3d7496997cf7fa2831b57d0b562ff5f9bc6d64f8e0cd3df4e932fcbdaaa
+size 305760
diff --git a/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta b/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta
new file mode 100644
index 00000000..e10ccb56
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a84dffcbace45f64993ed5f8ec4dba37
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Rabbit Death.wav b/Assets/Audio/Effects/Pet Rabbit Death.wav
new file mode 100644
index 00000000..765e14a4
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Rabbit Death.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28ef8babe04c0f70674e31a57c43d5a2b75ed5ac4a0a856a60d95ce55ecd7009
+size 174522
diff --git a/Assets/Audio/Effects/Pet Rabbit Death.wav.meta b/Assets/Audio/Effects/Pet Rabbit Death.wav.meta
new file mode 100644
index 00000000..26428173
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Rabbit Death.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6985f863f1e10a947bf0225e49345c76
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Rabbit Hurt.wav b/Assets/Audio/Effects/Pet Rabbit Hurt.wav
new file mode 100644
index 00000000..591be4ee
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Rabbit Hurt.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c1054f0967aa88350dc662084cd3c8a569342473cb73f7f407a28a268866a60
+size 19342
diff --git a/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta b/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta
new file mode 100644
index 00000000..20cdf5dc
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: ebcff791de344034fbb8e7b398134da5
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Pet Rabbit Spawn.wav b/Assets/Audio/Effects/Pet Rabbit Spawn.wav
new file mode 100644
index 00000000..5083e18d
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Rabbit Spawn.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e027d34aa57de56c4c31126e226c22bac55256fd059bf7d995174de7397b2af
+size 26902
diff --git a/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta b/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta
new file mode 100644
index 00000000..6e77148f
--- /dev/null
+++ b/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a468574e748250643b5839fec12fe08d
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/PetCultist.prefab b/Assets/Prefabs/PetCultist.prefab
index 444b7495..7f65c8c7 100644
--- a/Assets/Prefabs/PetCultist.prefab
+++ b/Assets/Prefabs/PetCultist.prefab
@@ -5420,7 +5420,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8732158265285773930}
- m_LocalRotation: {x: 0.00014905189, y: -0.4009146, z: 0.00025061128, w: 0.9161154}
+ m_LocalRotation: {x: 0.00014941301, y: -0.40091667, z: 0.00024638313, w: 0.9161145}
m_LocalPosition: {x: 1.77045, y: -0.29986167, z: 0.54601175}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
@@ -5514,7 +5514,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: fce027b40770a44298a6f5a4233bfb04, type: 3}
+ m_audioClip: {fileID: 8300000, guid: 09176acc9bf91d6439bc3245068619f3, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
@@ -5615,7 +5615,8 @@ MonoBehaviour:
startingHealth: 100
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: 8c615fd0429f34edf85539d70279360d, type: 3}
+ spawnClip: {fileID: 8300000, guid: a84dffcbace45f64993ed5f8ec4dba37, type: 3}
+ deathClip: {fileID: 8300000, guid: a84dffcbace45f64993ed5f8ec4dba37, type: 3}
--- !u!114 &8732158265285773929
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/PetRabbit.prefab b/Assets/Prefabs/PetRabbit.prefab
index de36c4dc..dd9226ec 100644
--- a/Assets/Prefabs/PetRabbit.prefab
+++ b/Assets/Prefabs/PetRabbit.prefab
@@ -279,7 +279,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8517487645339449119}
- m_LocalRotation: {x: -0, y: 0.30673566, z: -0, w: 0.95179474}
+ m_LocalRotation: {x: 0, y: 0.3067337, z: 0, w: 0.95179546}
m_LocalPosition: {x: 2.590321, y: 0, z: -0.63239884}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -377,7 +377,8 @@ MonoBehaviour:
startingHealth: 100
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: 1d3bfb9269f136947bf8ac164cace1ff, type: 3}
+ spawnClip: {fileID: 8300000, guid: a468574e748250643b5839fec12fe08d, type: 3}
+ deathClip: {fileID: 8300000, guid: 6985f863f1e10a947bf0225e49345c76, type: 3}
--- !u!82 &8595269273856966073
AudioSource:
m_ObjectHideFlags: 0
@@ -388,7 +389,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: 02e6208ec76314158a9f548f51fe9f11, type: 3}
+ m_audioClip: {fileID: 8300000, guid: ebcff791de344034fbb8e7b398134da5, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
diff --git a/Assets/Prefabs/PetSparrow.prefab b/Assets/Prefabs/PetSparrow.prefab
index 5421ee75..3b4c6a1f 100644
--- a/Assets/Prefabs/PetSparrow.prefab
+++ b/Assets/Prefabs/PetSparrow.prefab
@@ -5177,7 +5177,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: 1d4840678e677424b8921716c72397ea, type: 3}
+ m_audioClip: {fileID: 8300000, guid: 029cdcf307c84e544abc3f3ef027536b, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
@@ -5321,7 +5321,8 @@ MonoBehaviour:
startingHealth: 100
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: 62366b8d2c37a49dca550841c741317f, type: 3}
+ spawnClip: {fileID: 8300000, guid: 7cc82443bebe5eb4098ee825e607ee1a, type: 3}
+ deathClip: {fileID: 8300000, guid: 60cc90360f82f7449ba5c170e9e5b24a, type: 3}
--- !u!114 &8956976848956587111
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5336,6 +5337,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 0}
rotationSpeed: 10
+ maxDistance: 2
+ radius: 10
--- !u!114 &-27303636289950640
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Pet/PetHealth.cs b/Assets/Scripts/Pet/PetHealth.cs
index 6449f67d..99dd545a 100644
--- a/Assets/Scripts/Pet/PetHealth.cs
+++ b/Assets/Scripts/Pet/PetHealth.cs
@@ -6,7 +6,6 @@ public class PetHealth : MonoBehaviour
public int startingHealth = 100;
public int currentHealth;
public float sinkSpeed = 2.5f;
- public AudioClip deathClip;
Animator anim;
AudioSource petAudio;
@@ -15,6 +14,10 @@ public class PetHealth : MonoBehaviour
PetAttack petAttack;
PetBuff petBuff;
+ [Header("Sound Effects")]
+ public AudioClip spawnClip;
+ public AudioClip deathClip;
+
bool isDead;
bool isSinking;
@@ -26,7 +29,15 @@ public class PetHealth : MonoBehaviour
petHeal = GetComponent <PetHeal> ();
petAttack = GetComponent<PetAttack>();
petBuff = GetComponent<PetBuff>();
+ AudioClip hurtClip = petAudio.clip;
+
currentHealth = startingHealth;
+
+ // Play spawn audio
+ petAudio.clip = spawnClip;
+ petAudio.Play();
+ // Reset to hurt
+ petAudio.clip = hurtClip;
}
void Update()
--
GitLab