diff --git a/MrBigsock/Assets/Code/Character.cs b/MrBigsock/Assets/Code/Character.cs index c025a2a9b07bf4a455b1ad6986274b4b1f7be885..53472baac3f658f7ea4019df5e767f43b341c915 100644 --- a/MrBigsock/Assets/Code/Character.cs +++ b/MrBigsock/Assets/Code/Character.cs @@ -18,7 +18,7 @@ namespace BigSock { public float AttackSpeed => Stats.AttackSpeed; public float baseAttackSpeed = 1; - public AudioSource[] source; + private AudioSource[] source; public AudioClip TakeDamageAudio; /* @@ -130,7 +130,8 @@ namespace BigSock { ProjectileSpeed = 1, Accuracy = 1, }; - source = Camera.main.gameObject.GetComponents<AudioSource>(); + + source = Camera.main.gameObject.GetComponents<AudioSource>(); UpdateModifiers(); @@ -212,7 +213,6 @@ namespace BigSock { OnTakeDamage?.Invoke(this, attack.Actor, attack); if (TakeDamageAudio != null){ - source[0] = GetComponent<AudioSource>(); source[0].clip = TakeDamageAudio; source[0].Play(); } diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab index 769267092132d3c748446a6ba11b87c2c1e99810..5d86da904bf40c1508576ae41d25e3a72cbcf475 100644 --- a/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab +++ b/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab @@ -171,8 +171,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: baseAttackSpeed: 1 - source: - - {fileID: 0} TakeDamageAudio: {fileID: 8300000, guid: 0d78a0205a770454c86c53710a0b4ff1, type: 3} baseMovementSpeed: 1 baseDamage: 1 diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab index c787901de06ba61982cd18f24d21513ba1d2288f..b450ddb288f0b486bf413b312845e27496a8266c 100644 --- a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab +++ b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab @@ -144,8 +144,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: baseAttackSpeed: 1 - source: - - {fileID: 0} TakeDamageAudio: {fileID: 8300000, guid: 0d78a0205a770454c86c53710a0b4ff1, type: 3} baseMovementSpeed: 4 baseDamage: 1 diff --git a/MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3 b/MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..b34e9f7f5d34443fdcbcb52681804742fd6034a9 Binary files /dev/null and b/MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3 differ diff --git a/MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3.meta b/MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3.meta new file mode 100644 index 0000000000000000000000000000000000000000..04c9919dd297cbd0fb9be8d82d673ccae57c5cd8 --- /dev/null +++ b/MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ae3f4e0c57ec5dc4db5c797621c02302 +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: