Uppdatering av PlayerControls

2026-09-16 19:50:16 +02:00
parent 351a04974f
commit e3a089d034
10 changed files with 224 additions and 173 deletions
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -16,6 +16,8 @@ public class BallController : MonoBehaviour {
    float _jumpForce;
    Rigidbody _ball;
    float _outOfBounds = -1.8f;
+    private Vector2 _moveInput;
+    private PlayerControls _controls;

    void Start() {
        _ball = GetComponent<Rigidbody>();
@@ -25,9 +27,43 @@ public class BallController : MonoBehaviour {
        _pickupLeft = GameObject.FindGameObjectsWithTag("PickUp").Length;
        transform.position = new Vector3(0, 0.5f, 0);
    }
+    private void Awake() {
+        _controls = new PlayerControls();
+    }
+    private void OnEnable() {
+        _controls.Enable();
+
+        _controls.Player.Move.performed += ctx =>
+            _moveInput = ctx.ReadValue<Vector2>();
+
+        _controls.Player.Move.canceled += ctx =>
+            _moveInput = Vector2.zero;
+
+        _controls.Player.Jump.performed += ctx => {
+            Debug.Log("SPACE TRYCKT");
+            if (transform.position.y < 1) {
+                _ball.AddForce(Vector3.up * _jumpForce);
+            }
+        };
+    }
+    
+    public void OnMove(InputAction.CallbackContext context) {
+        _moveInput = context.ReadValue<Vector2>();
+    }
+
+    private void FixedUpdate() {
+        Vector3 direction =
+            new Vector3(_moveInput.x, 0, _moveInput.y);
+
+        _ball.AddForce(direction * _ballSpeed);
+
+        if (direction == Vector3.zero) {
+            _ball.AddForce(-_ball.linearVelocity * _brakeForce);
+        }
+    }
    
    void Update() {
-        KeyHandler();
+        //KeyHandler();
        CheckPlayerOut();
        UpdateGUI();
    }
@@ -60,6 +96,7 @@ public class BallController : MonoBehaviour {
        }
    }

+    /*
    void KeyHandler() {
        if (Keyboard.current.wKey.isPressed) {
            _ball.AddForce(Vector3.forward * _ballSpeed);
@@ -80,4 +117,5 @@ public class BallController : MonoBehaviour {
            _ball.AddForce(-_ball.linearVelocity * _brakeForce);
        }
    }
+    */
 }
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -19,9 +19,10 @@ MonoBehaviour:
    m_StripRuntimeDebugShaders: 1
  m_URPShaderStrippingSetting:
    m_Version: 0
-    m_StripUnusedPostProcessingVariants: 1
+    m_StripUnusedPostProcessingVariantsAndResources: 1
    m_StripUnusedVariants: 1
    m_StripScreenCoordOverrideVariants: 1
+    m_Strip2DUnusedVariants: 0
  m_ShaderVariantLogLevel: 0
  m_ExportShaderVariants: 1
  m_StripDebugVariants: 1
@@ -67,9 +68,12 @@ MonoBehaviour:
      - rid: 1704570155956699148
      - rid: 1704570155956699149
      - rid: 1704570155956699150
+      - rid: 3844770271378276352
+      - rid: 3844770271378276353
+      - rid: 3844770271378276354
    m_RuntimeSettings:
      m_List: []
-  m_AssetVersion: 10
+  m_AssetVersion: 11
  m_ObsoleteDefaultVolumeProfile: {fileID: 0}
  m_RenderingLayerNames:
  - Light Layer default
@@ -210,7 +214,7 @@ MonoBehaviour:
        version: 1
        useReflectionProbeRotation: 0
    - rid: 1704570155956699144
