Calibration setting

rjkiv · Dec 19, 2022 · 8296c6d · 8296c6d
1 parent 4713b1f
commit 8296c6d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/Assets/Script/Game.cs b/Assets/Script/Game.cs
@@ -30,9 +30,8 @@ public static Game Instance {
 		private bool songStarted = false;
 
 		private float realSongTime = 0f;
-		private float calibration = 0f;
 		public float SongTime {
-			get => realSongTime + calibration;
+			get => realSongTime + PlayerManager.globalCalibration;
 		}
 
 		public Chart chart;
@@ -41,7 +40,6 @@ private void Awake() {
 			Instance = this;
 
 			chart = null;
-			calibration = -0.23f;
 			realSongTime = 0f;
 
 			// Song
@@ -95,13 +93,11 @@ private void Update() {
 				realSongTime += Time.deltaTime;
 
 				if (Keyboard.current.upArrowKey.wasPressedThisFrame) {
-					calibration += 0.01f;
-					Debug.Log(calibration);
+					PlayerManager.globalCalibration += 0.01f;
 				}
 
 				if (Keyboard.current.downArrowKey.wasPressedThisFrame) {
-					calibration -= 0.01f;
-					Debug.Log(calibration);
+					PlayerManager.globalCalibration -= 0.01f;
 				}
 			}
 		}

diff --git a/Assets/Script/PlayerManager.cs b/Assets/Script/PlayerManager.cs
@@ -26,5 +26,7 @@ public static bool LowQualityMode {
 				QualitySettings.SetQualityLevel(_lowQualityMode ? 0 : 1, true);
 			}
 		}
+
+		public static float globalCalibration = -0.4f;
 	}
 }
diff --git a/Assets/Script/UI/MainMenu.cs b/Assets/Script/UI/MainMenu.cs
@@ -68,6 +68,17 @@ private void SetupMainMenu() {
 
 				PlayerManager.LowQualityMode = lowQuality.value;
 			});
+
+			// Calibration
+			var calibrationField = root.Q<FloatField>("Calibration");
+			calibrationField.value = PlayerManager.globalCalibration;
+			calibrationField.RegisterValueChangedCallback(e => {
+				if (calibrationField != e.target) {
+					return;
+				}
+
+				PlayerManager.globalCalibration = calibrationField.value;
+			});
 		}
 
 		private void SetupPreSong() {

diff --git a/Assets/UI/MainMenu.uxml b/Assets/UI/MainMenu.uxml
@@ -4,10 +4,11 @@
         <ui:Button tabindex="0" text="Play" display-tooltip-when-elided="true" name="PlayButton" />
         <ui:Button tabindex="1" text="Add/Edit Players" display-tooltip-when-elided="true" name="EditPlayersButton" />
     </ui:VisualElement>
-    <ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); width: 219px;">
+    <ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); width: 250px; align-self: flex-end;">
         <ui:Button tabindex="1" text="Host LAN File Server" display-tooltip-when-elided="true" name="HostServer" style="width: 196px;" />
         <ui:TextField picking-mode="Ignore" name="ServerIP" value="localhost" style="width: 199px;" />
         <ui:Button tabindex="-1" text="Join LAN File Server" display-tooltip-when-elided="true" name="JoinServer" style="width: 191px;" />
-        <ui:Toggle label="Low Quality" name="LowQuality" style="position: absolute; bottom: 0;" />
+        <ui:Toggle label="Low Quality" name="LowQuality" />
+        <ui:FloatField label="Calibration" value="0" name="Calibration" />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 0
+  m_CurrentQuality: 1
   m_QualitySettings:
   - serializedVersion: 3
     name: Low
@@ -114,7 +114,7 @@ QualitySettings:
     Nintendo Switch: 1
     PS4: 1
     PS5: 1
-    Server: 0
+    Server: 1
     Stadia: 1
     Standalone: 1
     WebGL: 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,7 @@ public static bool LowQualityMode { @@
     				QualitySettings.SetQualityLevel(_lowQualityMode ? 0 : 1, true);
     			}
     		}
+    		public static float globalCalibration = -0.4f;
     	}
     }