free rotate camera

Assets/AudioMixer.mixer

@@ -0,0 +1,144 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!243 &-5985036292871575848
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Music
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 5bdfe230200494b4dba2d07588c7c60d
+  m_Children: []
+  m_Volume: 831694893cecc104e83cd13eec93d28c
+  m_Pitch: 5aeb6a175f195024a87861062e2ec1b0
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: -5067953075322291121}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &-5067953075322291121
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 87ce651d7c89cfa44afcecbb0fff4abd
+  m_EffectName: Attenuation
+  m_MixLevel: df4b34f13069a454cb0de1361d5c4099
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!241 &24100000
+AudioMixerController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: AudioMixer
+  m_OutputGroup: {fileID: 0}
+  m_MasterGroup: {fileID: 24300002}
+  m_Snapshots:
+  - {fileID: 24500006}
+  m_StartSnapshot: {fileID: 24500006}
+  m_SuspendThreshold: -80
+  m_EnableSuspend: 1
+  m_UpdateMode: 0
+  m_ExposedParameters:
+  - guid: 8e54073feec66d24c8b5b5321b86da6f
+    name: MasterVolume
+  - guid: 831694893cecc104e83cd13eec93d28c
+    name: MusicVolume
+  - guid: 97cc39ce50c2b85439b8361ceae3f4c6
+    name: SFXVolume
+  m_AudioMixerGroupViews:
+  - guids:
+    - 1647cf21931ffb4409abd5f86b5ba22b
+    - 5bdfe230200494b4dba2d07588c7c60d
+    - 306f67f3e059d2c4aaaef306930b737e
+    name: View
+  m_CurrentViewIndex: 0
+  m_TargetSnapshot: {fileID: 24500006}
+--- !u!243 &24300002
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Master
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 1647cf21931ffb4409abd5f86b5ba22b
+  m_Children:
+  - {fileID: -5985036292871575848}
+  - {fileID: 3079392121493439853}
+  m_Volume: 8e54073feec66d24c8b5b5321b86da6f
+  m_Pitch: f023bc3b372a9df469e34b83fc9efc66
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 24400004}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &24400004
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: bdd917cc2a7b59c45a66df37be3e3489
+  m_EffectName: Attenuation
+  m_MixLevel: c9d36b6a18286a8449cc204da4cc3140
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!245 &24500006
+AudioMixerSnapshotController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Snapshot
+  m_AudioMixer: {fileID: 24100000}
+  m_SnapshotID: 8474d9129ecb5954ea867453e7561687
+  m_FloatValues: {}
+  m_TransitionOverrides: {}
+--- !u!243 &3079392121493439853
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SFX
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 306f67f3e059d2c4aaaef306930b737e
+  m_Children: []
+  m_Volume: 97cc39ce50c2b85439b8361ceae3f4c6
+  m_Pitch: 9119b1dfcb88e4e4c917090c57fa1680
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 5127884578886668124}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &5127884578886668124
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 0f75e42fe6e091c4ca36a6aa676fff0f
+  m_EffectName: Attenuation
+  m_MixLevel: 45c4e84286ed5a345b779472c0df9874
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0

Assets/AudioMixer.mixer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3490106d3e6edc143b9179d3107780dd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 24100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DebugUtilities.cs

@@ -0,0 +1,50 @@
+using UnityEngine;
+
+public static class DebugUtilities
+{
+    /// <summary>
+    /// Draws a wire sphere using Debug.DrawLine for runtime visibility.
+    /// </summary>
+    public static void DrawWireSphere(Vector3 center, float radius, Color color, float duration, int quality = 3)
+    {
+        quality = Mathf.Clamp(quality, 1, 10);
+        int segments = quality << 2;
+        int subdivisions = quality << 3;
+        int halfSegments = segments >> 1;
+        float strideAngle = 360f / subdivisions;
+        float segmentStride = 180f / segments;
+
+        Vector3 first;
+        Vector3 next;
+
+        // Draw meridians (vertical circles)
+        for (int i = 0; i < segments; i++)
+        {
+            first = (Vector3.forward * radius);
+            first = Quaternion.AngleAxis(segmentStride * (i - halfSegments), Vector3.right) * first;
+
+            for (int j = 0; j < subdivisions; j++)
+            {
+                next = Quaternion.AngleAxis(strideAngle, Vector3.up) * first;
+                Debug.DrawLine(first + center, next + center, color, duration);
+                first = next;
+            }
+        }
+
+        // Draw parallels (horizontal circles)
+        Vector3 axis;
+        for (int i = 0; i < segments; i++)
+        {
+            first = (Vector3.forward * radius);
+            first = Quaternion.AngleAxis(segmentStride * (i - halfSegments), Vector3.up) * first;
+            axis = Quaternion.AngleAxis(90f, Vector3.up) * first;
+
+            for (int j = 0; j < subdivisions; j++)
+            {
+                next = Quaternion.AngleAxis(strideAngle, axis) * first;
+                Debug.DrawLine(first + center, next + center, color, duration);
+                first = next;
+            }
+        }
+    }
+}

