feat: upgrade packages to recommended versions (#895)

* upgrade to 6000.0.32f1 & multiplayer services v1.1.0 bump

* packages upgraded to recommended versions, cinemachine freelook camera updated to cinemachinecamera

* changelog cleanup, changelog addition

* changelog addition

* update to changelog

* upgrading readme version badge

* updating reamde netcode version badge

* camera zoom scroll inverted, readjusted gain

* whitespace fixes

Assets/Scripts/CameraUtils/CameraController.cs

@@ -1,31 +1,41 @@
-using Cinemachine;
+using Unity.Cinemachine;
 using UnityEngine;
 using UnityEngine.Assertions;
 
 namespace Unity.BossRoom.CameraUtils
 {
     public class CameraController : MonoBehaviour
     {
-        private CinemachineFreeLook m_MainCamera;
+        const string k_CMCameraTag = "CMCamera";
 
         void Start()
         {
             AttachCamera();
         }
 
-        private void AttachCamera()
+        void AttachCamera()
         {
-            m_MainCamera = FindAnyObjectByType<CinemachineFreeLook>();
-            Assert.IsNotNull(m_MainCamera, "CameraController.AttachCamera: Couldn't find gameplay freelook camera");
+            var cinemachineCameraGameObject = GameObject.FindGameObjectWithTag(k_CMCameraTag);
+            Assert.IsNotNull(cinemachineCameraGameObject);
 
-            if (m_MainCamera)
+            var cinemachineCamera = cinemachineCameraGameObject.GetComponent<CinemachineCamera>();
+            Assert.IsNotNull(cinemachineCamera, "CameraController.AttachCamera: Couldn't find gameplay CinemachineCamera");
+
+            if (cinemachineCamera != null)
             {
                 // camera body / aim
-                m_MainCamera.Follow = transform;
-                m_MainCamera.LookAt = transform;
+                cinemachineCamera.Follow = transform;
+                cinemachineCamera.LookAt = transform;
+            }
+
+            var cinemachineOrbitalFollow = cinemachineCameraGameObject.GetComponent<CinemachineOrbitalFollow>();
+            Assert.IsNotNull(cinemachineOrbitalFollow, "CameraController.AttachCamera: Couldn't find gameplay CinemachineOrbitalFollow");
+
+            if (cinemachineOrbitalFollow != null)
+            {
                 // default rotation / zoom
-                m_MainCamera.m_Heading.m_Bias = 40f;
-                m_MainCamera.m_YAxis.Value = 0.5f;
+                cinemachineOrbitalFollow.HorizontalAxis.Value = 40f;
+                cinemachineOrbitalFollow.VerticalAxis.Value = 0.5f;
             }
         }
     }

Assets/Scripts/CameraUtils/Unity.BossRoom.CameraUtils.asmdef

@@ -2,7 +2,7 @@
     "name": "Unity.BossRoom.CameraUtils",
     "rootNamespace": "",
     "references": [
-        "Cinemachine"
+        "Unity.Cinemachine"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -13,4 +13,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}

CHANGELOG.md

@@ -17,6 +17,11 @@ Additional documentation and release notes are available at [Multiplayer Documen
 * 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
+* Upgraded several packages to their recommended versions (#895) They include:
+  * com.unity.cinemachine from v2.10.3 to v3.1.2. Camera using deprecated CinemachineFreeLook component has been re-implemented with CinemachineCamera component
+  * com.unity.multiplayer.playmode from v1.3.2 to v1.3.3
+  * com.unity.multiplayer.tools from v2.2.1 to v2.2.3
+  * com.unity.netcode.gameobjects from v2.0.0 to v2.1.1
 
 ### Cleanup
 * Removed ParrelSync from the project (#890)
@@ -27,7 +32,6 @@ Additional documentation and release notes are available at [Multiplayer Documen
   * 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.
 
-
 ## [2.5.0] - 2024-04-18
 
 ### Changed

Packages/manifest.json

@@ -2,18 +2,18 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ai.navigation": "2.0.5",
-    "com.unity.cinemachine": "2.10.3",
+    "com.unity.cinemachine": "3.1.2",
     "com.unity.collab-proxy": "2.6.0",
-    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.rider": "3.0.34",
     "com.unity.ide.visualstudio": "2.0.22",
     "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.memoryprofiler": "1.1.3",
     "com.unity.multiplayer.center": "1.0.0",
-    "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.multiplayer.playmode": "1.3.3",
+    "com.unity.multiplayer.tools": "2.2.3",
+    "com.unity.netcode.gameobjects": "2.1.1",
+    "com.unity.performance.profile-analyzer": "1.2.3",
     "com.unity.postprocessing": "3.4.0",
     "com.unity.render-pipelines.universal": "17.0.3",
     "com.unity.services.authentication": "3.4.0",

Packages/packages-lock.json

@@ -26,11 +26,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.cinemachine": {
-      "version": "2.10.3",
+      "version": "3.1.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.31"
+        "com.unity.splines": "2.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -68,7 +68,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.31",
+      "version": "3.0.34",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -112,10 +112,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.memoryprofiler": {
-      "version": "1.1.1",
+      "version": "1.1.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.burst": "1.8.0",
+        "com.unity.collections": "1.2.3",
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.profiling.core": "1.0.0",
         "com.unity.editorcoroutines": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -129,7 +133,7 @@
       }
     },
     "com.unity.multiplayer.playmode": {
-      "version": "1.3.2",
+      "version": "1.3.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -148,13 +152,13 @@
       }
     },
     "com.unity.multiplayer.tools": {
-      "version": "2.2.1",
+      "version": "2.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.burst": "1.8.17",
-        "com.unity.collections": "2.4.0",
-        "com.unity.mathematics": "1.3.1",
+        "com.unity.burst": "1.8.18",
+        "com.unity.collections": "2.5.1",
+        "com.unity.mathematics": "1.3.2",
         "com.unity.profiling.core": "1.0.2",
         "com.unity.nuget.mono-cecil": "1.11.4",
         "com.unity.modules.uielements": "1.0.0",
@@ -163,7 +167,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "2.0.0",
+      "version": "2.1.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -187,7 +191,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.performance.profile-analyzer": {
-      "version": "1.2.2",
+      "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -356,6 +360,16 @@
         "com.unity.searcher": "4.9.2"
       }
     },
+    "com.unity.splines": {
+      "version": "2.7.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.settings-manager": "1.0.3"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.sysroot": {
       "version": "2.0.10",
       "depth": 1,

ProjectSettings/VirtualProjectsConfig.json

@@ -1,4 +1,4 @@
 {
   "PlayerTags": [],
-  "version": "1.3.2"
+  "version": "1.3.3"
 }

README.md

@@ -6,7 +6,7 @@
 <br>
 
 [![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)
+[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-2.1.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F2.1.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)
 <br><br>