diff --git a/Assets/Audio/Ogg/Ultimate.ogg b/Assets/Audio/Ogg/Ultimate.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8a725addf809b4dab5bc86265de8ee45e04ad3d5 Binary files /dev/null and b/Assets/Audio/Ogg/Ultimate.ogg differ diff --git a/Assets/Audio/Ogg/Ultimate.ogg.meta b/Assets/Audio/Ogg/Ultimate.ogg.meta new file mode 100644 index 0000000000000000000000000000000000000000..c272ebb23c8fa406374dc44ecf9c836a79b5384a --- /dev/null +++ b/Assets/Audio/Ogg/Ultimate.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 515d97e3fc007c24ba400579e4b7e91d +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 28552499b85aff1667b14af868a8c2edd73bc567..f555bb3fcc11fd231788b2a8d3f8cbdf6b3f7a97 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -321,6 +321,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2d496a86a17b9d0489876dbf81a4e9bc, type: 3} m_Name: m_EditorClassIdentifier: + endGame: {fileID: 0} --- !u!212 &427384616 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1076,7 +1077,7 @@ PrefabInstance: - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.size - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} @@ -1133,6 +1134,11 @@ PrefabInstance: propertyPath: musics.Array.data[10] value: objectReference: {fileID: 8300000, guid: 584a9744e24de204abc89d99211a232b, type: 3} + - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, + type: 3} + propertyPath: musics.Array.data[11] + value: + objectReference: {fileID: 8300000, guid: 515d97e3fc007c24ba400579e4b7e91d, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 530bea3a047bd31458b647c456257c63, type: 3} --- !u!1 &1968252522 diff --git a/Assets/Scripts/AudioSystem.cs b/Assets/Scripts/AudioSystem.cs index d2bcf2adc10d1caa1a116907b683d0c5ecd9bd2c..b4669237a78a74d494851603cfefd1184104f6ad 100644 --- a/Assets/Scripts/AudioSystem.cs +++ b/Assets/Scripts/AudioSystem.cs @@ -28,7 +28,7 @@ public class AudioSystem : MonoBehaviour, IAction public void React(EventType type) { if (type == EventType.GameStarts) { - StartCoroutine("GameStartsClip"); + GameStartsClip(); } if (type == EventType.CitySmall) { @@ -70,32 +70,34 @@ public class AudioSystem : MonoBehaviour, IAction { WinClip(); } + if (type == EventType.Ultimate) + { + UltimateClip(); + } } - public IEnumerator GameStartsClip() + public void GameStartsClip() { StartCoroutine("PlayEffect", 6); - yield return new WaitForSeconds(2); - ac.clip = musics[1]; - StartCoroutine("FadeIn", 0); + StartCoroutine("FadeOutIn", new Timing(1, 1)); } public void CitySmallClip() { - StartCoroutine("FadeOutIn", new Timing(3, 1)); + StartCoroutine("FadeOutIn", new Timing(2, 1)); } public void CityBigClip() { - StartCoroutine("FadeOutIn", new Timing(3, 2)); + StartCoroutine("FadeOutIn", new Timing(1, 2)); } public void HuntingSmallClip() { - StartCoroutine("FadeOutIn", new Timing(2, 4)); + StartCoroutine("FadeOutIn", new Timing(1, 3)); } public void HuntingBigClip() { - StartCoroutine("FadeOutIn", new Timing(2, 5)); + StartCoroutine("FadeOutIn", new Timing(1, 5)); } public void WoodClip() { @@ -121,6 +123,11 @@ public class AudioSystem : MonoBehaviour, IAction { StartCoroutine("FadeOutIn", new Timing(1, 10)); } + public void UltimateClip() + { + StartCoroutine("FadeOutIn", new Timing(1, 11)); + + } IEnumerator FadeOutIn(Timing t) { //yield return FadeOut(t.duration); yield return StartCoroutine("FadeOut", t.duration); diff --git a/Assets/Scripts/EventSystem/EventType.cs b/Assets/Scripts/EventSystem/EventType.cs index 783e6ff55fe4d14f3ed020e9a4cc206103c4b3d7..a5c33b1ce87315a3ffd2e52fbc40942be0a9c833 100644 --- a/Assets/Scripts/EventSystem/EventType.cs +++ b/Assets/Scripts/EventSystem/EventType.cs @@ -12,6 +12,7 @@ public enum EventType HuntingSmall, HuntingBig, WinMusic, + MenuMusic, Ultimate, //effects WoodChopped,