Skip to content

Commit 93db2a7

Browse files
fernando-cortezfernando-cortez
authored
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
1 parent 7e8de47 commit 93db2a7

18 files changed

+276
-717
lines changed

‎Assets/Prefabs/GameCam/CMCameraPrefab.prefab‎

Lines changed: 194 additions & 666 deletions
Large diffs are not rendered by default.

‎Assets/Scenes/BossRoom.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c8fd7364ea33eec42ccd63498e270396c9b2ab90b9bd4bd9128fd68841e899de
3-
size 423109
2+
oid sha256:563f5ab263d3a1bc25ef209e45ac203c29d5f727a3c4204c8939adb1abebccdb
3+
size 426863

‎Assets/Scenes/BossRoom/DungeonBossRoom.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d0f0ddaaf10020f714dc598e2ffd877f0d57cb6e01a70b5bf5725aa95836ee06
3-
size 335325
2+
oid sha256:62fb49820dd395603c4ed3c6a3eed0497fafd4e799b58d630eb996c84e9e78e1
3+
size 340011

‎Assets/Scenes/BossRoom/DungeonEntrance.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c544a225b24708e42ffe92d2ab9282608236c7a1ba6d984ef64a88f90978557d
3-
size 33086
2+
oid sha256:2e754825749cbdff6a94176d031686e9ba6918b5fd9b89937e30bc7120d90998
3+
size 35122

‎Assets/Scenes/BossRoom/DungeonTransition.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fd06bcd32ee6eddef987ad17d127ff54710fc0b83e8b65246741f31965c6f9eb
3-
size 26310
2+
oid sha256:c9ddbb20b51266d5d0bca5e4ca52df58929a8af4a84f736c129e629f96291382
3+
size 28071

‎Assets/Scenes/PostGame.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7c1bbe694d33663c96391988b7b4e69027a71307724e12e85752bcd162542834
3-
size 34942
2+
oid sha256:9f6d043b0d737b156218d82153c0068bda1b8af7cf40d1acdf13adc7356e6ae8
3+
size 34859

‎Assets/Scenes/Startup.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:ea9671f269c2d6dba887663ac41841dc02c4d22d34e302dfcc6cba4c458a3cf1
3-
size 60038
2+
oid sha256:051baee2f7626476a45adae7ef3ae46e1d2e63ecd142ccc36a7cd7859335e57e
3+
size 60061

‎Assets/Scripts/CameraUtils/CameraController.cs‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
1-
using Cinemachine;
1+
using Unity.Cinemachine;
22
using UnityEngine;
33
using UnityEngine.Assertions;
44

55
namespace Unity.BossRoom.CameraUtils
66
{
77
public class CameraController : MonoBehaviour
88
{
9-
private CinemachineFreeLook m_MainCamera;
9+
const string k_CMCameraTag = "CMCamera";
1010

1111
void Start()
1212
{
1313
AttachCamera();
1414
}
1515

16-
private void AttachCamera()
16+
void AttachCamera()
1717
{
18-
m_MainCamera = FindAnyObjectByType<CinemachineFreeLook>();
19-
Assert.IsNotNull(m_MainCamera, "CameraController.AttachCamera: Couldn't find gameplay freelook camera");
18+
var cinemachineCameraGameObject = GameObject.FindGameObjectWithTag(k_CMCameraTag);
19+
Assert.IsNotNull(cinemachineCameraGameObject);
2020

21-
if (m_MainCamera)
21+
var cinemachineCamera = cinemachineCameraGameObject.GetComponent<CinemachineCamera>();
22+
Assert.IsNotNull(cinemachineCamera, "CameraController.AttachCamera: Couldn't find gameplay CinemachineCamera");
23+
24+
if (cinemachineCamera != null)
2225
{
2326
// camera body / aim
24-
m_MainCamera.Follow = transform;
25-
m_MainCamera.LookAt = transform;
27+
cinemachineCamera.Follow = transform;
28+
cinemachineCamera.LookAt = transform;
29+
}
30+
31+
var cinemachineOrbitalFollow = cinemachineCameraGameObject.GetComponent<CinemachineOrbitalFollow>();
32+
Assert.IsNotNull(cinemachineOrbitalFollow, "CameraController.AttachCamera: Couldn't find gameplay CinemachineOrbitalFollow");
33+
34+
if (cinemachineOrbitalFollow != null)
35+
{
2636
// default rotation / zoom
27-
m_MainCamera.m_Heading.m_Bias = 40f;
28-
m_MainCamera.m_YAxis.Value = 0.5f;
37+
cinemachineOrbitalFollow.HorizontalAxis.Value = 40f;
38+
cinemachineOrbitalFollow.VerticalAxis.Value = 0.5f;
2939
}
3040
}
3141
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Unity.BossRoom.CameraUtils",
33
"rootNamespace": "",
44
"references": [
5-
"Cinemachine"
5+
"Unity.Cinemachine"
66
],
77
"includePlatforms": [],
88
"excludePlatforms": [],
@@ -13,4 +13,4 @@
1313
"defineConstraints": [],
1414
"versionDefines": [],
1515
"noEngineReferences": false
16-
}
16+
}

‎Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:ec3b54e2206ca1aca321f2f0b9961bf14937f8e15821aa8342e45835b965db81
3-
size 3504
2+
oid sha256:61fd1498ae417613b1e4fc43d90f62a1a8eacb61953ed8defc91082077be5148
3+
size 4361

0 commit comments

Comments
 (0)