Skip to content

fix: can click through loading screen [MTT-4753] #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2022
Merged

fix: can click through loading screen [MTT-4753] #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf9e96e
Adding graphic raycaster to loading screen and turning on/off raycast…
LPLafontaineB Oct 5, 2022
cd9e640
adding changelog entry
LPLafontaineB Oct 5, 2022
fcb7772
Merge branch 'develop' into fix/can-click-through-loading-screen
LPLafontaineB Oct 5, 2022
6870bcc
Merge branch 'develop' into fix/can-click-through-loading-screen
LPLafontaineB Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion Assets/Prefabs/UI/LoadingScreen.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Multiplayer Samples Co-op Changelog

## [Unreleased] - yyyy-mm-dd

### Added
* ClientLoadingScreen now sets raycast blocking to true when the loading screen is visible (#760)
### Changed
*
### Removed
*
### Fixed
*

## [1.4.0] - 2022-10-06

### Added
Expand Down
12 changes: 9 additions & 3 deletions Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void Awake()

void Start()
{
m_CanvasGroup.alpha = 0;
SetCanvasVisibility(false);
m_LoadingProgressManager.onTrackersUpdated += OnProgressTrackersUpdated;
}

Expand Down Expand Up @@ -130,7 +130,7 @@ public void StopLoadingScreen()

public void StartLoadingScreen(string sceneName)
{
m_CanvasGroup.alpha = 1;
SetCanvasVisibility(true);
m_LoadingScreenRunning = true;
UpdateLoadingScreen(sceneName);
ReinitializeProgressBars();
Expand Down Expand Up @@ -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);
Expand All @@ -233,7 +239,7 @@ IEnumerator FadeOutCoroutine()
currentTime += Time.deltaTime;
}

m_CanvasGroup.alpha = 0;
SetCanvasVisibility(false);
}
}
}