diff --git a/Assets/Audio/Ogg/Winmusic.ogg b/Assets/Audio/Ogg/Winmusic.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ae9951fcd250940d5ae74b8a32f3bea4d3e98d20 Binary files /dev/null and b/Assets/Audio/Ogg/Winmusic.ogg differ diff --git a/Assets/Audio/Ogg/Winmusic.ogg.meta b/Assets/Audio/Ogg/Winmusic.ogg.meta new file mode 100644 index 0000000000000000000000000000000000000000..f4faa4ff2e9f5c0a5445314edbf52559e723719b --- /dev/null +++ b/Assets/Audio/Ogg/Winmusic.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 584a9744e24de204abc89d99211a232b +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 7d5c3724086838691f018be11c3e561c4237f0d2..28552499b85aff1667b14af868a8c2edd73bc567 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1076,7 +1076,7 @@ PrefabInstance: - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.size - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} @@ -1128,6 +1128,11 @@ PrefabInstance: propertyPath: musics.Array.data[5] value: objectReference: {fileID: 8300000, guid: a5c5c1c02f056e04ca16e3277134468a, type: 3} + - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, + type: 3} + propertyPath: musics.Array.data[10] + value: + objectReference: {fileID: 8300000, guid: 584a9744e24de204abc89d99211a232b, 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 8d431c78ab9b73454a122f3ed590df666adc391b..d2bcf2adc10d1caa1a116907b683d0c5ecd9bd2c 100644 --- a/Assets/Scripts/AudioSystem.cs +++ b/Assets/Scripts/AudioSystem.cs @@ -66,7 +66,10 @@ public class AudioSystem : MonoBehaviour, IAction { FanfareClip(); } - + if (type == EventType.WinMusic) + { + WinClip(); + } } @@ -114,7 +117,10 @@ public class AudioSystem : MonoBehaviour, IAction { StartCoroutine("FadeOutIn", new Timing(0, 0)); } - + public void WinClip() + { + StartCoroutine("FadeOutIn", new Timing(1, 10)); + } IEnumerator FadeOutIn(Timing t) { //yield return FadeOut(t.duration); yield return StartCoroutine("FadeOut", t.duration);