-      type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      type: {class: ScreenSpaceAmbientOcclusionBlueNoiseResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
        m_BlueNoise256Textures:
        - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
@@ -222,9 +226,9 @@ MonoBehaviour:
        - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
        m_Version: 0
    - rid: 1704570155956699145
-      type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      type: {class: ScreenSpaceAmbientOcclusionCoreResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
-        m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
+        m_RasterizationShader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
        m_Version: 0
    - rid: 1704570155956699146
      type: {class: URPTerrainShaderSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
@@ -262,6 +266,11 @@ MonoBehaviour:
      type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
      data:
        m_version: 0
+        m_PanelSettings: {fileID: 11400000, guid: fa69697be3070b04a893666f5947f18c, type: 2}
+        m_StyleSheets:
+        - {fileID: 7433441132597879392, guid: 0ff99fd36f66f1a41bcc1d3c90e0922a, type: 3}
+        - {fileID: 7433441132597879392, guid: 3a8aa4d508da46d4dace18b280f064aa, type: 3}
+        m_VisualTreeAsset: {fileID: 9197481963319205126, guid: b647ceb1e15264943b9b439971e71110, type: 3}
    - rid: 1704570155956699149
      type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
      data:
@@ -278,13 +287,42 @@ MonoBehaviour:
        _skyBoxMesh: {fileID: 4300000, guid: 0529e6c5f6dea8c4a8c2835ed7de57cb, type: 2}
        _sixFaceSkyBoxMesh: {fileID: 4300000, guid: a80925ceebd011741b42509226cefc74, type: 2}
        _buildLightGridShader: {fileID: 7200000, guid: 16e47c1641bd0104e92b624601457bb0, type: 3}
+        _solidColorShader: {fileID: 4800000, guid: 3765a7ac691541038de4d587b94ae768, type: 3}
+    - rid: 3844770271378276352
+      type: {class: ScreenSpaceReflectionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Shader: {fileID: 4800000, guid: 7b3e6785f5f6b634794df3a85a2a35da, type: 3}
+        m_BlitShader: {fileID: 4800000, guid: 815c625bb9d4fe240a4ccf42ca3899cb, type: 3}
+        m_Version: 0
+    - rid: 3844770271378276353
+      type: {class: MipGenRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_ColorPyramidPS: {fileID: 4800000, guid: 63b92baba208e314c8fdebe52ca0cc34, type: 3}
+        m_ColorPyramidCS: {fileID: 7200000, guid: 28969cfddd9ef3f4e94b971690146a4f, type: 3}
+        m_DepthPyramidCS: {fileID: 7200000, guid: 90a204702cd44e54cac7ed4fc6e5d86b, type: 3}
+    - rid: 3844770271378276354
+      type: {class: UniversalRenderPipelineFilmGrainResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Textures:
+        - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3}
+        - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3}
+        - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3}
+        - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3}
+        - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3}
+        - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3}
+        - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3}
+        - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3}
+        - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3}
+        - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3}
+        m_Version: 0
    - rid: 6852985685364965376
      type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
        m_Version: 0
-        m_StripUnusedPostProcessingVariants: 1
+        m_StripUnusedPostProcessingVariantsAndResources: 1
        m_StripUnusedVariants: 1
        m_StripScreenCoordOverrideVariants: 1
+        m_Strip2DUnusedVariants: 0
    - rid: 6852985685364965377
      type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
@@ -318,6 +356,7 @@ MonoBehaviour:
        m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
        m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
        m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
+        m_UIBackdropFilterCompositePS: {fileID: 4800000, guid: 8b3d1e6f4c5a4d219a72f8e1c0b3d4a7, type: 3}
        m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
        m_TerrainDetailLit: {fileID: 0}
        m_TerrainDetailGrassBillboard: {fileID: 0}
@@ -334,6 +373,7 @@ MonoBehaviour:
      data:
        m_Version: 0
        m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3}
+        m_RenderingLayerMaskShader: {fileID: 4800000, guid: 9ac9bae9f40d7dc4a80dbf809b9544aa, type: 3}
        m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3}
        m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3}
        m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
@@ -348,6 +388,7 @@ MonoBehaviour:
      type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
        m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+        m_SimpleLitMaterial: {fileID: 2100000, guid: 6a1143ee683302f4aa628c052723efc1, type: 2}
        m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
        m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
        m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
