diff --git a/Assets/PACKAGES/TRAPS AND OBSTACLES/Traps-Obstacles/Prefabs/Selected/Hard/Overhead Trap.prefab b/Assets/PACKAGES/TRAPS AND OBSTACLES/Traps-Obstacles/Prefabs/Selected/Hard/Overhead Trap.prefab index 11ac60ff..560c5cd6 100644 --- a/Assets/PACKAGES/TRAPS AND OBSTACLES/Traps-Obstacles/Prefabs/Selected/Hard/Overhead Trap.prefab +++ b/Assets/PACKAGES/TRAPS AND OBSTACLES/Traps-Obstacles/Prefabs/Selected/Hard/Overhead Trap.prefab @@ -319,6 +319,8 @@ GameObject: - component: {fileID: 318916547338561599} - component: {fileID: 1016811362970666434} - component: {fileID: 3231589536847397159} + - component: {fileID: 199973753615584112} + - component: {fileID: 6627350060982671293} m_Layer: 0 m_Name: Obstacle-29.001 m_TagString: Untagged @@ -391,6 +393,40 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &199973753615584112 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366087815888834789} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 9179733307442995586, guid: 1b2df364766ccca42a65e01d1a230e55, type: 3} +--- !u!114 &6627350060982671293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366087815888834789} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e4c2115f7c8919458497c9aea88d927, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5912899612210429261 GameObject: m_ObjectHideFlags: 0 @@ -459,6 +495,8 @@ GameObject: - component: {fileID: 5263859531006171023} - component: {fileID: 2621392687253115278} - component: {fileID: 3586657532999370879} + - component: {fileID: 6663902751824474655} + - component: {fileID: 2323799912294975697} m_Layer: 0 m_Name: Obstacle-29.000 m_TagString: Untagged @@ -531,6 +569,40 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &6663902751824474655 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6469762840255963810} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2336029448756792832, guid: 1b2df364766ccca42a65e01d1a230e55, type: 3} +--- !u!114 &2323799912294975697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6469762840255963810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e4c2115f7c8919458497c9aea88d927, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8440691423431141270 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 7965e862..fa3b004f 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -14,12 +14,12 @@ OcclusionCullingSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_Fog: 1 + m_FogColor: {r: 0, g: 0, b: 0, a: 1} m_FogMode: 1 m_FogDensity: 0.1 - m_LinearFogStart: 0 - m_LinearFogEnd: 42.5 + m_LinearFogStart: 10 + m_LinearFogEnd: 30 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} @@ -4534,13 +4534,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} serializedVersion: 2 - m_LocalRotation: {x: 0.7216453, y: -0.05889436, z: -0.061866816, w: -0.6869731} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 267.18, y: 9.8, z: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &745643968 GameObject: m_ObjectHideFlags: 0 @@ -5083,7 +5083,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea6c37a6e422e894f98866cc833d0bb4, type: 3} m_Name: m_EditorClassIdentifier: - upSpeed: 3 + upSpeed: 5 controllerSpeed: 0.075 newPos: {x: 0, y: 0} oldPos: {x: 0, y: 0} diff --git a/Assets/Scripts/CharacterController.cs b/Assets/Scripts/CharacterController.cs index fa2d5244..acc6b227 100644 --- a/Assets/Scripts/CharacterController.cs +++ b/Assets/Scripts/CharacterController.cs @@ -53,8 +53,8 @@ public class CharacterController : MonoBehaviour } void Rotator() { - transform.DOLocalRotate(new Vector3(90, 180, 0), 1); - transform.DOLocalMoveZ(0.75f, 1).OnComplete(() => + transform.DOLocalRotate(new Vector3(90, 180, 0), 0.6f); + transform.DOLocalMoveZ(0.75f, 0.6f).OnComplete(() => { bonefollower = false; EnableRagdoll();