diff --git a/Assets/Audio/Ogg/GM19_Fanfaari.ogg b/Assets/Audio/Ogg/GM19_Fanfaari.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fa47633dfb2567caffc8720b58daf7d15a5cc3b7 Binary files /dev/null and b/Assets/Audio/Ogg/GM19_Fanfaari.ogg differ diff --git a/Assets/Audio/Ogg/GM19_Fanfaari.ogg.meta b/Assets/Audio/Ogg/GM19_Fanfaari.ogg.meta new file mode 100644 index 0000000000000000000000000000000000000000..c4c1ae27b8b9bc7ad554db712ebf30c8a2721f23 --- /dev/null +++ b/Assets/Audio/Ogg/GM19_Fanfaari.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 92c943f07ca06a24eaefb388684f1393 +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/Ogg/GM19_Upgrade.ogg b/Assets/Audio/Ogg/GM19_Upgrade.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7b525c905199326c20264cfadfac8091f23c750d Binary files /dev/null and b/Assets/Audio/Ogg/GM19_Upgrade.ogg differ diff --git a/Assets/Audio/Ogg/GM19_Upgrade.ogg.meta b/Assets/Audio/Ogg/GM19_Upgrade.ogg.meta new file mode 100644 index 0000000000000000000000000000000000000000..a7d3451cc2709b0e7623ec70c685129c6f65b794 --- /dev/null +++ b/Assets/Audio/Ogg/GM19_Upgrade.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 45e52c1f15bed25449d1ddf3e788c063 +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/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 09ade890073beeabc2779ec63d68523dae291e00..055c24e5dfc849de9a88ee10f9904d9aa8709668 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -303,7 +303,7 @@ PrefabInstance: type: 3} propertyPath: musics.Array.data[0] value: - objectReference: {fileID: 0} + objectReference: {fileID: 8300000, guid: 92c943f07ca06a24eaefb388684f1393, type: 3} - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.data[1] @@ -323,7 +323,7 @@ PrefabInstance: type: 3} propertyPath: musics.Array.data[4] value: - objectReference: {fileID: 0} + objectReference: {fileID: 8300000, guid: 45e52c1f15bed25449d1ddf3e788c063, type: 3} - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.data[5] diff --git a/Assets/Scripts/AudioSystem.cs b/Assets/Scripts/AudioSystem.cs index 1457b79780e11e30a8482cbbc1007c68d1dfd042..8d431c78ab9b73454a122f3ed590df666adc391b 100644 --- a/Assets/Scripts/AudioSystem.cs +++ b/Assets/Scripts/AudioSystem.cs @@ -60,11 +60,11 @@ public class AudioSystem : MonoBehaviour, IAction } if (type == EventType.UpgradeBuilt) { - + UpgradeClip(); } if (type == EventType.TimePeriodChanged) { - + FanfareClip(); } } @@ -106,6 +106,14 @@ public class AudioSystem : MonoBehaviour, IAction { StartCoroutine("PlayEffect", 9); } + public void UpgradeClip() + { + StartCoroutine("PlayEffect", 4); + } + public void FanfareClip() + { + StartCoroutine("FadeOutIn", new Timing(0, 0)); + } IEnumerator FadeOutIn(Timing t) { //yield return FadeOut(t.duration);