--- a/Assets/Tangentbord.inputactions
+++ b/Assets/Tangentbord.inputactions
@@ -1,63 +0,0 @@
-{
-    "version": 1,
-    "name": "Tangentbord",
-    "maps": [
-        {
-            "name": "MoveUp",
-            "id": "52b14811-b367-4f32-b6c8-696885a893eb",
-            "actions": [
-                {
-                    "name": "New action",
-                    "type": "Button",
-                    "id": "fab289a9-ad4e-4bdc-97e5-b19aa8ffe793",
-                    "expectedControlType": "",
-                    "processors": "",
-                    "interactions": "",
-                    "initialStateCheck": false
-                }
-            ],
-            "bindings": [
-                {
-                    "name": "",
-                    "id": "2e70d29e-afe5-42b7-969b-abb44886b2e5",
-                    "path": "<Keyboard>/w",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "New action",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                }
-            ]
-        },
-        {
-            "name": "MoveDown",
-            "id": "c4188819-ef54-4a24-964a-ae22a0f5305f",
-            "actions": [
-                {
-                    "name": "New action",
-                    "type": "Button",
-                    "id": "5e3eec9b-2627-4cc5-87fb-4a2c0f109247",
-                    "expectedControlType": "",
-                    "processors": "",
-                    "interactions": "",
-                    "initialStateCheck": false
-                }
-            ],
-            "bindings": [
-                {
-                    "name": "",
-                    "id": "2f259070-4617-424b-a7d5-03021213f986",
-                    "path": "<Keyboard>/s",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "New action",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                }
-            ]
-        }
-    ],
-    "controlSchemes": []
-}
--- a/Assets/Tangentbord.inputactions.meta
+++ b/Assets/Tangentbord.inputactions.meta
@@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: 889411acbee31479da048b699a8c9751
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
-  generateWrapperCode: 0
-  wrapperCodePath: 
-  wrapperClassName: 
-  wrapperCodeNamespace: 
--- a/Assets/Textures/background.jpg.meta
+++ b/Assets/Textures/background.jpg.meta
@@ -1,7 +1,10 @@
 fileFormatVersion: 2
 guid: 7b397333e5a914d45bfa82fc5e36e16b
 TextureImporter:
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      213: -7443756053782179069
+    second: background_0
  externalObjects: {}
  serializedVersion: 13
  mipmaps:
@@ -53,7 +56,9 @@ TextureImporter:
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
+  spriteTessellationMethod: 0
  spriteTessellationDetail: -1
+  spriteGeometrySubdivision: -1
  textureType: 8
  textureShape: 1
  singleChannelComponent: 0
