diff --git a/Assets/Audio/kivikausi.bak b/Assets/Audio/kivikausi.bak
deleted file mode 100644
index 3b3d970599286a19ab2ea3a9bc798f11a0e1d775..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi.bak and /dev/null differ
diff --git a/Assets/Audio/kivikausi.bak.meta b/Assets/Audio/kivikausi.bak.meta
deleted file mode 100644
index 9df8b50eb96bf1809e646b1c11919866062d7aeb..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi.bak.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4b04fbdc1f3c8524291d53c73f8a7ca1
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Audio/kivikausi.it b/Assets/Audio/kivikausi.it
deleted file mode 100644
index 46daa21809dd01c9acf5bb83dc86d1b497beb50b..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi.it.meta b/Assets/Audio/kivikausi.it.meta
deleted file mode 100644
index bd3882d8ce1f3acebc200c440baa698e450cb853..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 21ee1dc9c869cb744bb9d04b77b8eb37
-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_1.bak b/Assets/Audio/kivikausi_1.bak
deleted file mode 100644
index 86eefc263f48af5c1652b6573775a4d42b70da6d..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_1.bak and /dev/null differ
diff --git a/Assets/Audio/kivikausi_1.bak.meta b/Assets/Audio/kivikausi_1.bak.meta
deleted file mode 100644
index 29c4b3c4a67b14b79ba5b15f31159c9178a61140..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_1.bak.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b3fc5a2829ee9c34d9184cee2b3d9088
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Audio/kivikausi_1.it b/Assets/Audio/kivikausi_1.it
deleted file mode 100644
index 13c4166e7f920f62d2899c12ca9dd69a0f0739e1..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_1.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_1.it.meta b/Assets/Audio/kivikausi_1.it.meta
deleted file mode 100644
index fc1730e3a0d870b24bda5777f25ad2bbe3d6e690..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_1.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: fe65696a605ecef46a6e17d968389a60
-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_2.it b/Assets/Audio/kivikausi_2.it
deleted file mode 100644
index f29fbd5d719531f1394260f43b3baa315306bcf1..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_2.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_2.it.meta b/Assets/Audio/kivikausi_2.it.meta
deleted file mode 100644
index 6f178cefb3e2e7bff01bf8013dd5af6dda70597b..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_2.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: bcf2099bf34b1034093d61bb2f365a40
-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_2.ogg b/Assets/Audio/kivikausi_2.ogg
deleted file mode 100644
index 4c2a3105bc63ca85aef685afd36e79c9cad02433..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_2.ogg and /dev/null differ
diff --git a/Assets/Audio/kivikausi_2.ogg.meta b/Assets/Audio/kivikausi_2.ogg.meta
deleted file mode 100644
index bb1637f589f457f854a207e4f8d248ffbe5e14b9..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_2.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 0043bcef2a233f442b104099f95afca1
-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/kivikausi_4.it b/Assets/Audio/kivikausi_4.it
deleted file mode 100644
index 79ebbc3bdd409f3b537f93ab5c6251b16f2470bd..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_4.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_4.it.meta b/Assets/Audio/kivikausi_4.it.meta
deleted file mode 100644
index 49653c1e0d3da62e41bf7f74200556ce02322bfa..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_4.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 2eb734563c655d4459eeee5eb5023b47
-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_5.it b/Assets/Audio/kivikausi_5.it
deleted file mode 100644
index 9a5e4931233a65bffdd51ed4113ab6fd9a37bc6c..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_5.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_5.it.meta b/Assets/Audio/kivikausi_5.it.meta
deleted file mode 100644
index 169cbeef4cdfe73a5783461bfe53b6b988df31bc..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_5.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: d9b37223090a0a94bad400813c2f713d
-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_6.it b/Assets/Audio/kivikausi_6.it
deleted file mode 100644
index 4bac405b1b394bb3f230487d67121da18aab02f0..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_6.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_6.it.meta b/Assets/Audio/kivikausi_6.it.meta
deleted file mode 100644
index 7261968fa7fa75116562b0b6b129488814fc86f6..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_6.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 92c3c637aed077f43ab264957eba75d5
-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_bushEffect.it b/Assets/Audio/kivikausi_bushEffect.it
deleted file mode 100644
index e3ea46a3e62fc99fca80a4340d94bb08e90be42b..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_bushEffect.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_bushEffect.it.meta b/Assets/Audio/kivikausi_bushEffect.it.meta
deleted file mode 100644
index 141e02b08298f205842a489d3f2ddc60d384f7a0..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_bushEffect.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 2a47042bf0b2ffa210eb655f2a7a6289ffc6d6c5..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_stoneEffect.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_stoneEffect.it.meta b/Assets/Audio/kivikausi_stoneEffect.it.meta
deleted file mode 100644
index 2ae594d7068b28f50de0c7047790bd47b380e487..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_stoneEffect.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 043d5d6c36669d991bbff45d54e9a185d4040a0c..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/kivikausi_woodeffect.it and /dev/null differ
diff --git a/Assets/Audio/kivikausi_woodeffect.it.meta b/Assets/Audio/kivikausi_woodeffect.it.meta
deleted file mode 100644
index 287aea64d01ba0b19bde000915746a59319c45f9..0000000000000000000000000000000000000000
--- a/Assets/Audio/kivikausi_woodeffect.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-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/Audio/lautanen.it b/Assets/Audio/lautanen.it
deleted file mode 100644
index ff08993bd67bc1930bcead22e1da9b79cce42b45..0000000000000000000000000000000000000000
Binary files a/Assets/Audio/lautanen.it and /dev/null differ
diff --git a/Assets/Audio/lautanen.it.meta b/Assets/Audio/lautanen.it.meta
deleted file mode 100644
index 1d0f4f56f7534fbc5eebcb1affa8bf5a626631eb..0000000000000000000000000000000000000000
--- a/Assets/Audio/lautanen.it.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 117f35b9a9c960540ae24eea2bf3ea27
-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 0452e9c46aebcd461d2aface2a55974f383d70a2..13ddaec92e8708aa22fa166cd06946b2cc100ff3 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -283,22 +283,52 @@ PrefabInstance:
type: 3}
propertyPath: musics.Array.data[6]
value:
- objectReference: {fileID: 8300000, guid: 117f35b9a9c960540ae24eea2bf3ea27, type: 3}
+ objectReference: {fileID: 8300000, guid: 40d9a3c7b9ef0db47bae90209c9aabfa, type: 3}
- target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
type: 3}
propertyPath: musics.Array.data[7]
value:
- objectReference: {fileID: 8300000, guid: 1b51dbf8319818449ab62be8d9450e31, type: 3}
+ objectReference: {fileID: 8300000, guid: 61e35e515cbaa5c47b3e76f5ed99017b, type: 3}
- target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
type: 3}
propertyPath: musics.Array.data[8]
value:
- objectReference: {fileID: 8300000, guid: 86208dc8a75ffb24ebab218e12d74c9a, type: 3}
+ objectReference: {fileID: 8300000, guid: 865d4c2b00bfe8c478c6396b67dadbe1, type: 3}
- target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
type: 3}
propertyPath: musics.Array.data[9]
value:
- objectReference: {fileID: 8300000, guid: 2edad0f30cce2dc47a11eee3baf3118a, type: 3}
+ objectReference: {fileID: 8300000, guid: 08381179a644cd34eb853e515a3fc996, type: 3}
+ - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
+ type: 3}
+ propertyPath: musics.Array.data[0]
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
+ type: 3}
+ propertyPath: musics.Array.data[1]
+ value:
+ objectReference: {fileID: 8300000, guid: 9bd37f1480c9b8442ad13c250f07dd78, type: 3}
+ - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
+ type: 3}
+ propertyPath: musics.Array.data[2]
+ value:
+ objectReference: {fileID: 8300000, guid: 907161c8ad901104d9d4f1799919de0d, type: 3}
+ - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
+ type: 3}
+ propertyPath: musics.Array.data[3]
+ value:
+ objectReference: {fileID: 8300000, guid: d6fda377729c54848a8eacb3683aacec, type: 3}
+ - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
+ type: 3}
+ propertyPath: musics.Array.data[4]
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 203678261489018089, guid: 530bea3a047bd31458b647c456257c63,
+ type: 3}
+ propertyPath: musics.Array.data[5]
+ value:
+ objectReference: {fileID: 8300000, guid: a5c5c1c02f056e04ca16e3277134468a, 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 cf61860a9210eab662695b268c0c8b0f13eced8a..647771a6e477ea02bd04645793b1a591f9db3627 100644
--- a/Assets/Scripts/AudioSystem.cs
+++ b/Assets/Scripts/AudioSystem.cs
@@ -89,7 +89,7 @@ public class AudioSystem : MonoBehaviour, IAction
}
public void HuntingBigClip()
{
- StartCoroutine("FadeOutIn", new Timing(2, 6));
+ StartCoroutine("FadeOutIn", new Timing(2, 5));
}
public void WoodClip()
{