merge develop

fernando-cortez · fernando-cortez · commit 0ea0c46e3a02 · 2025-01-15T14:34:49.000-05:00
diff --git a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab b/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:
diff --git a/Assets/Scripts/CameraUtils/CameraController.cs b/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
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9783b734e1a87fb1b78db7e595c21cd6a2181cd9a79b8d5c30c3d7d208ba2ac
+oid sha256:a1aaae34ac488350fcf9b7d9b51cff00d9574036c0115d6d444baafb8a361c7a
 size 14424

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Unity.BossRoom.CameraUtils`
`7`	`7`	`public class CameraController : MonoBehaviour`
`8`	`8`	`{`
`9`	`9`	`const string k_CMCameraTag = "CMCamera";`
`10`		`-`
	`10`	`+`
`11`	`11`	`void Start()`
`12`	`12`	`{`
`13`	`13`	`AttachCamera();`
`@@ -17,7 +17,7 @@ void AttachCamera()`
`17`	`17`	`{`
`18`	`18`	`var cinemachineCameraGameObject = GameObject.FindGameObjectWithTag(k_CMCameraTag);`
`19`	`19`	`Assert.IsNotNull(cinemachineCameraGameObject);`
`20`		`-`
	`20`	`+`
`21`	`21`	`var cinemachineCamera = cinemachineCameraGameObject.GetComponent<CinemachineCamera>();`
`22`	`22`	`Assert.IsNotNull(cinemachineCamera, "CameraController.AttachCamera: Couldn't find gameplay CinemachineCamera");`
`23`	`23`
`@@ -27,10 +27,10 @@ void AttachCamera()`
`27`	`27`	`cinemachineCamera.Follow = transform;`
`28`	`28`	`cinemachineCamera.LookAt = transform;`
`29`	`29`	`}`
`30`		`-`
	`30`	`+`
`31`	`31`	`var cinemachineOrbitalFollow = cinemachineCameraGameObject.GetComponent<CinemachineOrbitalFollow>();`
`32`	`32`	`Assert.IsNotNull(cinemachineOrbitalFollow, "CameraController.AttachCamera: Couldn't find gameplay CinemachineOrbitalFollow");`
`33`		`-`
	`33`	`+`
`34`	`34`	`if (cinemachineOrbitalFollow != null)`
`35`	`35`	`{`
`36`	`36`	`// default rotation / zoom`