Merge remote-tracking branch 'origin/fog-dev' into Levels2

Game/CourierOld/Assets/Code/Configs/CharacterConfig.cs

@@ -8,8 +8,11 @@ namespace Code.Configs
         public float
             maxStableMoveSpeed = 12f,
             stableMovementSharpness = 15f,
-            orientationSharpness = 10f,
+            orientationSharpness = 10f;
-            jumpSpeed = 10f;
+        
+        public float 
+            jumpSpeed = 10f,
+            jumpCooldown = 0.4f;
         
         public float 
             dashSpeed = 20f,

Game/CourierOld/Assets/Code/Gameplay/Character/Controller/Abilities/WallRunningMechanic.cs

@@ -189,6 +189,9 @@ namespace Code.Gameplay.Character.Controller.Abilities
         {
             if (!IsWallRunning || !_motor) return;
     
+            if (_motor.CharacterController is not CustomCharacterController controller || !controller.CanJump)
+                return;
+
             IsWallRunning = false;
 
             var wallAway = _wallNormal;
@@ -214,10 +217,8 @@ namespace Code.Gameplay.Character.Controller.Abilities
 
             _motor.SetPosition(_motor.TransientPosition + wallAway * 0.07f);
             
-            if (_motor.CharacterController is CustomCharacterController controller)
+            controller.TriggerJump();
-            {
             controller.BlockAbilities(0.12f);
         }
     }
-    }
 }

Game/CourierOld/Assets/Code/Gameplay/Character/Controller/CustomCharacterController.cs

@@ -39,6 +39,11 @@ namespace Code.Gameplay.Character.Controller
         private Vector3 _currentFollowPointLocalPosition;
         private bool _wasSlidingLastFrame;
         
+        private float _jumpCooldownTimer;
+        private float _jumpCooldownDuration => _characterConfig.jumpCooldown;
+
+        public bool CanJump => !isAbilitiesBlocked && _jumpCooldownTimer <= 0f;
+        
         // Подсистемы
         private CharacterInputHandler _inputHandler;
         private DashMechanic _dashMechanic;
@@ -158,7 +163,16 @@ namespace Code.Gameplay.Character.Controller
             _inputHandler.ProcessInputs(ref inputs, motor);
 
             // Передаём запрос прыжка
-            _groundMovement.RequestJump(inputs.JumpPressed);
+            var jumpInput = inputs.JumpPressed;
+
+            if (jumpInput && CanJump)
+            {
+                _groundMovement.RequestJump(true);
+            }
+            else
+            {
+                _groundMovement.RequestJump(false);
+            }
         }
 
         public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
@@ -364,6 +378,11 @@ namespace Code.Gameplay.Character.Controller
             _currentFollowPointLocalPosition = _cameraFollowPoint ? _cameraFollowPoint.localPosition : _originalFollowPointLocalPosition;
         }
         
+        public void TriggerJump()
+        {
+            _jumpCooldownTimer = _jumpCooldownDuration;
+        }
+
         public void BeforeCharacterUpdate(float deltaTime)
         {
         }
@@ -380,6 +399,9 @@ namespace Code.Gameplay.Character.Controller
         {
             UpdateSlideTransition(deltaTime);
             
+            _jumpCooldownTimer -= deltaTime;
+            if (_jumpCooldownTimer < 0f) _jumpCooldownTimer = 0f;
+            
             _wallLeanMechanic.Update(
                 _wallRunningMechanic.IsWallRunning,
                 _wallRunningMechanic.GetWallNormal(),

Game/CourierOld/Assets/Code/Gameplay/Character/Controller/Movement/GroundMovementSystem.cs

@@ -76,8 +76,13 @@ namespace Code.Gameplay.Character.Controller.Movement
             if (JumpRequested)
             {
                 currentVelocity += motor.CharacterUp * _jumpSpeed - Vector3.Project(currentVelocity, motor.CharacterUp);
-                JumpRequested = false; // Сброс сразу после применения
+                JumpRequested = false;
                 motor.ForceUnground();
+            
+                if (motor.CharacterController is CustomCharacterController controller)
+                {
+                    controller.TriggerJump();
+                }
             }
         }
     }

Game/CourierOld/Assets/Resources/Configs/App/CharacterConfig.asset

@@ -16,6 +16,7 @@ MonoBehaviour:
   stableMovementSharpness: 15
   orientationSharpness: 10
   jumpSpeed: 10
+  jumpCooldown: 0.3
   dashSpeed: 20
   dashDuration: 0.35
   dashCooldown: 1.2
@@ -54,9 +55,19 @@ MonoBehaviour:
     m_RotationOrder: 4
   slideMinVelocityThreshold: 3
   slideCooldown: 1.5
+  slideColliderHeightScale: 0.5
+  slideCameraOffsetY: -0.5
+  slideEnterDuration: 0.2
+  slideExitDuration: 0.25
   leanAngle: 25
   leanThreshold: 0.3
   leanSmoothSpeed: 10
   gravity: {x: 0, y: -30, z: 0}
   maxAirSpeed: 10
   airControlSharpness: 8