@@ -95,7 +100,29 @@ TextureImporter:
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: background_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 626
+        height: 417
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 30356abce4772b890800000000000000
+      internalID: -7443756053782179069
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
    outline: []
    customData: 
    physicsShape: []
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,8 +1,9 @@
 {
  "dependencies": {
-    "com.unity.ide.rider": "3.0.39",
-    "com.unity.inputsystem": "1.19.0",
-    "com.unity.render-pipelines.universal": "17.4.0",
+    "com.unity.ide.rider": "3.0.40",
+    "com.unity.inputsystem": "1.20.0",
+    "com.unity.render-pipelines.universal": "17.6.0",
+    "com.unity.ugui": "2.6.0",
    "com.unity.modules.accessibility": "1.0.0",
    "com.unity.modules.adaptiveperformance": "1.0.0",
    "com.unity.modules.ai": "1.0.0",
@@ -18,10 +19,13 @@
    "com.unity.modules.particlesystem": "1.0.0",
    "com.unity.modules.physics": "1.0.0",
    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.physicscore2d": "1.0.0",
    "com.unity.modules.screencapture": "1.0.0",
    "com.unity.modules.terrain": "1.0.0",
    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tetgen": "1.0.0",
    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.timelinefoundation": "1.0.0",
    "com.unity.modules.ui": "1.0.0",
    "com.unity.modules.uielements": "1.0.0",
    "com.unity.modules.umbra": "1.0.0",
@@ -34,7 +38,6 @@
    "com.unity.modules.vectorgraphics": "1.0.0",
    "com.unity.modules.vehicles": "1.0.0",
    "com.unity.modules.video": "1.0.0",
-    "com.unity.modules.vr": "1.0.0",
    "com.unity.modules.wind": "1.0.0",
    "com.unity.modules.xr": "1.0.0"
  }
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,35 +1,36 @@
 {
  "dependencies": {
    "com.unity.burst": {
-      "version": "1.8.28",
+      "version": "2.0.0",
      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.mathematics": "1.2.1",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
+      "source": "builtin",
+      "dependencies": {}
    },
    "com.unity.collections": {
-      "version": "6.4.0",
+      "version": "6.6.0",
      "depth": 2,
      "source": "builtin",
      "dependencies": {
-        "com.unity.burst": "1.8.23",
-        "com.unity.mathematics": "1.3.2",
-        "com.unity.nuget.mono-cecil": "1.11.5",
+        "com.unity.burst": "1.8.25",
+        "com.unity.nuget.mono-cecil": "1.11.6",
        "com.unity.test-framework": "1.4.6",
-        "com.unity.test-framework.performance": "3.0.3"
+        "com.unity.test-framework.performance": "3.2.0"
      }
    },
    "com.unity.ext.nunit": {
-      "version": "2.0.5",
+      "version": "2.1.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {}
    },
+    "com.unity.graph-authoring": {
+      "version": "1.0.0",
+      "depth": 2,
+      "source": "builtin",
+      "dependencies": {}
+    },
    "com.unity.ide.rider": {
-      "version": "3.0.39",
+      "version": "3.0.40",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -38,7 +39,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.19.0",
+      "version": "1.20.0",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -46,13 +47,6 @@
      },
      "url": "https://packages.unity.com"
    },
-    "com.unity.mathematics": {
-      "version": "1.3.3",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
    "com.unity.nuget.mono-cecil": {
      "version": "1.11.6",
      "depth": 3,
@@ -60,80 +54,88 @@
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
+    "com.unity.profiling.core": {
+      "version": "1.0.3",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
    "com.unity.render-pipelines.core": {
-      "version": "17.4.0",
+      "version": "17.6.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
        "com.unity.burst": "1.8.14",
-        "com.unity.mathematics": "1.3.2",
-        "com.unity.ugui": "2.0.0",
        "com.unity.collections": "2.4.3",
-        "com.unity.modules.terrain": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.profiling.core": "1.0.3"
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "17.4.0",
+      "version": "17.6.0",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "17.4.0",
-        "com.unity.shadergraph": "17.4.0",
-        "com.unity.render-pipelines.universal-config": "17.4.0"
+        "com.unity.render-pipelines.core": "17.6.0",
+        "com.unity.shadergraph": "17.6.0",
+        "com.unity.render-pipelines.universal-config": "17.6.0"
      }
    },
    "com.unity.render-pipelines.universal-config": {
-      "version": "17.4.0",
+      "version": "17.6.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "17.4.0"
+        "com.unity.render-pipelines.core": "17.6.0"
      }
    },
    "com.unity.searcher": {
-      "version": "4.9.4",
+      "version": "4.9.5",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "17.4.0",
+      "version": "17.6.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "17.4.0",
-        "com.unity.searcher": "4.9.3"
+        "com.unity.render-pipelines.core": "17.6.0",
+        "com.unity.searcher": "4.9.3",
+        "com.unity.graph-authoring": "1.0.0"
      }
    },
    "com.unity.test-framework": {
-      "version": "1.6.0",
+      "version": "1.8.0",
      "depth": 3,
      "source": "builtin",
      "dependencies": {
-        "com.unity.ext.nunit": "2.0.3",
+        "com.unity.ext.nunit": "2.1.0",
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      }
    },
    "com.unity.test-framework.performance": {
-      "version": "3.2.0",
+      "version": "6.6.0",
      "depth": 3,
-      "source": "registry",
+      "source": "builtin",
      "dependencies": {
        "com.unity.test-framework": "1.1.33",
        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
+      }
    },
    "com.unity.ugui": {
-      "version": "2.0.0",
-      "depth": 2,
+      "version": "2.6.0",
+      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0"
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.physics2d": "1.0.0",
+        "com.unity.modules.physics": "1.0.0"
      }
    },
    "com.unity.modules.accessibility": {
@@ -160,7 +162,9 @@
      "version": "1.0.0",
      "depth": 0,
      "source": "builtin",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
    },
    "com.unity.modules.animation": {
      "version": "1.0.0",
@@ -234,6 +238,14 @@
      "dependencies": {}
    },
    "com.unity.modules.physics2d": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physicscore2d": "1.0.0"
+      }
+    },
+    "com.unity.modules.physicscore2d": {
      "version": "1.0.0",
      "depth": 0,
      "source": "builtin",
@@ -270,6 +282,12 @@
        "com.unity.modules.terrain": "1.0.0"
      }
    },
+    "com.unity.modules.tetgen": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
    "com.unity.modules.tilemap": {
      "version": "1.0.0",
      "depth": 0,
@@ -278,6 +296,14 @@
        "com.unity.modules.physics2d": "1.0.0"
      }
    },
