Merge pull request #220 from hackerspace-ntnu/feature/bidding-music

Add bidding music
hackerspace-ntnu · Aug 29, 2023 · 769de4d · 769de4d
2 parents bd40072 + d8cff6c
commit 769de4d
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 4 deletions.
diff --git a/Assets/Audio/Music/Bidding.asset b/Assets/Audio/Music/Bidding.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8fad0418b333e0b94a4b4eb019cac08d, type: 3}
+  m_Name: Bidding
+  m_EditorClassIdentifier: 
+  title: Wild Metal Band
+  composer: Tore Bergebakken
+  beatsPerMinute: 140
+  beatsPerBar: 2
+  enabledLayers: 01
+  layers:
+  - {fileID: 8300000, guid: 37b9ba439f66ed3cf8a113903384bcea, type: 3}
+  loopLayers: []
diff --git a/Assets/Audio/Music/Bidding.asset.meta b/Assets/Audio/Music/Bidding.asset.meta
diff --git a/Assets/Audio/Music/Bidding.wav b/Assets/Audio/Music/Bidding.wav
diff --git a/Assets/Audio/Music/Menu.ogg.meta → Assets/Audio/Music/Bidding.wav.meta b/Assets/Audio/Music/Menu.ogg.meta → Assets/Audio/Music/Bidding.wav.meta
diff --git a/Assets/Audio/Music/Menu.asset b/Assets/Audio/Music/Menu.asset
@@ -18,5 +18,5 @@ MonoBehaviour:
   beatsPerBar: 2
   enabledLayers: 01
   layers:
-  - {fileID: 8300000, guid: 82c7696f3b67979898d946bcdf923397, type: 3}
+  - {fileID: 8300000, guid: 2f85079be3912590bbc086516900a702, type: 3}
   loopLayers: []
diff --git a/Assets/Audio/Music/Menu.ogg b/Assets/Audio/Music/Menu.ogg
diff --git a/Assets/Audio/Music/Menu.wav b/Assets/Audio/Music/Menu.wav
diff --git a/Assets/Audio/Music/Menu.wav.meta b/Assets/Audio/Music/Menu.wav.meta
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
@@ -13306,6 +13306,7 @@ MonoBehaviour:
   - {fileID: 354233070}
   fadeDuration: 0.5
   menuTheme: {fileID: 11400000, guid: 7bc5a13b503b2a9149e95a0359797daf, type: 2}
+  biddingTheme: {fileID: 11400000, guid: 676847501606a274bb5d1cfc0171fae6, type: 2}
   battleThemes:
   - {fileID: 11400000, guid: d74c51a03904428dfb3801da4e52bf35, type: 2}
   - {fileID: 11400000, guid: 9f533fc2716d2b33fb9f7e297ae4dcae, type: 2}

diff --git a/Assets/Scripts/Audio/MusicTrackManager.cs b/Assets/Scripts/Audio/MusicTrackManager.cs
@@ -35,6 +35,9 @@ public class MusicTrackManager : MonoBehaviour
     [SerializeField]
     private MusicTrack menuTheme;
 
+    [SerializeField]
+    private MusicTrack biddingTheme;
+
     [SerializeField]
     private MusicTrack[] battleThemes;
 
@@ -76,6 +79,7 @@ private MusicTrack GetTrack(MusicType type)
             case MusicType.CONSTRUCTION_FANFARE:
                 return constructionFanfare;
             case MusicType.BIDDING:
+                return biddingTheme;
             case MusicType.MENU:
             default:
                 return menuTheme;