From bf9e96e5e88fd00f6f5413eaa3953f63b2261661 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Wed, 5 Oct 2022 11:24:47 -0400 Subject: [PATCH 1/2] Adding graphic raycaster to loading screen and turning on/off raycast blocking --- Assets/Prefabs/UI/LoadingScreen.prefab | 20 ++++++++++++++++++- .../SceneManagement/ClientLoadingScreen.cs | 12 ++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Assets/Prefabs/UI/LoadingScreen.prefab b/Assets/Prefabs/UI/LoadingScreen.prefab index 75b370e15..e40b84047 100644 --- a/Assets/Prefabs/UI/LoadingScreen.prefab +++ b/Assets/Prefabs/UI/LoadingScreen.prefab @@ -462,6 +462,7 @@ GameObject: - component: {fileID: 5535057700358825828} - component: {fileID: 5841466599347033389} - component: {fileID: 3127630062634103998} + - component: {fileID: 2516136186326398479} m_Layer: 5 m_Name: LoadingScreen m_TagString: Untagged @@ -543,7 +544,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948382310089859896} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0 m_Interactable: 0 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 @@ -582,6 +583,23 @@ MonoBehaviour: - {fileID: 6817560313460574097} m_LoadingProgressManager: {fileID: 0} m_PersistentPlayerRuntimeCollection: {fileID: 11400000, guid: 23c3465e22da67c4e812c4faf3adb1cb, type: 2} +--- !u!114 &2516136186326398479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948382310089859896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &1057458229063515816 GameObject: m_ObjectHideFlags: 0 diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs b/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs index 5098a40f0..e62c958af 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs @@ -71,7 +71,7 @@ void Awake() void Start() { - m_CanvasGroup.alpha = 0; + SetCanvasVisibility(false); m_LoadingProgressManager.onTrackersUpdated += OnProgressTrackersUpdated; } @@ -130,7 +130,7 @@ public void StopLoadingScreen() public void StartLoadingScreen(string sceneName) { - m_CanvasGroup.alpha = 1; + SetCanvasVisibility(true); m_LoadingScreenRunning = true; UpdateLoadingScreen(sceneName); ReinitializeProgressBars(); @@ -220,6 +220,12 @@ public void UpdateLoadingScreen(string sceneName) } } + void SetCanvasVisibility(bool visible) + { + m_CanvasGroup.alpha = visible ? 1 : 0; + m_CanvasGroup.blocksRaycasts = visible; + } + IEnumerator FadeOutCoroutine() { yield return new WaitForSeconds(m_DelayBeforeFadeOut); @@ -233,7 +239,7 @@ IEnumerator FadeOutCoroutine() currentTime += Time.deltaTime; } - m_CanvasGroup.alpha = 0; + SetCanvasVisibility(false); } } } From cd9e6406649643fac1ad5699b0236238cc41bc2e Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Wed, 5 Oct 2022 11:36:11 -0400 Subject: [PATCH 2/2] adding changelog entry --- Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md b/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md index 783c4077c..506bb683d 100644 --- a/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md +++ b/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md @@ -4,6 +4,7 @@ ### Added * Added custom RNSM config with graph for RTT instead of single value (#747) +* ClientLoadingScreen now sets raycast blocking to true when the loading screen is visible (#760)~~~~ ### Changed * ### Removed