+    "com.unity.modules.timelinefoundation": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
    "com.unity.modules.ui": {
      "version": "1.0.0",
      "depth": 0,
@@ -293,7 +319,8 @@
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0",
        "com.unity.modules.hierarchycore": "1.0.0",
-        "com.unity.modules.physics": "1.0.0"
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.animation": "1.0.0"
      }
    },
    "com.unity.modules.umbra": {
@@ -385,16 +412,6 @@
        "com.unity.modules.unitywebrequest": "1.0.0"
      }
    },
-    "com.unity.modules.vr": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.xr": "1.0.0"
-      }
-    },
    "com.unity.modules.wind": {
      "version": "1.0.0",
      "depth": 0,
--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -12,32 +12,33 @@ MonoBehaviour:
  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
-  m_EnablePackageDependencies: 0
+  m_EnablePreReleasePackages: 0
  m_AdvancedSettingsExpanded: 1
  m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
  oneTimeWarningShown: 0
-  m_Registries:
-  - m_Id: main
+  oneTimePackageErrorsPopUpShown: 0
+  m_MainRegistry:
+    m_Id: main
    m_Name: 
    m_Url: https://packages.unity.com
    m_Scopes: []
    m_IsDefault: 1
+    m_IsUnityRegistry: 1
    m_Capabilities: 7
+    m_ConfigSource: 0
+    m_Compliance:
+      m_Status: 0
+      m_Violations: []
+  m_ScopedRegistries: []
  m_UserSelectedRegistryName: 
  m_UserAddingNewScopedRegistry: 0
  m_RegistryInfoDraft:
-    m_ErrorMessage: 
-    m_Original:
-      m_Id: 
-      m_Name: 
-      m_Url: 
-      m_Scopes: []
-      m_IsDefault: 0
-      m_Capabilities: 0
    m_Modified: 0
-    m_Name: 
-    m_Url: 
-    m_Scopes:
-    - 
-    m_SelectedScopeIndex: 0
+    m_ErrorMessage: 
+    m_UserModificationsEntityId:
+      m_rawData: 1099511629199
+    m_OriginalEntityId:
+      m_rawData: 1099511629200
+  m_LoadAssets: 0
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.4.0f1
-m_EditorVersionWithRevision: 6000.4.0f1 (8cf496087c8f)
+m_EditorVersion: 6000.6.0f1
+m_EditorVersionWithRevision: 6000.6.0f1 (f7f8ed4d1e24)
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -6,7 +6,7 @@ QualitySettings:
  serializedVersion: 5
  m_CurrentQuality: 1
  m_QualitySettings:
-  - serializedVersion: 4
+  - serializedVersion: 5
    name: Mobile
    pixelLightCount: 2
    shadows: 2
@@ -34,6 +34,7 @@ QualitySettings:
    adaptiveVsyncExtraA: 0
    adaptiveVsyncExtraB: 0
    lodBias: 1
+    meshLodThreshold: 1
    maximumLODLevel: 0
    enableLODCrossFade: 1
    streamingMipmapsActive: 0
@@ -47,8 +48,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858,
-      type: 2}
+    customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, type: 2}
    terrainQualityOverrides: 0
    terrainPixelError: 1
    terrainDetailDensityScale: 1
@@ -60,7 +60,7 @@ QualitySettings:
    terrainMaxTrees: 50
    excludedTargetPlatforms:
    - Standalone
-  - serializedVersion: 4
+  - serializedVersion: 5
    name: PC
    pixelLightCount: 2
    shadows: 2
@@ -88,6 +88,7 @@ QualitySettings:
    adaptiveVsyncExtraA: 0
    adaptiveVsyncExtraB: 0
    lodBias: 2
+    meshLodThreshold: 1
    maximumLODLevel: 0
    enableLODCrossFade: 1
    streamingMipmapsActive: 0
@@ -101,8 +102,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd,
-      type: 2}
+    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}
    terrainQualityOverrides: 0
    terrainPixelError: 1
    terrainDetailDensityScale: 1
@@ -122,6 +122,7 @@ QualitySettings:
    GameCoreXboxOne: 1
    Lumin: 0
    Nintendo Switch: 1
+    Nintendo Switch 2: 1
    PS4: 1
    PS5: 1
    Server: 0