Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion .yamato/project.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ projects:
- name: com.unity.multiplayer.samples.coop
path: Packages/com.unity.multiplayer.samples.coop
test_editors:
- 2022.3.0
- 2022.3
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ class OfflineState : ConnectionState
public override void Enter()
{
m_LobbyServiceFacade.EndTracking();
m_ConnectionManager.NetworkManager.Shutdown();
if (m_ConnectionManager.NetworkManager.IsListening)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be the fix for the issue with m_ShuttingDown being set to true again.
We might be able to add one more simple fix into the v1.5.2 branch if it isn't too late and then we can revert these updates.

{
m_ConnectionManager.NetworkManager.Shutdown();
}
if (SceneManager.GetActiveScene().name != k_MainMenuSceneName)
{
SceneLoaderWrapper.Instance.LoadScene(k_MainMenuSceneName, useNetworkSceneManager: false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ public override void Publish(T message)

void SendMessageThroughNetwork(T message)
{
// Avoid throwing an exception if you are in the middle of shutting down and either
// NetworkManager no longer exists or the CustomMessagingManager no longer exists.
if (m_NetworkManager == null || m_NetworkManager.CustomMessagingManager == null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternately, you could change this fix to:

            if (m_NetworkManager == null || m_NetworkManager.ShutdownInProgress)
            {
                return;
            }

{
return;
}
var writer = new FastBufferWriter(FastBufferWriter.GetWriteSize<T>(), Allocator.Temp);
writer.WriteValueSafe(message);
m_NetworkManager.CustomMessagingManager.SendNamedMessageToAll(m_Name, writer);
Expand Down
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
16 changes: 8 additions & 8 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.ai.navigation": "1.1.3",
"com.unity.ai.navigation": "1.1.4",
"com.unity.cinemachine": "2.9.5",
"com.unity.collab-proxy": "2.0.4",
"com.unity.ide.rider": "3.0.21",
"com.unity.collab-proxy": "2.0.5",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ide.vscode": "1.2.5",
"com.unity.learn.iet-framework": "3.1.3",
"com.unity.memoryprofiler": "1.0.0",
"com.unity.multiplayer.tools": "2.0.0-pre.3",
"com.unity.netcode.gameobjects": "1.4.0",
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=/com.unity.netcode.gameobjects#6d461bfd245de2ba3dcd012bb73c8e3eb71d903c",
"com.unity.performance.profile-analyzer": "1.2.2",
"com.unity.postprocessing": "3.2.2",
"com.unity.render-pipelines.universal": "14.0.7",
"com.unity.services.authentication": "2.5.0",
"com.unity.render-pipelines.universal": "14.0.8",
"com.unity.services.authentication": "2.6.1",
"com.unity.services.lobby": "1.1.0-pre.3",
"com.unity.services.relay": "1.0.5",
"com.unity.services.wire": "1.1.5",
"com.unity.services.wire": "1.1.8",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.4",
"com.unity.timeline": "1.7.5",
"com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4",
"com.unity.transport": "2.0.2",
"com.unity.ugui": "1.0.0",
Expand Down
42 changes: 21 additions & 21 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {}
},
"com.unity.ai.navigation": {
"version": "1.1.3",
"version": "1.1.4",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -16,7 +16,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.4",
"version": "1.8.7",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -34,7 +34,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.0.4",
"version": "2.0.5",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -66,7 +66,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.21",
"version": "3.0.24",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -143,14 +143,14 @@
"url": "https://packages.unity.com"
},
"com.unity.netcode.gameobjects": {
"version": "1.4.0",
"version": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=/com.unity.netcode.gameobjects#6d461bfd245de2ba3dcd012bb73c8e3eb71d903c",
"depth": 0,
"source": "registry",
"source": "git",
"dependencies": {
"com.unity.nuget.mono-cecil": "1.10.1",
"com.unity.transport": "1.3.3"
"com.unity.transport": "1.3.4"
},
"url": "https://packages.unity.com"
"hash": "6d461bfd245de2ba3dcd012bb73c8e3eb71d903c"
},
"com.unity.nuget.mono-cecil": {
"version": "1.11.4",
Expand Down Expand Up @@ -190,7 +190,7 @@
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "14.0.7",
"version": "14.0.8",
"depth": 1,
"source": "builtin",
"dependencies": {
Expand All @@ -201,14 +201,14 @@
}
},
"com.unity.render-pipelines.universal": {
"version": "14.0.7",
"version": "14.0.8",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.8.4",
"com.unity.render-pipelines.core": "14.0.7",
"com.unity.shadergraph": "14.0.7"
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.shadergraph": "14.0.8"
}
},
"com.unity.searcher": {
Expand All @@ -219,19 +219,19 @@
"url": "https://packages.unity.com"
},
"com.unity.services.authentication": {
"version": "2.5.0",
"version": "2.6.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.services.core": "1.9.0",
"com.unity.services.core": "1.10.1",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.9.0",
"version": "1.10.1",
"depth": 1,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -259,7 +259,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.qos": {
"version": "1.2.0",
"version": "1.2.1",
"depth": 1,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -290,12 +290,12 @@
"url": "https://packages.unity.com"
},
"com.unity.services.wire": {
"version": "1.1.5",
"version": "1.1.8",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.8.1",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.nuget.newtonsoft-json": "3.1.0",
"com.unity.services.authentication": "2.4.0"
},
"url": "https://packages.unity.com"
Expand All @@ -308,11 +308,11 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "14.0.7",
"version": "14.0.8",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "14.0.7",
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.searcher": "4.9.2"
}
},
Expand Down Expand Up @@ -353,7 +353,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.7.4",
"version": "1.7.5",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectSettings.asset
Git LFS file not shown
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.0f1
m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476)
m_EditorVersion: 2022.3.5f1
m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee)