diff --git a/Assets/AudioResources/Music/WAV_03_Finish_loop.wav b/Assets/AudioResources/Music/WAV_03_Finish_loop.wav
new file mode 100644
index 0000000..d3f41eb
Binary files /dev/null and b/Assets/AudioResources/Music/WAV_03_Finish_loop.wav differ
diff --git a/Assets/AudioResources/Music/WAV_03_Finish_loop.wav.meta b/Assets/AudioResources/Music/WAV_03_Finish_loop.wav.meta
new file mode 100644
index 0000000..34b9997
--- /dev/null
+++ b/Assets/AudioResources/Music/WAV_03_Finish_loop.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d1ec1eae9a033cd4c93bf12719fcc6da
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AudioResources/Music/WAV_07_Street_loop.wav b/Assets/AudioResources/Music/WAV_07_Street_loop.wav
new file mode 100644
index 0000000..fe56efe
Binary files /dev/null and b/Assets/AudioResources/Music/WAV_07_Street_loop.wav differ
diff --git a/Assets/AudioResources/Music/WAV_07_Street_loop.wav.meta b/Assets/AudioResources/Music/WAV_07_Street_loop.wav.meta
new file mode 100644
index 0000000..11b4069
--- /dev/null
+++ b/Assets/AudioResources/Music/WAV_07_Street_loop.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 63665211bd1fd94498c07fd68e2e85a2
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AudioResources/Music/WAV_08_Jupiter_loop.wav b/Assets/AudioResources/Music/WAV_08_Jupiter_loop.wav
new file mode 100644
index 0000000..f8c13c6
Binary files /dev/null and b/Assets/AudioResources/Music/WAV_08_Jupiter_loop.wav differ
diff --git a/Assets/AudioResources/Music/WAV_08_Jupiter_loop.wav.meta b/Assets/AudioResources/Music/WAV_08_Jupiter_loop.wav.meta
new file mode 100644
index 0000000..25057f2
--- /dev/null
+++ b/Assets/AudioResources/Music/WAV_08_Jupiter_loop.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e64df9eb72ad48d47a43a5d0812ca086
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AudioResources/Music/WAV_09_Big_Bang_loop.wav b/Assets/AudioResources/Music/WAV_09_Big_Bang_loop.wav
new file mode 100644
index 0000000..b964252
Binary files /dev/null and b/Assets/AudioResources/Music/WAV_09_Big_Bang_loop.wav differ
diff --git a/Assets/AudioResources/Music/WAV_09_Big_Bang_loop.wav.meta b/Assets/AudioResources/Music/WAV_09_Big_Bang_loop.wav.meta
new file mode 100644
index 0000000..c731c52
--- /dev/null
+++ b/Assets/AudioResources/Music/WAV_09_Big_Bang_loop.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 3e4c244b1b1897a46b261795706dc7c0
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AudioResources/Music/WAV_09_Sprint_loop.wav b/Assets/AudioResources/Music/WAV_09_Sprint_loop.wav
new file mode 100644
index 0000000..0346689
Binary files /dev/null and b/Assets/AudioResources/Music/WAV_09_Sprint_loop.wav differ
diff --git a/Assets/AudioResources/Music/WAV_09_Sprint_loop.wav.meta b/Assets/AudioResources/Music/WAV_09_Sprint_loop.wav.meta
new file mode 100644
index 0000000..84bc174
--- /dev/null
+++ b/Assets/AudioResources/Music/WAV_09_Sprint_loop.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: f075ab744dfba084690dc1039550d2e9
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Audio/Main Menu Music 2.prefab b/Assets/Prefabs/Audio/Main Menu Music 2.prefab
new file mode 100644
index 0000000..b3bf5f3
--- /dev/null
+++ b/Assets/Prefabs/Audio/Main Menu Music 2.prefab
@@ -0,0 +1,147 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4479628772504131522
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6423719894035945655}
+ - component: {fileID: 3310727599597512245}
+ - component: {fileID: 7696877450501702533}
+ m_Layer: 0
+ m_Name: Main Menu Music 2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6423719894035945655
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4479628772504131522}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3310727599597512245
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4479628772504131522}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 887650ff1f3850a43aa8d1281fc70528, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ id: 2
+ audioTag: main_menu_music
+ pitchRange: 0.3
+ volumeRange: 0.3
+--- !u!82 &7696877450501702533
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4479628772504131522}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: e64df9eb72ad48d47a43a5d0812ca086, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.07
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 0
+ MinDistance: 1
+ MaxDistance: 100
+ Pan2D: 0
+ rolloffMode: 1
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
diff --git a/Assets/Prefabs/Audio/Main Menu Music 2.prefab.meta b/Assets/Prefabs/Audio/Main Menu Music 2.prefab.meta
new file mode 100644
index 0000000..fe4d270
--- /dev/null
+++ b/Assets/Prefabs/Audio/Main Menu Music 2.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 61b910cc5f77595498c96c310b5fec85
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName: audio
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Audio/Match Music.prefab b/Assets/Prefabs/Audio/Match Music.prefab
new file mode 100644
index 0000000..fc0e949
--- /dev/null
+++ b/Assets/Prefabs/Audio/Match Music.prefab
@@ -0,0 +1,147 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4479628772504131522
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6423719894035945655}
+ - component: {fileID: 3310727599597512245}
+ - component: {fileID: 7696877450501702533}
+ m_Layer: 0
+ m_Name: Match Music
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6423719894035945655
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4479628772504131522}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3310727599597512245
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4479628772504131522}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 887650ff1f3850a43aa8d1281fc70528, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ id: 1
+ audioTag: match_music
+ pitchRange: 0.3
+ volumeRange: 0.3
+--- !u!82 &7696877450501702533
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4479628772504131522}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: f075ab744dfba084690dc1039550d2e9, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.025
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 0
+ MinDistance: 1
+ MaxDistance: 100
+ Pan2D: 0
+ rolloffMode: 1
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
diff --git a/Assets/Prefabs/Audio/Match Music.prefab.meta b/Assets/Prefabs/Audio/Match Music.prefab.meta
new file mode 100644
index 0000000..b41da35
--- /dev/null
+++ b/Assets/Prefabs/Audio/Match Music.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 51479316327e48040a5bb8e83e1b107d
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName: audio
+ assetBundleVariant:
diff --git a/Assets/Scenes/GameManagement.unity b/Assets/Scenes/GameManagement.unity
index 15fc1c5..3d761d8 100644
--- a/Assets/Scenes/GameManagement.unity
+++ b/Assets/Scenes/GameManagement.unity
@@ -135,6 +135,10 @@ PrefabInstance:
propertyPath: _defaultConditions.Array.size
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4393252310584637057, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -191,6 +195,10 @@ PrefabInstance:
propertyPath: m_Name
value: NetworkManager
objectReference: {fileID: 0}
+ - target: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3}
m_RemovedGameObjects: []
diff --git a/Assets/Scenes/InGameUI.unity b/Assets/Scenes/InGameUI.unity
index d3747c4..64727cf 100644
--- a/Assets/Scenes/InGameUI.unity
+++ b/Assets/Scenes/InGameUI.unity
@@ -337,34 +337,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1178560132}
m_Modifications:
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_text
- value: No
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textAlignment
- value: 65535
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.lineCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.pageCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.wordCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_HorizontalAlignment
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.characterCount
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
propertyPath: m_SizeDelta.y
value: -12.6
@@ -525,6 +497,34 @@ PrefabInstance:
propertyPath: m_Name
value: No Button
objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_text
+ value: No
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textAlignment
+ value: 65535
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_HorizontalAlignment
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -984,34 +984,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1986215051}
m_Modifications:
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_text
- value: Yes
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textAlignment
- value: 65535
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.lineCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.pageCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.wordCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_HorizontalAlignment
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.characterCount
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
propertyPath: m_SizeDelta.y
value: -12.6
@@ -1036,6 +1008,10 @@ PrefabInstance:
propertyPath: m_fontSize
value: 53.9
objectReference: {fileID: 0}
+ - target: {fileID: 2836659166924155329, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
+ propertyPath: m_HorizontalAlignment
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 4688621401141212590, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@@ -1160,6 +1136,34 @@ PrefabInstance:
propertyPath: m_Name
value: Yes Button
objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_text
+ value: Yes
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textAlignment
+ value: 65535
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_HorizontalAlignment
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -2667,10 +2671,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2011926118}
m_Modifications:
- - target: {fileID: 5415181396576777827, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_Mesh
- value:
- objectReference: {fileID: 0}
- target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
propertyPath: m_AnchoredPosition.y
value: -4
@@ -2853,6 +2853,10 @@ PrefabInstance:
propertyPath: m_Name
value: Exit Button
objectReference: {fileID: 0}
+ - target: {fileID: 5415181396576777827, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -2882,34 +2886,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1986215051}
m_Modifications:
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_text
- value: No
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textAlignment
- value: 65535
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.lineCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.pageCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.wordCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_HorizontalAlignment
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.characterCount
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
propertyPath: m_SizeDelta.y
value: -12.6
@@ -3070,6 +3046,34 @@ PrefabInstance:
propertyPath: m_Name
value: No Button
objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_text
+ value: No
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textAlignment
+ value: 65535
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_HorizontalAlignment
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -3166,34 +3170,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1178560132}
m_Modifications:
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_text
- value: Yes
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textAlignment
- value: 65535
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.lineCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.pageCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.wordCount
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_HorizontalAlignment
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
- propertyPath: m_textInfo.characterCount
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3}
propertyPath: m_SizeDelta.y
value: -12.6
@@ -3342,6 +3318,34 @@ PrefabInstance:
propertyPath: m_Name
value: Yes Button
objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_text
+ value: Yes
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textAlignment
+ value: 65535
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_HorizontalAlignment
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
diff --git a/Assets/ScriptedAssets/Rules/DefaultRule.asset b/Assets/ScriptedAssets/Rules/DefaultRule.asset
index 74c037d..1958f2b 100644
--- a/Assets/ScriptedAssets/Rules/DefaultRule.asset
+++ b/Assets/ScriptedAssets/Rules/DefaultRule.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: DefaultRule
m_EditorClassIdentifier:
winCondition: 0
- rounds: 3
+ rounds: 5
lives: 1
score: 0
time: -1
diff --git a/Assets/Scripts/AudioLibrary.cs b/Assets/Scripts/AudioLibrary.cs
index 00c0357..eec09f8 100644
--- a/Assets/Scripts/AudioLibrary.cs
+++ b/Assets/Scripts/AudioLibrary.cs
@@ -1,9 +1,7 @@
using System.Collections.Generic;
-using System.IO;
using System.Reflection;
using log4net;
using Managers;
-using UnityEditor;
using UnityEngine;
public class AudioLibrary : MonoBehaviour
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index a8ea57e..f53e2f1 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
using UnityEditor;
using log4net.Config;
using log4net;
+using UnityEngine.Networking;
///
/// The available scenes in the order they are in the build settings.
///
diff --git a/Assets/Scripts/Managers/UIManager.cs b/Assets/Scripts/Managers/UIManager.cs
index 5e90f87..8147d1d 100644
--- a/Assets/Scripts/Managers/UIManager.cs
+++ b/Assets/Scripts/Managers/UIManager.cs
@@ -16,6 +16,7 @@ namespace Managers
public Announcments Announcments { get; private set; }
public PauseMenu PauseMenu { get; private set; }
public MatchEndMenu MatchEndMenu { get; private set; }
+ public ManageableAudio MatchMusic;
///
/// Globally accessible member to use manager with.
@@ -108,6 +109,8 @@ namespace Managers
s.boostUI.SetPlayerName(p);
hUD.boostCapacities[p.playerNumber - 1].gameObject.SetActive(true);
}
+ MatchMusic = AudioManager.G.GetGlobalSound("match_music", 1, true);
+ MatchMusic.PlayAudio(true);
}
public void StartInputPrompt(Dictionary unassignedPlayers)
diff --git a/Assets/Scripts/UI/MatchEndMenu.cs b/Assets/Scripts/UI/MatchEndMenu.cs
index 88821a2..6844375 100644
--- a/Assets/Scripts/UI/MatchEndMenu.cs
+++ b/Assets/Scripts/UI/MatchEndMenu.cs
@@ -53,6 +53,7 @@ public class MatchEndMenu : MonoBehaviour
public void OnMainMenu()
{
+ UIManager.G.MatchMusic.FadeOutAudio(0.3f, true);
StartCoroutine(StartSceneTransition());
}
diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs
index b3b9fef..bef2ba5 100644
--- a/Assets/Scripts/UI/PauseMenu.cs
+++ b/Assets/Scripts/UI/PauseMenu.cs
@@ -55,6 +55,7 @@ public class PauseMenu : MonoBehaviour
public void OnMainMenu()
{
+ UIManager.G.MatchMusic.FadeOutAudio(0.3f, true);
StartCoroutine(StartSceneTransition());
}
diff --git a/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs b/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs
index 9fe0fd2..6cc88ab 100644
--- a/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs
+++ b/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs
@@ -105,7 +105,7 @@ namespace SlimUI.ModernMenu
firstMenu.SetActive(true);
// Position1();
SetThemeColors();
- MainMenuMusic = AudioManager.G.GetGlobalSound("main_menu_music", 1, false);
+ MainMenuMusic = AudioManager.G.GetGlobalSound("main_menu_music", 2, false);
MainMenuMusic.PlayAudio(true);
}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 5a628c2..84e31dd 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -140,9 +140,7 @@ PlayerSettings:
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.1
- preloadedAssets:
- - {fileID: 11400000, guid: 7d6dd64b5f2213d4f8cc395ae58ffb43, type: 2}
- - {fileID: 7907058041053682329, guid: 4b98f800e99c70140ac675a637d71d3a, type: 2}
+ preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1