summaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
Diffstat (limited to 'Assets')
-rwxr-xr-xAssets/Audio/Fly Octo Fly.mp3bin0 -> 8525123 bytes
-rw-r--r--Assets/Audio/Fly Octo Fly.mp3.meta22
-rw-r--r--Assets/Scenes/SampleScene.unity40
-rw-r--r--Assets/Scripts/AudioManager.cs5
-rw-r--r--Assets/Scripts/Sound.cs2
5 files changed, 67 insertions, 2 deletions
diff --git a/Assets/Audio/Fly Octo Fly.mp3 b/Assets/Audio/Fly Octo Fly.mp3
new file mode 100755
index 0000000..97c09b7
--- /dev/null
+++ b/Assets/Audio/Fly Octo Fly.mp3
Binary files differ
diff --git a/Assets/Audio/Fly Octo Fly.mp3.meta b/Assets/Audio/Fly Octo Fly.mp3.meta
new file mode 100644
index 0000000..0ebe803
--- /dev/null
+++ b/Assets/Audio/Fly Octo Fly.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e3f5207fa719ae57bbc8f2909e2cc49d
+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/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index a8a38fb..9bc5036 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -1283,6 +1283,11 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
+ - target: {fileID: 990268100192312567, guid: 61c68b207aaeb438fa625409d4c9247e,
+ type: 3}
+ propertyPath: gravity
+ value: -8.81
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3}
--- !u!1001 &8450095133562720382
@@ -1352,5 +1357,40 @@ PrefabInstance:
propertyPath: m_Name
value: AudioManager
objectReference: {fileID: 0}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: sounds.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: Theme
+ value: Fly Octo Fly
+ objectReference: {fileID: 0}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: sounds.Array.data[1].name
+ value: Fly Octo Fly
+ objectReference: {fileID: 0}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: sounds.Array.data[1].clip
+ value:
+ objectReference: {fileID: 8300000, guid: e3f5207fa719ae57bbc8f2909e2cc49d, type: 3}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: sounds.Array.data[1].volume
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: sounds.Array.data[1].pitch
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050,
+ type: 3}
+ propertyPath: sounds.Array.data[1].loop
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8489462a89be80c6e91509d42a08b050, type: 3}
diff --git a/Assets/Scripts/AudioManager.cs b/Assets/Scripts/AudioManager.cs
index 23042c1..016e04d 100644
--- a/Assets/Scripts/AudioManager.cs
+++ b/Assets/Scripts/AudioManager.cs
@@ -7,6 +7,9 @@ public class AudioManager : MonoBehaviour
public Sound[] sounds;
public static AudioManager instance;
+
+ public string Theme;
+
// Start is called before the first frame update
void Awake()
@@ -34,7 +37,7 @@ public class AudioManager : MonoBehaviour
void Start()
{
- Play("Splattack!");
+ Play(Theme);
}
public void Play(string name)
diff --git a/Assets/Scripts/Sound.cs b/Assets/Scripts/Sound.cs
index d7214a2..d4c7d76 100644
--- a/Assets/Scripts/Sound.cs
+++ b/Assets/Scripts/Sound.cs
@@ -14,7 +14,7 @@ public class Sound
public float pitch;
public bool loop;
-
+
[HideInInspector]
public AudioSource source;