diff --git a/Assets/Resources/Music/Title_Theme.wav b/Assets/Resources/Music/Title_Theme.wav new file mode 100644 index 000000000..2d9dd4685 Binary files /dev/null and b/Assets/Resources/Music/Title_Theme.wav differ diff --git a/Assets/Resources/Music/Title_Theme.wav.meta b/Assets/Resources/Music/Title_Theme.wav.meta new file mode 100644 index 000000000..f19d087dc --- /dev/null +++ b/Assets/Resources/Music/Title_Theme.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: db628a16ac450d442970008255720d2d +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/Title.unity b/Assets/Scenes/Title.unity index 4d568d962..a168e7e6f 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -2784,6 +2784,7 @@ GameObject: m_Component: - component: {fileID: 1811344141} - component: {fileID: 1811344142} + - component: {fileID: 1811344143} m_Layer: 0 m_Name: TitleManager m_TagString: Untagged @@ -2820,6 +2821,103 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: createButton: {fileID: 2094622677} + Bpm: 114 +--- !u!82 &1811344143 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1811344140} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -7454359775428337364, guid: e76f74363e1893a42bd3ebe9643b7d12, type: 2} + m_audioClip: {fileID: 8300000, guid: db628a16ac450d442970008255720d2d, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1865546491 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs index d7e01b0e8..f500b7766 100644 --- a/Assets/Scripts/TitleManager.cs +++ b/Assets/Scripts/TitleManager.cs @@ -2,15 +2,18 @@ using System.Collections; using System.Collections.Generic; using UnityEngine.UI; using UnityEngine; +using HeavenStudio.Util; namespace HeavenStudio { public class TitleManager : MonoBehaviour { - [SerializeField] Button createButton; + [SerializeField] private Button createButton; + + [SerializeField] private float Bpm = 114f; private void Start() { - createButton.onClick.AddListener(delegate { GlobalGameManager.LoadScene("Editor"); }); + createButton.onClick.AddListener(delegate { GlobalGameManager.LoadScene("Editor"); Jukebox.PlayOneShot("ui/UIEnter"); }); } } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 4271ba942..73676b220 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,6 +8,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Opening.unity guid: 5348c08b82446e0478cee8bda6c02cfc + - enabled: 1 + path: Assets/Scenes/Title.unity + guid: cdaa17c75aa360c42aa6c4b07ef6a883 - enabled: 1 path: Assets/Scenes/Editor.unity guid: 0791ed85a2c8d7140b5c0928073fa113