merge develop

Unity-Technologies · Jan 15, 2025 · e460e1b · e460e1b
2 parents 03c7a24 + 93db2a7
commit e460e1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab
@@ -292,7 +292,7 @@ MonoBehaviour:
       Enabled: 1
       Input:
         LegacyInput: Mouse ScrollWheel
-        LegacyGain: 5
+        LegacyGain: -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