fix pda and zoom handleer (unitystation#11120)

Bod9001 · web-flow · commit a769c402bc42 · 2026-03-06T01:19:23.000+02:00
* fix pda and zoom handleer

* escape shuttle  initialisation fixes
diff --git a/UnityProject/Assets/Prefabs/UI/Tabs/Resources/TabPDA.prefab b/UnityProject/Assets/Prefabs/UI/Tabs/Resources/TabPDA.prefab
diff --git a/UnityProject/Assets/Scripts/US13/Managers/GameManager.Escape.cs b/UnityProject/Assets/Scripts/US13/Managers/GameManager.Escape.cs
@@ -38,6 +38,9 @@ public void SetEscapeShuttle(EscapeShuttle EscapeShuttle)
 		/// </summary>
 		private void InitEscapeStuff()
 		{
+			shuttleSent = false;
+			beenToStation = false;
+
 			// Primary escape shuttle lookup
 			if (PrimaryEscapeShuttle == null)
 			{
@@ -66,9 +69,8 @@ private void InitEscapeStuff()
 				if (primaryEscapeShuttle.MatrixInfo.IsMovable == false) return;
 			}
 
-			Vector3 newPos;
 
-			beenToStation = false;
+
 		}
 
 		public void OnShuttleUpdate(EscapeShuttleStatus status)
diff --git a/UnityProject/Assets/Scripts/US13/Managers/SettingsManager/DisplaySettings.cs b/UnityProject/Assets/Scripts/US13/Managers/SettingsManager/DisplaySettings.cs
@@ -10,7 +10,7 @@
 
 namespace US13.Managers.SettingsManager
 {
-	public class DisplaySettings : SingletonManager<DisplaySettings>
+	public class DisplaySettings : MonoBehaviour
 	{
 		public class DisplaySettingsChangedEventArgs : EventArgs
 		{
@@ -131,6 +131,21 @@ public bool ChatBubbleClownColourChanged
 
 		private DisplaySettingsChangedEventArgs dsEventArgs = new DisplaySettingsChangedEventArgs();
 
+		public static DisplaySettings Instance
+		{
+			get
+			{
+				if (instance == null)
+				{
+					instance = FindAnyObjectByType<DisplaySettings>();
+				}
+
+				return instance;
+			}
+		}
+
+		private static DisplaySettings instance;
+
 		/// <summary>
 		/// We are in fullscreen mode, or currently changing to fullscreen
 		/// </summary>
@@ -412,9 +427,14 @@ protected virtual void OnSettingsChanged(DisplaySettingsChangedEventArgs e)
 			handler?.Invoke(this, e);
 		}
 
-		public override void Awake()
+		public void Start()
+		{
+			instance = this;
+		}
+
+		public void Awake()
 		{
-			base.Awake();
+			instance = this;
 			IsFullScreen = Screen.fullScreen;
 			Vector2 savedScale = new Vector2(
 				UnityEngine.PlayerPrefs.GetInt(UISCALE_KEY + "x", (int)UISCALE_DEFAULT.x),
diff --git a/UnityProject/Assets/Scripts/US13/UI/Core/CameraZoomHandler.cs b/UnityProject/Assets/Scripts/US13/UI/Core/CameraZoomHandler.cs
@@ -13,26 +13,24 @@ namespace US13.UI.Core
 {
 	public class CameraZoomHandler : MonoBehaviour
 	{
-		public float ZoomLevel => DisplaySettings.Instance.ZoomLevel;
-
-		public bool ScrollWheelZoom => DisplaySettings.Instance.ScrollWheelZoom;
-
 
 		private PixelPerfectCamera pixelPerfectCamera;
 
 		void OnEnable()
 		{
+			UpdateManager.Add(CallbackType.UPDATE, UpdateMe);
 			DisplaySettings.Instance.SettingsChanged += DisplaySettings_SettingsChanged;
 			SceneManager.activeSceneChanged += SceneManager_activeSceneChanged;
 			UpdatePixelPerfectCamera();
-			UpdateManager.Add(CallbackType.UPDATE, UpdateMe);
+
 		}
 
 		private void OnDisable()
 		{
+			UpdateManager.Remove(CallbackType.UPDATE, UpdateMe);
 			DisplaySettings.Instance.SettingsChanged -= DisplaySettings_SettingsChanged;
 			SceneManager.activeSceneChanged -= SceneManager_activeSceneChanged;
-			UpdateManager.Remove(CallbackType.UPDATE, UpdateMe);
+
 		}
 
 		private void SceneManager_activeSceneChanged(Scene arg0, Scene arg1)

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ public void SetEscapeShuttle(EscapeShuttle EscapeShuttle)`
`38`	`38`	`/// </summary>`
`39`	`39`	`private void InitEscapeStuff()`
`40`	`40`	`{`
	`41`	`+ shuttleSent = false;`
	`42`	`+ beenToStation = false;`
	`43`	`+`
`41`	`44`	`// Primary escape shuttle lookup`
`42`	`45`	`if (PrimaryEscapeShuttle == null)`
`43`	`46`	`{`
`@@ -66,9 +69,8 @@ private void InitEscapeStuff()`
`66`	`69`	`if (primaryEscapeShuttle.MatrixInfo.IsMovable == false) return;`
`67`	`70`	`}`
`68`	`71`
`69`		`- Vector3 newPos;`
`70`	`72`
`71`		`- beenToStation = false;`
	`73`	`+`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`public void OnShuttleUpdate(EscapeShuttleStatus status)`
Original file line number	Diff line number	Diff line change
`@@ -13,26 +13,24 @@ namespace US13.UI.Core`
`13`	`13`	`{`
`14`	`14`	`public class CameraZoomHandler : MonoBehaviour`
`15`	`15`	`{`
`16`		`- public float ZoomLevel => DisplaySettings.Instance.ZoomLevel;`
`17`		`-`
`18`		`- public bool ScrollWheelZoom => DisplaySettings.Instance.ScrollWheelZoom;`
`19`		`-`
`20`	`16`
`21`	`17`	`private PixelPerfectCamera pixelPerfectCamera;`
`22`	`18`
`23`	`19`	`void OnEnable()`
`24`	`20`	`{`
	`21`	`+ UpdateManager.Add(CallbackType.UPDATE, UpdateMe);`
`25`	`22`	`DisplaySettings.Instance.SettingsChanged += DisplaySettings_SettingsChanged;`
`26`	`23`	`SceneManager.activeSceneChanged += SceneManager_activeSceneChanged;`
`27`	`24`	`UpdatePixelPerfectCamera();`
`28`		`- UpdateManager.Add(CallbackType.UPDATE, UpdateMe);`
	`25`	`+`
`29`	`26`	`}`
`30`	`27`
`31`	`28`	`private void OnDisable()`
`32`	`29`	`{`
	`30`	`+ UpdateManager.Remove(CallbackType.UPDATE, UpdateMe);`
`33`	`31`	`DisplaySettings.Instance.SettingsChanged -= DisplaySettings_SettingsChanged;`
`34`	`32`	`SceneManager.activeSceneChanged -= SceneManager_activeSceneChanged;`
`35`		`- UpdateManager.Remove(CallbackType.UPDATE, UpdateMe);`
	`33`	`+`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`private void SceneManager_activeSceneChanged(Scene arg0, Scene arg1)`