From f7cd996097c7da1c2f711664b460f0bc92370633 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Wed, 29 Sep 2021 18:58:26 +0200 Subject: [PATCH] Updated Unity Version to 2021.1.22f1) --- Assets/Prefabs/FirstPerson Player.prefab | 31 ++++------------------ Assets/Scenes/SampleScene.unity | 7 +++-- Assets/Scripts/Character/PlayerMovement.cs | 6 ++--- Packages/manifest.json | 6 ++--- Packages/packages-lock.json | 8 +++--- ProjectSettings/ProjectVersion.txt | 4 +-- 6 files changed, 20 insertions(+), 42 deletions(-) diff --git a/Assets/Prefabs/FirstPerson Player.prefab b/Assets/Prefabs/FirstPerson Player.prefab index 8f1d26b..d8a0c99 100644 --- a/Assets/Prefabs/FirstPerson Player.prefab +++ b/Assets/Prefabs/FirstPerson Player.prefab @@ -138,7 +138,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8390537188327133022} - - component: {fileID: 8390537188327133023} - component: {fileID: 8390537188327133020} - component: {fileID: 8390537188327132961} m_Layer: 0 @@ -165,24 +164,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!143 &8390537188327133023 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8390537188327133021} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 3.8 - m_Radius: 0.6 - m_SlopeLimit: 45 - m_StepOffset: 0.7 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} --- !u!114 &8390537188327133020 MonoBehaviour: m_ObjectHideFlags: 0 @@ -195,14 +176,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcb8e32fc55ebe9478dee06683e84d92, type: 3} m_Name: m_EditorClassIdentifier: - controller: {fileID: 8390537188327133023} speed: 12 - airSpeed: 0.7 - sneakSpeed: 0.4 - sprintSpeed: 1.8 - sprintAirSpeed: 1.9 - gravity: -19.62 - jumpHeight: 4 + adjustedSpeed: 0 + sneakSpeed: 0.8 + sprintSpeed: 1.1 + jumpHeight: 3.5 groundCheck: {fileID: 8390537187855206696} groundDistance: 0.4 groundMask: @@ -273,6 +251,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9369c8d..1d7dfa5 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.2277222, g: 0.2251251, b: 0.2237271, a: 1} + m_IndirectSpecularColor: {r: 0.5996083, g: 0.5927744, b: 0.588867, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1410,7 +1410,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: sneakSpeed - value: 0.8 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: sprintSpeed @@ -1464,6 +1464,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8390537188327133023, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3} diff --git a/Assets/Scripts/Character/PlayerMovement.cs b/Assets/Scripts/Character/PlayerMovement.cs index f4a0283..0dcaf37 100644 --- a/Assets/Scripts/Character/PlayerMovement.cs +++ b/Assets/Scripts/Character/PlayerMovement.cs @@ -7,9 +7,9 @@ public class PlayerMovement : MonoBehaviour [Header("Speed Modifier")] [SerializeField] private float speed = 12f; [SerializeField] private float adjustedSpeed; - [SerializeField] private float sneakSpeed = 0.4f; - [SerializeField] private float sprintSpeed = 1.8f; - [SerializeField] private float jumpHeight = 3f; + [SerializeField] private float sneakSpeed = 0.9f; + [SerializeField] private float sprintSpeed = 1.1f; + [SerializeField] private float jumpHeight = 3.5f; [Header("Ground Check")] [SerializeField] private Transform groundCheck; diff --git a/Packages/manifest.json b/Packages/manifest.json index 395e7d7..f83d9a4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,12 @@ { "dependencies": { "com.unity.collab-proxy": "1.9.0", - "com.unity.ide.rider": "2.0.7", + "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.3", + "com.unity.ide.vscode": "1.2.4", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.5.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f25244e..316e621 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,11 +15,11 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, @@ -33,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -60,7 +60,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.5.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5650251..fe1188f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.18f1 -m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c) +m_EditorVersion: 2021.1.22f1 +m_EditorVersionWithRevision: 2021.1.22f1 (a137e5fb0427)