From 49a4292ce1ca9cf62a8cbd4f753be964a0bef41e Mon Sep 17 00:00:00 2001
From: Maria Khelli <13520115@std.stei.itb.ac.id>
Date: Wed, 12 Apr 2023 22:23:51 +0700
Subject: [PATCH] feat: add audio for fox and lich pet
---
Assets/Audio/Effects/Fox Death.mp3 | 3 +
Assets/Audio/Effects/Fox Death.mp3.meta | 22 +++++
Assets/Audio/Effects/Fox Hurt.mp3 | 3 +
Assets/Audio/Effects/Fox Hurt.mp3.meta | 22 +++++
Assets/Audio/Effects/Lich Death.mp3 | 3 +
Assets/Audio/Effects/Lich Death.mp3.meta | 22 +++++
Assets/Audio/Effects/Lich Hurt.mp3 | 3 +
Assets/Audio/Effects/Lich Hurt.mp3.meta | 22 +++++
.../Models/Pet/_Prefab_Modified/PetFox.prefab | 99 ++++++++++++++++++-
.../Pet/_Prefab_Modified/PetLich.prefab | 98 ++++++++++++++++++
Assets/Scenes/TestPetFox.unity | 4 +
11 files changed, 300 insertions(+), 1 deletion(-)
create mode 100644 Assets/Audio/Effects/Fox Death.mp3
create mode 100644 Assets/Audio/Effects/Fox Death.mp3.meta
create mode 100644 Assets/Audio/Effects/Fox Hurt.mp3
create mode 100644 Assets/Audio/Effects/Fox Hurt.mp3.meta
create mode 100644 Assets/Audio/Effects/Lich Death.mp3
create mode 100644 Assets/Audio/Effects/Lich Death.mp3.meta
create mode 100644 Assets/Audio/Effects/Lich Hurt.mp3
create mode 100644 Assets/Audio/Effects/Lich Hurt.mp3.meta
diff --git a/Assets/Audio/Effects/Fox Death.mp3 b/Assets/Audio/Effects/Fox Death.mp3
new file mode 100644
index 0000000..0e3de4d
--- /dev/null
+++ b/Assets/Audio/Effects/Fox Death.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6160ec7f75125bf589ac1f05c97a532a9e32bb715ee99bcc220c9c34b9aa2d3e
+size 96480
diff --git a/Assets/Audio/Effects/Fox Death.mp3.meta b/Assets/Audio/Effects/Fox Death.mp3.meta
new file mode 100644
index 0000000..fcdef44
--- /dev/null
+++ b/Assets/Audio/Effects/Fox Death.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 15795005290055148a4f871d6743ebed
+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/Fox Hurt.mp3 b/Assets/Audio/Effects/Fox Hurt.mp3
new file mode 100644
index 0000000..0971c62
--- /dev/null
+++ b/Assets/Audio/Effects/Fox Hurt.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:937dfcff91c6d0cfb20be69d0e36de43620378f76de461741b91c75cef739321
+size 23520
diff --git a/Assets/Audio/Effects/Fox Hurt.mp3.meta b/Assets/Audio/Effects/Fox Hurt.mp3.meta
new file mode 100644
index 0000000..3676103
--- /dev/null
+++ b/Assets/Audio/Effects/Fox Hurt.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e9057cb489cd8664392bb40886888078
+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/Lich Death.mp3 b/Assets/Audio/Effects/Lich Death.mp3
new file mode 100644
index 0000000..0179e2a
--- /dev/null
+++ b/Assets/Audio/Effects/Lich Death.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:656e873e8e2d392ab97a1612762168749a3d684d3254272231a443404c8cb17c
+size 113280
diff --git a/Assets/Audio/Effects/Lich Death.mp3.meta b/Assets/Audio/Effects/Lich Death.mp3.meta
new file mode 100644
index 0000000..1f35f4f
--- /dev/null
+++ b/Assets/Audio/Effects/Lich Death.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b56668ed1841d504cae8962fd1b5f0bc
+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/Lich Hurt.mp3 b/Assets/Audio/Effects/Lich Hurt.mp3
new file mode 100644
index 0000000..f2d5e2c
--- /dev/null
+++ b/Assets/Audio/Effects/Lich Hurt.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8a22f388790f382e99278115e0e8dea1d67f615227bc33d49ccfb3964afe5d7
+size 31200
diff --git a/Assets/Audio/Effects/Lich Hurt.mp3.meta b/Assets/Audio/Effects/Lich Hurt.mp3.meta
new file mode 100644
index 0000000..6da6ea1
--- /dev/null
+++ b/Assets/Audio/Effects/Lich Hurt.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d09d008aa5c85ca42ad24a1f9486360f
+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/Models/Pet/_Prefab_Modified/PetFox.prefab b/Assets/Models/Pet/_Prefab_Modified/PetFox.prefab
index e538b41..3a76286 100644
--- a/Assets/Models/Pet/_Prefab_Modified/PetFox.prefab
+++ b/Assets/Models/Pet/_Prefab_Modified/PetFox.prefab
@@ -142,6 +142,7 @@ GameObject:
- component: {fileID: 2520437607838110581}
- component: {fileID: 481786522}
- component: {fileID: 481786523}
+ - component: {fileID: 6942621437326236798}
m_Layer: 0
m_Name: PetFox
m_TagString: Pet
@@ -266,6 +267,7 @@ MonoBehaviour:
startingHealth: 100
currentHealth: 0
armor: 0
+ deathClip: {fileID: 8300000, guid: 15795005290055148a4f871d6743ebed, type: 3}
--- !u!114 &481786523
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -278,8 +280,103 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 73ca3aed066e73d4ba99b5be157d7ba6, type: 3}
m_Name:
m_EditorClassIdentifier:
- playerHealth: {fileID: 0}
healDelay: 10
+--- !u!82 &6942621437326236798
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1528693925922589003}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: e9057cb489cd8664392bb40886888078, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ 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!1 &1569683074598384135
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Models/Pet/_Prefab_Modified/PetLich.prefab b/Assets/Models/Pet/_Prefab_Modified/PetLich.prefab
index 74aac74..d318d2c 100644
--- a/Assets/Models/Pet/_Prefab_Modified/PetLich.prefab
+++ b/Assets/Models/Pet/_Prefab_Modified/PetLich.prefab
@@ -141,6 +141,7 @@ GameObject:
- component: {fileID: 6649821425492048567}
- component: {fileID: 9140073484006322690}
- component: {fileID: 5237900790845583655}
+ - component: {fileID: 1710546516545906498}
m_Layer: 0
m_Name: PetLich
m_TagString: Pet
@@ -253,6 +254,7 @@ MonoBehaviour:
startingHealth: 100
currentHealth: 0
armor: 0
+ deathClip: {fileID: 8300000, guid: b56668ed1841d504cae8962fd1b5f0bc, type: 3}
--- !u!114 &9140073484006322690
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -277,6 +279,102 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 053db511ffac0464d8aeecd15ba793ac, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!82 &1710546516545906498
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 840075838095135235}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: d09d008aa5c85ca42ad24a1f9486360f, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ 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!1 &840114451401376633
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/TestPetFox.unity b/Assets/Scenes/TestPetFox.unity
index 989f366..3a4029a 100644
--- a/Assets/Scenes/TestPetFox.unity
+++ b/Assets/Scenes/TestPetFox.unity
@@ -6892,6 +6892,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6942621437326236798, guid: dd6262d61cba88e49b545d405f8fad99, type: 3}
+ propertyPath: m_PlayOnAwake
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dd6262d61cba88e49b545d405f8fad99, type: 3}
--- !u!1001 &1873354560
--
GitLab