Fixed some small issues

YARC-Official · Mar 16, 2023 · 5afcfe6 · 5afcfe6
1 parent 5608179
commit 5afcfe6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -154,21 +154,6 @@ private void UpdateSelectDevice() {
 					UpdateConfigure();
 				});
 			}
-
-			// Add unsupported devices
-			foreach (var device in InputSystem.GetUnsupportedDevices()) {
-				var go = Instantiate(deviceButtonPrefab, devicesContainer);
-				go.GetComponentInChildren<TextMeshProUGUI>().text = $"<color=red>(NOT RECOGNIZED)</color> <b>{device.product}</b> ({device.interfaceName})";
-				go.GetComponentInChildren<Button>().onClick.AddListener(() => {
-					// Force register device as joystick
-					InputSystem.RegisterLayout<Joystick>(matches: new InputDeviceMatcher()
-						.WithInterface(device.interfaceName)
-						.WithProduct(device.product));
-
-					// Refresh
-					UpdateSelectDevice();
-				});
-			}
 		}
 
 		private void UpdateConfigure() {

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1.0
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: 8efbce013f4e1c34895851b7038c76e9, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1