diff --git a/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs b/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs index 63c8d3584..f909f58b8 100644 --- a/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs +++ b/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs @@ -39,8 +39,6 @@ public class MultiplayerServicesFacade : IDisposable, IStartable bool m_IsTracking; - SessionEventConnectionState m_SessionEventConnectionState = SessionEventConnectionState.Unknown; - public void Start() { m_ServiceScope = m_ParentScope.CreateChild(builder => @@ -240,7 +238,7 @@ void SubscribeToJoinedSessionAsync() CurrentUnitySession.StateChanged += OnSessionStateChanged; CurrentUnitySession.Deleted += OnSessionDeleted; CurrentUnitySession.PlayerJoined += OnPlayerJoined; - CurrentUnitySession.PlayerLeft += OnPlayerLeft; + CurrentUnitySession.PlayerHasLeft += OnPlayerHasLeft; CurrentUnitySession.RemovedFromSession += OnRemovedFromSession; CurrentUnitySession.PlayerPropertiesChanged += OnPlayerPropertiesChanged; CurrentUnitySession.SessionPropertiesChanged += OnSessionPropertiesChanged; @@ -252,7 +250,7 @@ void UnsubscribeFromJoinedSessionAsync() CurrentUnitySession.StateChanged -= OnSessionStateChanged; CurrentUnitySession.Deleted -= OnSessionDeleted; CurrentUnitySession.PlayerJoined -= OnPlayerJoined; - CurrentUnitySession.PlayerLeft -= OnPlayerLeft; + CurrentUnitySession.PlayerHasLeft -= OnPlayerHasLeft; CurrentUnitySession.RemovedFromSession -= OnRemovedFromSession; CurrentUnitySession.PlayerPropertiesChanged -= OnPlayerPropertiesChanged; CurrentUnitySession.SessionPropertiesChanged -= OnSessionPropertiesChanged; @@ -312,9 +310,9 @@ void OnPlayerJoined(string playerId) Debug.Log($"Player joined: {playerId}"); } - void OnPlayerLeft(string playerId) + void OnPlayerHasLeft(string playerId) { - Debug.Log($"Player left: {playerId}"); + Debug.Log($"Player has left: {playerId}"); } void OnRemovedFromSession() diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 94ba50c99..02c97aa8e 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31d4833f59a46db0c3c4996a6a98853ec30a4d2990c66f3d5c87ac3cd4d66e31 -size 14324 +oid sha256:a1aaae34ac488350fcf9b7d9b51cff00d9574036c0115d6d444baafb8a361c7a +size 14424 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1237536d2..4d5019688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,22 +8,23 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [Unreleased] ### Added -* Added a welcome dialog to guide users on their first time experience -* Added a Table of Contents with helpful resources, that can be accessed from the `Tutorials > Show Tutorials` menu -* Added the Multiplayer Play Mode package v1.3.1 to the project +* Added a welcome dialog to guide users on their first time experience (#888) + * Added a Table of Contents with helpful resources, that can be accessed from the `Tutorials > Show Tutorials` menu +* Added the Multiplayer Play Mode package v1.3.1 to the project (#890) ### Changed -* Upgraded Boss Room to Netcode for GameObjects v2.0.0 -* Upgraded editor version to 6000.0.25f1 +* Upgraded editor version to 6000.0.25f1 and upgraded Boss Room to Netcode for GameObjects v2.0.0 (#890) * Replaced Lobby and Relay standalone packages with the Multiplayer Services package v1.0.2 and the Sessions framework (#892) +* Upgraded editor version to 6000.0.32f1 and Multiplayer Services package to v1.1.0 (#894) + * Removed usage of ISession's deprecated PlayerLeft callback to the new PlayerHasLeft callback ### Cleanup -* Removed ParrelSync from the project +* Removed ParrelSync from the project (#890) ### Fixed * Fix a Healer ability doesn't work (#893) * Changed the way characters are oriented when using skills. - * Added the GetTotalDamage API to the IDamagble interface. This number is your maximum health minus your current health. + * Added the GetTotalDamage API to the IDamageable interface. This number is your maximum health minus your current health. * Changed the way MeleeAction selects a target when there are multiple targets to collide with. The target with the highest GetTotalDamage value (mentioned above) will be selected. diff --git a/Packages/manifest.json b/Packages/manifest.json index f7d2d8105..14badb55b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,27 +1,27 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "2.0.4", - "com.unity.cinemachine": "2.10.1", - "com.unity.collab-proxy": "2.5.2", + "com.unity.ai.navigation": "2.0.5", + "com.unity.cinemachine": "2.10.3", + "com.unity.collab-proxy": "2.6.0", "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.learn.iet-framework": "4.0.2", + "com.unity.learn.iet-framework": "4.0.3", "com.unity.learn.iet-framework.authoring": "1.2.2", "com.unity.memoryprofiler": "1.1.1", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.playmode": "1.3.1", + "com.unity.multiplayer.playmode": "1.3.2", "com.unity.multiplayer.tools": "2.2.1", "com.unity.netcode.gameobjects": "2.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.postprocessing": "3.4.0", "com.unity.render-pipelines.universal": "17.0.3", - "com.unity.services.authentication": "3.3.3", - "com.unity.services.multiplayer": "1.0.2", + "com.unity.services.authentication": "3.4.0", + "com.unity.services.multiplayer": "1.1.0", "com.unity.test-framework": "1.4.5", "com.unity.timeline": "1.8.7", - "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.9", - "com.unity.transport": "2.3.0", + "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10", + "com.unity.transport": "2.4.0", "com.unity.ugui": "2.0.0", "jp.hadashikick.vcontainer": "1.11.0", "com.unity.modules.accessibility": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index dee4f7402..0010cb48d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "2.0.4", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": { @@ -26,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.10.1", + "version": "2.10.3", "depth": 0, "source": "registry", "dependencies": { @@ -35,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.5.2", + "version": "2.6.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -86,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "4.0.2", + "version": "4.0.3", "depth": 0, "source": "registry", "dependencies": { @@ -129,7 +129,7 @@ } }, "com.unity.multiplayer.playmode": { - "version": "1.3.1", + "version": "1.3.2", "depth": 0, "source": "registry", "dependencies": { @@ -260,19 +260,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "3.3.3", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.13.0", + "com.unity.services.core": "1.14.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.13.0", + "version": "1.14.0", "depth": 1, "source": "registry", "dependencies": { @@ -300,7 +300,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.multiplayer": { - "version": "1.0.2", + "version": "1.1.0", "depth": 0, "source": "registry", "dependencies": { @@ -406,7 +406,7 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.macos-x86_64-linux-x86_64": { - "version": "2.0.9", + "version": "2.0.10", "depth": 0, "source": "registry", "dependencies": { @@ -416,7 +416,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.3.0", + "version": "2.4.0", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4f951fb4a..d1c9097a6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.25f1 -m_EditorVersionWithRevision: 6000.0.25f1 (4859ab7b5a49) +m_EditorVersion: 6000.0.32f1 +m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) diff --git a/ProjectSettings/VirtualProjectsConfig.json b/ProjectSettings/VirtualProjectsConfig.json index b20c24ea6..1c43509ad 100644 --- a/ProjectSettings/VirtualProjectsConfig.json +++ b/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.3.1" + "version": "1.3.2" } \ No newline at end of file diff --git a/README.md b/README.md index 1dd002be2..7dad572d0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### Made with and Including Utilities for Netcode for GameObjects
-[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0.25f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.25) +[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0.32f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.32) [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-2.0.0-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1) [![LatestRelease](https://img.shields.io/badge/Latest%20Github%20Release:-v2.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/releases/tag/v2.5.0)