diff --git a/Assets/Audio/Ogg/kivikausi_1.ogg b/Assets/Audio/Ogg/kivikausi_1.ogg index b1cbdf7d1d857f39522aae59fca8a1e4873f774e..9c579101e3d9af3076dc67db33507df937952c7d 100644 Binary files a/Assets/Audio/Ogg/kivikausi_1.ogg and b/Assets/Audio/Ogg/kivikausi_1.ogg differ diff --git a/Assets/Audio/Ogg/kivikausi_1.ogg.meta b/Assets/Audio/Ogg/kivikausi_1.ogg.meta index bdd88ac2e184315f27280895aaf9ffc3f94ea1ea..e8b8532e9ff57b88dc37f413e4f1bc55f5e69a0c 100644 --- a/Assets/Audio/Ogg/kivikausi_1.ogg.meta +++ b/Assets/Audio/Ogg/kivikausi_1.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9bd37f1480c9b8442ad13c250f07dd78 +guid: 2ef6f1f589013334ea654912ce166e26 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 13ddaec92e8708aa22fa166cd06946b2cc100ff3..09ade890073beeabc2779ec63d68523dae291e00 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -308,7 +308,7 @@ PrefabInstance: type: 3} propertyPath: musics.Array.data[1] value: - objectReference: {fileID: 8300000, guid: 9bd37f1480c9b8442ad13c250f07dd78, type: 3} + objectReference: {fileID: 8300000, guid: 2ef6f1f589013334ea654912ce166e26, type: 3} - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.data[2] diff --git a/Assets/Scripts/AudioSystem.cs b/Assets/Scripts/AudioSystem.cs index 647771a6e477ea02bd04645793b1a591f9db3627..1457b79780e11e30a8482cbbc1007c68d1dfd042 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) { - GameStartsClip(); + StartCoroutine("GameStartsClip"); } if (type == EventType.CitySmall) { @@ -70,10 +70,13 @@ public class AudioSystem : MonoBehaviour, IAction } - public void GameStartsClip() + public IEnumerator GameStartsClip() { - StartCoroutine("FadeOutIn", new Timing(2,1)); StartCoroutine("PlayEffect", 6); + yield return new WaitForSeconds(2); + ac.clip = musics[1]; + StartCoroutine("FadeIn", 0); + } public void CitySmallClip() { @@ -149,7 +152,7 @@ public class AudioSystem : MonoBehaviour, IAction AudioSource v = gameObject.AddComponent<AudioSource>(); v.clip = musics[clip]; v.Play(); - yield return new WaitForSeconds(v.clip.length + 1); + yield return new WaitForSeconds(v.clip.length); Destroy(v); }