+  wallRunMaxTime: 1.75
+  wallRunSpeed: 15
+  wallRunAcceleration: 25
+  wallRunGravityScale: 0.25
+  wallDetachImpulse: 7
+  wallContactAngleThreshold: 45

Game/CourierOld/Assets/Settings/Graphics/PC_RPAsset.asset

@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: PC_RPAsset
   m_EditorClassIdentifier: 
-  k_AssetVersion: 12
+  k_AssetVersion: 13
-  k_AssetPreviousVersion: 12
+  k_AssetPreviousVersion: 13
   m_RendererType: 1
   m_RendererData: {fileID: 0}
   m_RendererDataList:
@@ -128,9 +128,11 @@ MonoBehaviour:
   m_PrefilterSoftShadowsQualityHigh: 1
   m_PrefilterSoftShadows: 0
   m_PrefilterScreenCoord: 1
+  m_PrefilterScreenSpaceIrradiance: 0
   m_PrefilterNativeRenderPass: 1
   m_PrefilterUseLegacyLightmaps: 0
   m_PrefilterBicubicLightmapSampling: 1
+  m_PrefilterReflectionProbeRotation: 0
   m_PrefilterReflectionProbeBlending: 0
   m_PrefilterReflectionProbeBoxProjection: 0
   m_PrefilterReflectionProbeAtlas: 0

Game/CourierOld/Assets/Settings/Graphics/UniversalRenderPipelineGlobalSettings.asset

@@ -62,23 +62,12 @@ MonoBehaviour:
       - rid: 3354338719444762630
       - rid: 3354338719444762631
       - rid: 3354338719444762632
+      - rid: 5048755193650348032
+      - rid: 5048755193650348033
+      - rid: 5048755193650348034
     m_RuntimeSettings:
-      m_List:
+      m_List: []
-      - rid: 6852985685364965378
+  m_AssetVersion: 9
-      - rid: 6852985685364965379
-      - rid: 6852985685364965380
-      - rid: 6852985685364965381
-      - rid: 6852985685364965384
-      - rid: 6852985685364965385
-      - rid: 6852985685364965392
-      - rid: 6852985685364965394
-      - rid: 8712630790384254976
-      - rid: 3354338719444762625
-      - rid: 3354338719444762627
-      - rid: 3354338719444762628
-      - rid: 3354338719444762630
-      - rid: 3354338719444762632
-  m_AssetVersion: 8
   m_ObsoleteDefaultVolumeProfile: {fileID: 0}
   m_RenderingLayerNames:
   - Light Layer default
@@ -241,6 +230,29 @@ MonoBehaviour:
           - {r: 0.5, g: 0, b: 0.5, a: 1}
           - {r: 0.5, g: 0.5, b: 0.5, a: 1}
           - {r: 0, g: 0, b: 1, a: 1}
+    - rid: 5048755193650348032
+      type: {class: RayTracingRenderPipelineResources, ns: UnityEngine.Rendering.UnifiedRayTracing, asm: Unity.UnifiedRayTracing.Runtime}
+      data:
+        m_Version: 1
+        m_GeometryPoolKernels: {fileID: 7200000, guid: 98e3d58cae7210c4786f67f504c9e899, type: 3}
+        m_CopyBuffer: {fileID: 7200000, guid: 1b95b5dcf48d1914c9e1e7405c7660e3, type: 3}
+        m_CopyPositions: {fileID: 7200000, guid: 1ad53a96b58d3c3488dde4f14db1aaeb, type: 3}
+        m_BitHistogram: {fileID: 7200000, guid: 8670f7ce4b60cef43bed36148aa1b0a2, type: 3}
+        m_BlockReducePart: {fileID: 7200000, guid: 4e034cc8ea2635c4e9f063e5ddc7ea7a, type: 3}
+        m_BlockScan: {fileID: 7200000, guid: 4d6d5de35fa45ef4a92119397a045cc9, type: 3}
+        m_BuildHlbvh: {fileID: 7200000, guid: 2d70cd6be91bd7843a39a54b51c15b13, type: 3}
+        m_RestructureBvh: {fileID: 7200000, guid: 56641cb88dcb31a4398a4997ef7a7a8c, type: 3}
+        m_Scatter: {fileID: 7200000, guid: a2eaeefdac4637a44b734e85b7be9186, type: 3}
+    - rid: 5048755193650348033
+      type: {class: URPReflectionProbeSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        version: 1
+        useReflectionProbeRotation: 0
+    - rid: 5048755193650348034
+      type: {class: OnTilePostProcessResource, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Version: 0
+        m_UberPostShader: {fileID: 4800000, guid: fe4f13c1004a07d4ea1e30bfd0326d9e, type: 3}
     - rid: 6852985685364965376
       type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
@@ -302,11 +314,11 @@ MonoBehaviour:
         m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
         m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3}
         m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
-        m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3}
         m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
         m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
         m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
         m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
+        m_DefaultMesh2DLitMaterial: {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2}
     - rid: 6852985685364965383
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:

Game/CourierOld/Packages/manifest.json

