From 5afcfe646b241921f42349593d0cd17606d1a949 Mon Sep 17 00:00:00 2001 From: EliteAsian Date: Thu, 16 Mar 2023 15:08:40 -0400 Subject: [PATCH] Fixed some small issues --- Assets/Prefabs/UI/DeviceButton.prefab | 8 ++++---- Assets/Scenes/MenuScene.unity | 10 +++++----- Assets/Script/PlayMode/Play.cs | 1 + Assets/Script/UI/AddPlayer.cs | 15 --------------- ProjectSettings/ProjectSettings.asset | 3 ++- 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/Assets/Prefabs/UI/DeviceButton.prefab b/Assets/Prefabs/UI/DeviceButton.prefab index 8b7ffb713..65b51096d 100644 --- a/Assets/Prefabs/UI/DeviceButton.prefab +++ b/Assets/Prefabs/UI/DeviceButton.prefab @@ -33,7 +33,7 @@ RectTransform: m_Children: - {fileID: 4798376705778644204} m_Father: {fileID: 4798376704848806611} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -91,7 +91,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -164,7 +164,7 @@ RectTransform: m_Children: - {fileID: 4798376704432026956} m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -202,7 +202,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4798376704432026956} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 9a2a11c44..21da7b8f0 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -2177,7 +2177,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -9847,7 +9847,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -9981,7 +9981,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -15814,7 +15814,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -18324,7 +18324,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} diff --git a/Assets/Script/PlayMode/Play.cs b/Assets/Script/PlayMode/Play.cs index 89371c386..c2db677a8 100644 --- a/Assets/Script/PlayMode/Play.cs +++ b/Assets/Script/PlayMode/Play.cs @@ -165,6 +165,7 @@ private void Update() { if (!GameManager.Instance.useAudioTime || !leaderAudioSource.isPlaying) { realSongTime += Time.deltaTime * speed; } else { + // TODO: Use "timeSamples" for better accuracy realSongTime = leaderAudioSource.time; } diff --git a/Assets/Script/UI/AddPlayer.cs b/Assets/Script/UI/AddPlayer.cs index eb669343a..9e39e56aa 100644 --- a/Assets/Script/UI/AddPlayer.cs +++ b/Assets/Script/UI/AddPlayer.cs @@ -154,21 +154,6 @@ private void UpdateSelectDevice() { UpdateConfigure(); }); } - - // Add unsupported devices - foreach (var device in InputSystem.GetUnsupportedDevices()) { - var go = Instantiate(deviceButtonPrefab, devicesContainer); - go.GetComponentInChildren().text = $"(NOT RECOGNIZED) {device.product} ({device.interfaceName})"; - go.GetComponentInChildren