diff --git a/Assets/Audio/kivikausi_bushEffect.it b/Assets/Audio/kivikausi_bushEffect.it new file mode 100644 index 0000000000000000000000000000000000000000..e3ea46a3e62fc99fca80a4340d94bb08e90be42b Binary files /dev/null and b/Assets/Audio/kivikausi_bushEffect.it differ diff --git a/Assets/Audio/kivikausi_bushEffect.it.meta b/Assets/Audio/kivikausi_bushEffect.it.meta new file mode 100644 index 0000000000000000000000000000000000000000..141e02b08298f205842a489d3f2ddc60d384f7a0 --- /dev/null +++ b/Assets/Audio/kivikausi_bushEffect.it.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2edad0f30cce2dc47a11eee3baf3118a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + 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/kivikausi_stoneEffect.it b/Assets/Audio/kivikausi_stoneEffect.it new file mode 100644 index 0000000000000000000000000000000000000000..2a47042bf0b2ffa210eb655f2a7a6289ffc6d6c5 Binary files /dev/null and b/Assets/Audio/kivikausi_stoneEffect.it differ diff --git a/Assets/Audio/kivikausi_stoneEffect.it.meta b/Assets/Audio/kivikausi_stoneEffect.it.meta new file mode 100644 index 0000000000000000000000000000000000000000..2ae594d7068b28f50de0c7047790bd47b380e487 --- /dev/null +++ b/Assets/Audio/kivikausi_stoneEffect.it.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 86208dc8a75ffb24ebab218e12d74c9a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + 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/kivikausi_woodeffect.it b/Assets/Audio/kivikausi_woodeffect.it new file mode 100644 index 0000000000000000000000000000000000000000..043d5d6c36669d991bbff45d54e9a185d4040a0c Binary files /dev/null and b/Assets/Audio/kivikausi_woodeffect.it differ diff --git a/Assets/Audio/kivikausi_woodeffect.it.meta b/Assets/Audio/kivikausi_woodeffect.it.meta new file mode 100644 index 0000000000000000000000000000000000000000..287aea64d01ba0b19bde000915746a59319c45f9 --- /dev/null +++ b/Assets/Audio/kivikausi_woodeffect.it.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1b51dbf8319818449ab62be8d9450e31 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + 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 31441b738c36c849d686217621810029b7538239..0452e9c46aebcd461d2aface2a55974f383d70a2 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -277,13 +277,28 @@ PrefabInstance: - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.size - value: 7 + value: 10 objectReference: {fileID: 0} - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, type: 3} propertyPath: musics.Array.data[6] value: objectReference: {fileID: 8300000, guid: 117f35b9a9c960540ae24eea2bf3ea27, type: 3} + - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, + type: 3} + propertyPath: musics.Array.data[7] + value: + objectReference: {fileID: 8300000, guid: 1b51dbf8319818449ab62be8d9450e31, type: 3} + - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, + type: 3} + propertyPath: musics.Array.data[8] + value: + objectReference: {fileID: 8300000, guid: 86208dc8a75ffb24ebab218e12d74c9a, type: 3} + - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63, + type: 3} + propertyPath: musics.Array.data[9] + value: + objectReference: {fileID: 8300000, guid: 2edad0f30cce2dc47a11eee3baf3118a, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 530bea3a047bd31458b647c456257c63, type: 3} --- !u!1001 &5792638251041000132 diff --git a/Assets/Scripts/AudioSystem.cs b/Assets/Scripts/AudioSystem.cs index b78124913e67283c647917395446dd0cbf146931..cf61860a9210eab662695b268c0c8b0f13eced8a 100644 --- a/Assets/Scripts/AudioSystem.cs +++ b/Assets/Scripts/AudioSystem.cs @@ -48,12 +48,25 @@ public class AudioSystem : MonoBehaviour, IAction } if (type == EventType.WoodChopped) { - + WoodClip(); } if (type == EventType.StoneCut) { - + StoneClip(); } + if (type == EventType.Berrypicked) + { + BerryClip(); + } + if (type == EventType.UpgradeBuilt) + { + + } + if (type == EventType.TimePeriodChanged) + { + + } + } @@ -78,6 +91,19 @@ public class AudioSystem : MonoBehaviour, IAction { StartCoroutine("FadeOutIn", new Timing(2, 6)); } + public void WoodClip() + { + StartCoroutine("PlayEffect", 7); + } + public void StoneClip() + { + StartCoroutine("PlayEffect", 8); + } + public void BerryClip() + { + StartCoroutine("PlayEffect", 9); + } + IEnumerator FadeOutIn(Timing t) { //yield return FadeOut(t.duration); yield return StartCoroutine("FadeOut", t.duration);