Merge branch 'death-sounds'

This commit is contained in:
Ian Woods 2026-06-30 23:13:13 -07:00
commit 2286de6fbc
26 changed files with 313 additions and 12 deletions

View file

@ -16,6 +16,7 @@ GameObject:
- component: {fileID: 3283904430289710888}
- component: {fileID: 3756613737869398948}
- component: {fileID: 6036713598566100742}
- component: {fileID: -1575784752119152190}
m_Layer: 10
m_Name: Enemy_CrystalGolem_Blue
m_TagString: Untagged
@ -202,6 +203,27 @@ CapsuleCollider:
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &-1575784752119152190
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1455822126534880203}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9df6fea9a86daafae998f8eecc44ee7d, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TD.Combat.EnemyDeathSound
deathSounds:
- clip: {fileID: 8300000, guid: e007e19b827137ce395021d825927dcc, type: 3}
volume: 0.75
minPitch: 0.95
maxPitch: 1.05
- clip: {fileID: 8300000, guid: 6cea30689732db2f0a8989fe8f1a07a9, type: 3}
volume: 0.75
minPitch: 0.95
maxPitch: 1.05
--- !u!1 &5361867751622119598
GameObject:
m_ObjectHideFlags: 0

View file

@ -16,6 +16,7 @@ GameObject:
- component: {fileID: 3283904430289710888}
- component: {fileID: 3756613737869398948}
- component: {fileID: 6036713598566100742}
- component: {fileID: -4695266156693656620}
m_Layer: 10
m_Name: Enemy_Cyclops_Green
m_TagString: Untagged
@ -202,6 +203,21 @@ CapsuleCollider:
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &-4695266156693656620
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1455822126534880203}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9df6fea9a86daafae998f8eecc44ee7d, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TD.Combat.EnemyDeathSound
deathClips:
- {fileID: 8300000, guid: e007e19b827137ce395021d825927dcc, type: 3}
- {fileID: 8300000, guid: 6cea30689732db2f0a8989fe8f1a07a9, type: 3}
--- !u!1 &5361867751622119598
GameObject:
m_ObjectHideFlags: 0

View file

@ -100,6 +100,7 @@ GameObject:
- component: {fileID: 8853488620519990682}
- component: {fileID: 4524938955752569428}
- component: {fileID: -2590971686077483651}
- component: {fileID: 1288485127287735786}
m_Layer: 0
m_Name: Tower_TeslaCoil
m_TagString: Untagged
@ -146,7 +147,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
GlobalObjectIdHash: 1363936954
GlobalObjectIdHash: 280718094
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 1
@ -219,10 +220,20 @@ MonoBehaviour:
emitter: {fileID: 1088221722203278382}
arcMaterial: {fileID: 2100000, guid: 9ba610475fb3d4c4fa1245e15a72aee5, type: 2}
arcColor: {r: 0.6, g: 0.85, b: 1, a: 1}
emissionIntensity: 4
arcWidth: 0.06
arcDuration: 0.12
segmentsPerArc: 6
arcHeight: 0.18
jitter: 0.2
castLight: 1
lightColor: {r: 0.6, g: 0.85, b: 1, a: 1}
lightIntensity: 8
lightRange: 12
castImpactLight: 1
impactLightIntensity: 4
impactLightRange: 5
maxImpactLights: 8
--- !u!114 &-2590971686077483651
MonoBehaviour:
m_ObjectHideFlags: 0
@ -235,9 +246,28 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: db643146344a08a639133638e4746a33, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TD.Combat.TeslaTowerFireSound
fireClip: {fileID: 8300000, guid: a0b5d0b15de667604b825f12d39b05a8, type: 3}
minPitch: 0.92
maxPitch: 1.07
fireSound:
clip: {fileID: 8300000, guid: a0b5d0b15de667604b825f12d39b05a8, type: 3}
volume: 0.263
minPitch: 0.95
maxPitch: 1.05
--- !u!114 &1288485127287735786
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6482414459531823157}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce512ec39eb6a8f079c7b258a4d0ced1, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TD.Combat.TowerBuiltSound
builtSound:
clip: {fileID: 8300000, guid: 6ff2e0ba45ef5eb6abeb34bd2c6e2da8, type: 3}
volume: 0.496
minPitch: 1
maxPitch: 1
--- !u!1 &7101790219931971190
GameObject:
m_ObjectHideFlags: 0