Assets/DebugUtilities.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 933aa2a82d546964cb7e1a8e7a1e007f

Assets/Doug.prefab

@@ -1547,7 +1547,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.30070576, y: -0, z: -0, w: 0.953717}
   m_LocalPosition: {x: -0.35901004, y: 47.8, z: -70.2}
-  m_LocalScale: {x: 1, y: 0.78067374, z: 1.6579802}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6872729306491234319}
@@ -2147,13 +2147,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5784121484016646142}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.000000028422978, z: 0.000000008961729, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2119885955527004040}
-  m_LocalEulerAnglesHint: {x: 35, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!20 &7814557473141052265
 Camera:
   m_ObjectHideFlags: 0
@@ -3155,6 +3155,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 34a2af7866b6ecc4ab5f2b6222f7dbe2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::CameraController
+  MainCamera: {fileID: 7814557473141052265}
+  mouseSensitivity: 1000
+  minPitch: 10
+  maxPitch: 60
+  distance: 6
+  heightOffset: -0.5
+  followSpeed: 1000
+  maxZoom: 6
+  minZoom: 1
   playerCamHome: {fileID: 2119885955527004040}
 --- !u!114 &5412473048133157928
 MonoBehaviour:

Assets/GameManager.prefab

@@ -573,3 +573,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab14394efecbd6540af369ced75e81d0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::SoundSettingManager
+  audioMixer: {fileID: 24100000, guid: 3490106d3e6edc143b9179d3107780dd, type: 2}

Assets/Scenes/SampleScene.unity

@@ -1822,6 +1822,11 @@ Transform:
   m_Children: []
   m_Father: {fileID: 265036979}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &509486404 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 7814557473141052265, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+  m_PrefabInstance: {fileID: 7959480261809233915}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &562959765
 GameObject:
   m_ObjectHideFlags: 0
@@ -3610,17 +3615,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &1733921841 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5478143440182735446, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
-  m_PrefabInstance: {fileID: 7959480261809233915}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 34a2af7866b6ecc4ab5f2b6222f7dbe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::CameraController
 --- !u!1 &1735546792
 GameObject:
   m_ObjectHideFlags: 0
@@ -3979,17 +3973,6 @@ Transform:
   - {fileID: 1210745724}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1898647305 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5836996391021161412, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
-  m_PrefabInstance: {fileID: 6325623361260993107}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3ba23d5f6c337c34caaac9a4d8aab191, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::MenuScreen
 --- !u!1 &1966866168
 GameObject:
   m_ObjectHideFlags: 0
@@ -4329,6 +4312,10 @@ PrefabInstance:
       propertyPath: dialogueText
       value: 
       objectReference: {fileID: 2063514703}
+    - target: {fileID: 1410439939888368689, guid: 9f59bbee72927d649b032622c1c0f2f5, type: 3}
+      propertyPath: audioMixer
+      value: 
+      objectReference: {fileID: 24100000, guid: 3490106d3e6edc143b9179d3107780dd, type: 2}
     - target: {fileID: 5519027142145697695, guid: 9f59bbee72927d649b032622c1c0f2f5, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -4398,22 +4385,10 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4155624016714589187, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -259.2
-      objectReference: {fileID: 0}
     - target: {fileID: 4264548731807291060, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4265459964761688869, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 27
-      objectReference: {fileID: 0}
-    - target: {fileID: 4906462856215206936, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -195
-      objectReference: {fileID: 0}
     - target: {fileID: 5101319162034548862, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -4422,14 +4397,6 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6476180199089286077, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
-      propertyPath: screens.Array.size
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 6476180199089286077, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
-      propertyPath: 'screens.Array.data[3]'
-      value: 
-      objectReference: {fileID: 1898647305}
     - target: {fileID: 6792308726050395253, guid: 6d1ef2b53d3ef0446852da522af66b73, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -4492,10 +4459,30 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1480974628599415149, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+    - target: {fileID: 2119885955527004040, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
-      propertyPath: cameraController
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2119885955527004040, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5478143440182735446, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: minPitch
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5478143440182735446, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: MainCamera
       value: 
-      objectReference: {fileID: 1733921841}
+      objectReference: {fileID: 509486404}
+    - target: {fileID: 5478143440182735446, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: followSpeed
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: 5478143440182735446, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: mouseSensitivity
+      value: 1000
+      objectReference: {fileID: 0}
     - target: {fileID: 5526037850913171920, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.60945
@@ -4536,6 +4523,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6872729306491234319, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872729306491234319, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872729306491234319, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872729306491234319, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9054701043111961555, guid: 0fd9b22e9158e474a96c42de5ee0d85f, type: 3}
       propertyPath: m_Name
       value: Doug

Assets/Scripts/Management/CameraController.cs

@@ -2,17 +2,46 @@
 using System.Linq;
 using Unity.VisualScripting;
 using UnityEngine;
+using static UnityEngine.GraphicsBuffer;
 
 public class CameraController : MonoBehaviour
 {
     public float camTargetRotation { get; private set; } = 0;
+    public CameraControlMode CamControlMode { get; private set; } = CameraControlMode.SnapRotate;
+    public Camera MainCamera;
+
     private bool isCamRotating = false;
 
+    [Header("Free Cam Settings")]
+    public float mouseSensitivity = 200f;
+    public float minPitch = -30f;
+    public float maxPitch = 60f;
+    public float distance = 6f;
+    public float heightOffset = -0.5f;
+    public float followSpeed = 10f;
+    public float maxZoom = 6f;
+    public float minZoom = 1f;
+    private float zoom = 2.3f;
+    private float yaw;
+    private float pitch;
+
     public Transform playerCamHome;
+    Transform dougBody;
 
     private void Update()
     {
-        HandleCamRotation();
+        if (Input.GetMouseButton(1))
+        {
+            HandleFreeCamRotation();
+        }
+    }
+
+    void Start()
+    {
+        Vector3 angles = transform.eulerAngles;
+
+        yaw = angles.y;
+        pitch = angles.x;
     }
 
     /// <summary>
@@ -31,26 +60,27 @@ public void RotateCam()
     /// <summary>
     /// Set cam rotation immediately
     /// </summary>
-    public void SnapToRotation(float rotation)
+    void SnapToRotation(float rotation)
     {
-        playerCamHome.RotateAround(
+        if (CamControlMode == CameraControlMode.SnapRotate)
-            transform.position,
+        {
-            Vector3.up,
+            playerCamHome.RotateAround(
-            rotation
+                transform.position,
-        );
+                Vector3.up,
+                rotation
+            );
 
-        camTargetRotation = rotation;
+            camTargetRotation = rotation;
+        }
     }
 
     /// <summary>
     /// Move cam to desired rotation (every frame)
     /// </summary>
-    void HandleCamRotation()
+    void HandleSnapCamRotation()
     {
         float currentY = playerCamHome.transform.rotation.eulerAngles.y;
-
         float step = 200 * Time.deltaTime;
-
         float newY = Mathf.MoveTowardsAngle(currentY, camTargetRotation, step);
 
         playerCamHome.RotateAround(
@@ -64,4 +94,56 @@ void HandleCamRotation()
             isCamRotating = false;
         }
     }
+
+    /// <summary>
+    /// Move cam to desired free rotation (every frame)
+    /// </summary>
+    void HandleFreeCamRotation()
+    {
+        if (dougBody == null)
+        {
+            dougBody = GameManager.Instance.PlayerController.DougBody.transform;
+        }
+
+        Vector3 target = new Vector3(dougBody.position.x, dougBody.position.y + heightOffset, dougBody.position.z);
+
+        // Mouse Input
+        float mouseX = Input.GetAxis("Mouse X");
+        float mouseY = Input.GetAxis("Mouse Y");
+
+        yaw += mouseX * mouseSensitivity * Time.deltaTime;
+        pitch -= mouseY * mouseSensitivity * Time.deltaTime;
+
+        pitch = Mathf.Clamp(pitch, minPitch, maxPitch);
+
+        // Zoom
+        float scroll = Input.GetAxis("Mouse ScrollWheel");
+
+        zoom -= scroll * 2f;
+        zoom = Mathf.Clamp(zoom, minZoom, maxZoom);
+        MainCamera.orthographicSize = zoom;
+
+        // Rotation
+        Quaternion rotation = Quaternion.Euler(pitch, yaw, 0);
+
+        // Desired Position
+        Vector3 offset = rotation * Vector3.forward * -distance;
+        Vector3 desiredPosition = target + offset;
+
+        // Smooth Follow
+        playerCamHome.transform.position = Vector3.Lerp(
+            playerCamHome.transform.position,
+            desiredPosition,
+            followSpeed * Time.deltaTime
+        );
+
+        // Look at player
+        playerCamHome.transform.LookAt(target + Vector3.up);
+    }
+}
+
+public enum CameraControlMode
+{
+    SnapRotate,
+    FreeRotate
 }

Assets/Scripts/Management/PlayerController.cs

@@ -47,6 +47,7 @@ void Update()
         {
             if (!paused)
             {
+                Cursor.lockState = CursorLockMode.None;
                 Time.timeScale = 0;
                 canUseTools = false;
                 hasControl = false;
@@ -73,18 +74,6 @@ void Update()
 
             CheckWeaponChange();
             ApplyWalk();
-
-            // TODO: This is just for testing, remove or clean up if used
-            if (Input.GetKeyDown(KeyCode.Q))
-            {
-                cameraController.RotateCam();
-            }
-
-            // TODO: Add actual save feature later, this is just for test
-            if (Input.GetKeyDown(KeyCode.I))
-            {
-                SaveSystem.Save();
-            }
         }
 
         if (canUseTools)

Assets/Scripts/Management/PlayerManager.cs

@@ -10,7 +10,6 @@ public class PlayerManager : MonoBehaviour
     public void SavePlayerData(ref PlayerSaveData data)
     {
         data.activeToolIndex = GameManager.Instance.PlayerManager.CurrentToolIndex;
-        data.camRotation = GameManager.Instance.PlayerController.cameraController.camTargetRotation;
         data.dougPosition = GameManager.Instance.PlayerController.transform.position;
         data.currentScene = SceneManager.GetActiveScene().name;
     }
@@ -24,7 +23,6 @@ public void LoadPlayerData(PlayerSaveData data)
         else
         {
             GameManager.Instance.PlayerManager.CurrentToolIndex = data.activeToolIndex;
-            GameManager.Instance.PlayerController.cameraController.SnapToRotation(data.camRotation);
             GameManager.Instance.PlayerController.transform.position = data.dougPosition;
         }
     }
@@ -35,7 +33,6 @@ public void LoadPlayerData(PlayerSaveData data)
 public struct PlayerSaveData
 {
     public int activeToolIndex;
-    public float camRotation;
     public Vector3 dougPosition;
     public string currentScene;
 }

Assets/Scripts/Management/SoundSettingManager.cs

@@ -1,9 +1,12 @@
 using UnityEngine;
+using UnityEngine.Audio;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class SoundSettingManager : MonoBehaviour
 {
+    public AudioMixer audioMixer;
+
     float masterVolume;
     float musicVolume;
     float sfxVolume;
@@ -28,21 +31,40 @@ public void ReloadReferences()
         MasterSlider.onValueChanged.AddListener(OnMasterValueChanged);
         SfxSlider.onValueChanged.AddListener(OnSfxValueChanged);
         MusicSlider.onValueChanged.AddListener(OnMusicValueChanged);
+
+        MasterSlider.value = masterVolume;
+        SfxSlider.value = sfxVolume;
+        MusicSlider.value = musicVolume;
     }
 
     public void OnMasterValueChanged(float newValue)
     {
         masterVolume = newValue;
+        SetVolumeFloat(newValue, "MasterVolume");
     }
 
     public void OnSfxValueChanged(float newValue)
     {
         sfxVolume = newValue;
+        SetVolumeFloat(newValue, "SFXVolume");
     }
 
     public void OnMusicValueChanged(float newValue)
     {
         musicVolume = newValue;
+        SetVolumeFloat(newValue, "MusicVolume");
+    }
+
+    private void SetVolumeFloat(float sliderVal, string mixerGroup)
+    {
+        // Convert linear 0-1 to dB (-80 to 0 range)
+        float dbValue = Mathf.Log10(sliderVal) * 20;
+        if (sliderVal == 0)
+        {
+            dbValue = -80;
+        }
+        
+        audioMixer.SetFloat(mixerGroup, dbValue);
     }
 
     #region Sound Settings Data Save/Load
@@ -55,9 +77,17 @@ public void SaveSoundSettingsData(ref SoundSettingSaveData data)
 
     public void LoadSoundSettingsData(SoundSettingSaveData data)
     {
-       musicVolume = data.musicVolume;
+        musicVolume = data.musicVolume;
-       sfxVolume = data.sfxVolume;
+        sfxVolume = data.sfxVolume;
-       masterVolume = data.masterVolume;
+        masterVolume = data.masterVolume;
+
+        MasterSlider.value = masterVolume;
+        SfxSlider.value = sfxVolume;
+        MusicSlider.value = musicVolume;
+
+        SetVolumeFloat(masterVolume, "MasterVolume");
+        SetVolumeFloat(musicVolume, "MusicVolume");
+        SetVolumeFloat(sfxVolume, "SFXVolume");
     } 
     #endregion
 }

Assets/Settings/DefaultVolumeProfile.asset

@@ -342,6 +342,9 @@ MonoBehaviour:
   skyOcclusionIntensityMultiplier:
     m_OverrideState: 1
     m_Value: 1
+  worldOffset:
+    m_OverrideState: 1
+    m_Value: {x: 0, y: 0, z: 0}
 --- !u!114 &-1216621516061285780
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -376,6 +379,9 @@ MonoBehaviour:
   highQualityFiltering:
     m_OverrideState: 1
     m_Value: 0
+  filter:
+    m_OverrideState: 1
+    m_Value: 0
   downscale:
     m_OverrideState: 1
     m_Value: 0
@@ -462,8 +468,6 @@ MonoBehaviour:
   - {fileID: -6288072647309666549}
   - {fileID: 7518938298396184218}
   - {fileID: -1410297666881709256}
-  - {fileID: -7750755424749557576}
-  - {fileID: -5139089513906902183}
 --- !u!114 &853819529557874667
 MonoBehaviour:
   m_ObjectHideFlags: 3

Assets/UI.prefab

@@ -1479,9 +1479,9 @@ Transform:
   m_LocalScale: {x: 1.7391305, y: 1.7391305, z: 1.7391305}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5210793787358148244}
   - {fileID: 3172362146895278104}
   - {fileID: 8838351739978356113}
+  - {fileID: 5210793787358148244}
   - {fileID: 4317687165807747350}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Packages/manifest.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.unity.ai.navigation": "2.0.9",
+    "com.unity.cinemachine": "3.1.6",
     "com.unity.collab-proxy": "2.10.2",
     "com.unity.ide.visualstudio": "2.0.25",
     "com.unity.render-pipelines.universal": "17.3.0",

Packages/packages-lock.json

@@ -19,6 +19,16 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cinemachine": {
+      "version": "3.1.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.splines": "2.0.0",
+        "com.unity.modules.imgui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.collab-proxy": {
       "version": "2.10.2",
       "depth": 0,
@@ -107,6 +117,13 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.settings-manager": {
+      "version": "2.1.1",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.shadergraph": {
       "version": "17.3.0",
       "depth": 1,
@@ -116,6 +133,17 @@
         "com.unity.searcher": "4.9.3"
       }
     },
+    "com.unity.splines": {
+      "version": "2.8.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.settings-manager": "1.0.3"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
       "version": "1.6.0",
       "depth": 1,