@@ -8,14 +8,15 @@
     "com.unity.ide.rider": "3.0.38",
     "com.unity.ide.visualstudio": "2.0.25",
     "com.unity.inputsystem": "1.16.0",
-    "com.unity.multiplayer.center": "1.0.0",
+    "com.unity.multiplayer.center": "1.0.1",
-    "com.unity.render-pipelines.universal": "17.2.0",
+    "com.unity.render-pipelines.universal": "17.3.0",
     "com.unity.test-framework": "1.6.0",
     "com.unity.timeline": "1.8.9",
     "com.unity.toolchain.linux-x86_64": "2.0.11",
     "com.unity.ugui": "2.0.0",
     "com.unity.visualscripting": "1.9.9",
     "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.adaptiveperformance": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -42,6 +43,7 @@
     "com.unity.modules.unitywebrequestaudio": "1.0.0",
     "com.unity.modules.unitywebrequesttexture": "1.0.0",
     "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "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",

Game/CourierOld/Packages/packages-lock.json

@@ -24,7 +24,7 @@
       "hash": "e644f1bb8ea190157aaea9c386f85cee4cd03bd9"
     },
     "com.unity.addressables": {
-      "version": "2.7.6",
+      "version": "2.7.4",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -34,7 +34,7 @@
         "com.unity.modules.jsonserialize": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.scriptablebuildpipeline": "2.5.0",
+        "com.unity.scriptablebuildpipeline": "2.4.3",
         "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -122,14 +122,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.3.2",
+      "version": "1.3.3",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.multiplayer.center": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
@@ -137,28 +137,28 @@
       }
     },
     "com.unity.nuget.mono-cecil": {
-      "version": "1.11.5",
+      "version": "1.11.6",
       "depth": 3,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "3.2.1",
+      "version": "3.2.2",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.profiling.core": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "depth": 3,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "17.2.0",
+      "version": "17.3.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -168,17 +168,16 @@
         "com.unity.collections": "2.4.3",
         "com.unity.modules.physics": "1.0.0",
         "com.unity.modules.terrain": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
-        "com.unity.rendering.light-transport": "1.0.1"
       }
     },
     "com.unity.render-pipelines.universal": {
-      "version": "17.2.0",
+      "version": "17.3.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "17.2.0",
+        "com.unity.render-pipelines.core": "17.3.0",
-        "com.unity.shadergraph": "17.2.0",
+        "com.unity.shadergraph": "17.3.0",
         "com.unity.render-pipelines.universal-config": "17.0.3"
       }
     },
@@ -190,18 +189,8 @@
         "com.unity.render-pipelines.core": "17.0.3"
       }
     },
-    "com.unity.rendering.light-transport": {
-      "version": "1.0.1",
-      "depth": 2,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.collections": "2.2.0",
-        "com.unity.mathematics": "1.2.4",
-        "com.unity.modules.terrain": "1.0.0"
-      }
-    },
     "com.unity.scriptablebuildpipeline": {
-      "version": "2.5.0",
+      "version": "2.4.3",
       "depth": 3,
       "source": "registry",
       "dependencies": {
@@ -211,30 +200,30 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.searcher": {
-      "version": "4.9.3",
+      "version": "4.9.4",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "17.2.0",
+      "version": "17.3.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "17.2.0",
+        "com.unity.render-pipelines.core": "17.3.0",
         "com.unity.searcher": "4.9.3"
       }
     },
     "com.unity.sysroot": {
-      "version": "2.0.10",
+      "version": "2.0.11",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.sysroot.linux-x86_64": {
-      "version": "2.0.9",
+      "version": "2.0.10",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -309,6 +298,14 @@
       "source": "builtin",
       "dependencies": {}
     },
+    "com.unity.modules.adaptiveperformance": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.subsystems": "1.0.0"
+      }
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,
@@ -516,6 +513,16 @@
         "com.unity.modules.imageconversion": "1.0.0"
       }
     },
+    "com.unity.modules.vectorgraphics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.uielements": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0"
+      }
+    },
     "com.unity.modules.vehicles": {
       "version": "1.0.0",
       "depth": 0,

Game/CourierOld/ProjectSettings/GraphicsSettings.asset

@@ -59,6 +59,8 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_RenderPipelineGlobalSettingsMap:
     UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}
+  m_ShaderBuildSettings:
+    keywordDeclarationOverrides: []
   m_LightsUseLinearIntensity: 1
   m_LightsUseColorTemperature: 1
   m_LogWhenShaderIsCompiled: 0

Game/CourierOld/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 15023, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEditor.MultiplayerModule.dll::UnityEditor.Multiplayer.Internal.MultiplayerRolesSettings
+  m_MultiplayerRoleForClassicProfile:
+    m_Keys: []
+    m_Values: 

Game/CourierOld/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.2.15f1
+m_EditorVersion: 6000.3.0f1
-m_EditorVersionWithRevision: 6000.2.15f1 (0707b6d1e918)
+m_EditorVersionWithRevision: 6000.3.0f1 (d1870ce95baf)