merge develop

Author: fernando-cortez

Assets/Prefabs/GameCam/CMCameraPrefab.prefab

@@ -292,7 +292,7 @@ MonoBehaviour:
       Enabled: 1
       Input:
         InputAction: {fileID: -5536139033653354306, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
-        Gain: 1
+        Gain: -50
         CancelDeltaTime: 0
       InputValue: 0
       Driver:

Assets/Scripts/CameraUtils/CameraController.cs

@@ -7,7 +7,7 @@ namespace Unity.BossRoom.CameraUtils
     public class CameraController : MonoBehaviour
     {
         const string k_CMCameraTag = "CMCamera";
-        
+
         void Start()
         {
             AttachCamera();
@@ -17,7 +17,7 @@ void AttachCamera()
         {
             var cinemachineCameraGameObject = GameObject.FindGameObjectWithTag(k_CMCameraTag);
             Assert.IsNotNull(cinemachineCameraGameObject);
-            
+
             var cinemachineCamera = cinemachineCameraGameObject.GetComponent<CinemachineCamera>();
             Assert.IsNotNull(cinemachineCamera, "CameraController.AttachCamera: Couldn't find gameplay CinemachineCamera");
 
@@ -27,10 +27,10 @@ void AttachCamera()
                 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

Assets/UniversalRenderPipelineGlobalSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9783b734e1a87fb1b78db7e595c21cd6a2181cd9a79b8d5c30c3d7d208ba2ac
+oid sha256:a1aaae34ac488350fcf9b7d9b51cff00d9574036c0115d6d444baafb8a361c7a
 size 14424