diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 760672c..d6653bb 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -207,7 +207,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 7094923890942819436} - m_PlaneDistance: 0.3 + m_PlaneDistance: 0.4 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -757,7 +757,7 @@ Rigidbody: m_GameObject: {fileID: 7094923891560833857} serializedVersion: 2 m_Mass: 70 - m_Drag: 0.05 + m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 1 m_IsKinematic: 0 @@ -805,7 +805,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 25 - runSpeed: 50 + runSpeed: 35 mouseSensitive: 100 jump: 30 health: 100 @@ -825,7 +825,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 92bad1a4524af17479ce7b274fd4c941, type: 3} powerImage: {fileID: 2000771377} dashPower: 40 - dashTime: 0.2 + dashTime: 0.3 --- !u!95 &7009705026125325791 Animator: serializedVersion: 3 diff --git a/Assets/Scenes/Testing/Filip.unity b/Assets/Scenes/Testing/Filip.unity index 75616c8..91aeffd 100644 --- a/Assets/Scenes/Testing/Filip.unity +++ b/Assets/Scenes/Testing/Filip.unity @@ -661,7 +661,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402734067} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 30.439999, y: 1.52, z: 0} + m_LocalPosition: {x: 34.16, y: 1.52, z: 0} m_LocalScale: {x: 8, y: 4, z: 2} m_Children: [] m_Father: {fileID: 0} @@ -1006,7 +1006,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 906874806} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 23.98, y: -0.25, z: 0} + m_LocalPosition: {x: 27.7, y: -0.25, z: 0} m_LocalScale: {x: 5, y: 0.5, z: 2} m_Children: [] m_Father: {fileID: 0} @@ -1271,6 +1271,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} +--- !u!1001 &1037328467 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7984646150506845894, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: instaKill + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_RootOrder + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalPosition.x + value: 21.96 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.9 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466073, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_Name + value: Saw (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} --- !u!1 &1347954125 GameObject: m_ObjectHideFlags: 0 @@ -1384,7 +1458,7 @@ PrefabInstance: - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} propertyPath: m_LocalPosition.x - value: 33.72 + value: 37.440002 objectReference: {fileID: 0} - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} @@ -1531,6 +1605,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1756274532 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7984646150506845894, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: instaKill + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_RootOrder + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalPosition.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.9 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8810309419999466073, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + propertyPath: m_Name + value: Saw (9) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} --- !u!1 &1833704053 GameObject: m_ObjectHideFlags: 0 @@ -1618,8 +1766,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833704053} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.47, y: -1.15, z: 0} - m_LocalScale: {x: 18, y: 0.5, z: 2} + m_LocalPosition: {x: 14.45, y: -1.15, z: 0} + m_LocalScale: {x: 22, y: 0.5, z: 2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 17 @@ -1787,7 +1935,7 @@ PrefabInstance: - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} propertyPath: m_LocalPosition.x - value: 23.01 + value: 26.730001 objectReference: {fileID: 0} - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} @@ -1981,10 +2129,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1437810455, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} - propertyPath: m_PlaneDistance - value: 0.4 - objectReference: {fileID: 0} - target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index b4f974f..27eed97 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -29,7 +29,7 @@ public class PlayerManager : MonoBehaviour private GameObject pushPullObject; private float pushPullObjectDistance; public float dashPower = 40f; - public float dashTime = 0.2f; + public float dashTime = 0.3f; private float actualDashTime; private int dashButton; private bool dash = false; @@ -164,7 +164,7 @@ public class PlayerManager : MonoBehaviour { rigidBody.AddForce( (transform.right * dashPower * 10 * 5 * 1 * Time.deltaTime) + - (transform.up * 1 * 10 * Time.deltaTime), + (transform.up * 2 * 10 * Time.deltaTime), ForceMode.VelocityChange ); dash = true; @@ -175,7 +175,7 @@ public class PlayerManager : MonoBehaviour { rigidBody.AddForce( (transform.right * dashPower * 10 * 5 * -1 * Time.deltaTime) + - (transform.up * 1 * 10 * Time.deltaTime), + (transform.up * 2 * 10 * Time.deltaTime), ForceMode.VelocityChange ); dash = true;