From 7a306312d1a65985336084623535a1f86e8d9ef4 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sat, 23 Sep 2023 16:15:50 -0400 Subject: [PATCH] remove legacy settings disclaimer --- Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs | 1 + Assets/Scripts/OpeningManager.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs b/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs index 938f0c176..03424f150 100644 --- a/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs +++ b/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs @@ -89,6 +89,7 @@ namespace HeavenStudio.InputSystem public override void UpdateState() { + if (GameManager.instance == null) return; Camera cam = GameManager.instance.CursorCam; hasFlicked = false; diff --git a/Assets/Scripts/OpeningManager.cs b/Assets/Scripts/OpeningManager.cs index 507a3652d..06501f3e3 100644 --- a/Assets/Scripts/OpeningManager.cs +++ b/Assets/Scripts/OpeningManager.cs @@ -14,6 +14,7 @@ namespace HeavenStudio [SerializeField] Animator openingAnim; [SerializeField] TMP_Text buildText; [SerializeField] TMP_Text versionDisclaimer; + [SerializeField] bool enableSecondDisclaimer; public static string OnOpenFile; bool fastBoot = false; @@ -43,7 +44,7 @@ namespace HeavenStudio buildText.text = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss"); #endif - if (Application.platform is RuntimePlatform.OSXPlayer or RuntimePlatform.OSXEditor) + if ((Application.platform is RuntimePlatform.OSXPlayer or RuntimePlatform.OSXEditor) || !enableSecondDisclaimer) { versionDisclaimer.text = ""; }