diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index 30d923c..862d09e 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -96,6 +96,8 @@ GameObject: - component: {fileID: 6558661690282462800} - component: {fileID: 2274833863450849408} - component: {fileID: 471272923182148881} + - component: {fileID: 1292213096936070766} + - component: {fileID: 7623511089535041046} m_Layer: 3 m_Name: PlayerPrefab m_TagString: Player @@ -158,10 +160,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: pStats: {fileID: 0} + vel: {x: 0, y: 0, z: 0} + isGrounded: 0 groundCheckDistance: 0.05 - groundCheckLayers: - serializedVersion: 2 - m_Bits: 4294967295 minAngle: -30 maxAngle: 45 sensitivity: 301 @@ -192,7 +193,7 @@ CapsuleCollider: m_GameObject: {fileID: 7188906082087890184} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 m_Radius: 0.5 m_Height: 2 m_Direction: 1 @@ -213,6 +214,71 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &1292213096936070766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 8672539184207985188 + PrefabHashGenerator: PlayerPrefab + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 +--- !u!114 &7623511089535041046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} + m_Name: + m_EditorClassIdentifier: + FixedSendsPerSecond: 20 + AssumeSyncedSends: 1 + InterpolatePosition: 1 + SnapDistance: 10 + InterpolateServer: 1 + MinMeters: 0.15 + MinDegrees: 1.5 + ExtrapolatePosition: 0 + MaxSendsToExtrapolate: 5 + Channel: + EnableRange: 0 + EnableNonProvokedResendChecks: 0 + DistanceSendrate: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 500 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &7188906082643956521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Demos/MovementScene.unity b/Assets/Scenes/Demos/MovementScene.unity index 80c3b2b..561cfa5 100644 --- a/Assets/Scenes/Demos/MovementScene.unity +++ b/Assets/Scenes/Demos/MovementScene.unity @@ -320,6 +320,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2274833863450849408, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_RootOrder value: 2 diff --git a/Assets/Scripts/PlayerScripts/PlayerMovement.cs b/Assets/Scripts/PlayerScripts/PlayerMovement.cs index ced5de3..96aabf4 100644 --- a/Assets/Scripts/PlayerScripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerScripts/PlayerMovement.cs @@ -59,6 +59,7 @@ public class PlayerMovement : MonoBehaviour //Ragdoll variables private Vector3 hit; private Rigidbody rB; + private CapsuleCollider capCol; private bool firstHit = false; private bool heldDown = false; private Vector3 prevRot; @@ -69,11 +70,13 @@ public class PlayerMovement : MonoBehaviour //Initialize Components moveController = GetComponent(); rB = GetComponent(); + capCol = GetComponent(); pStats = GetComponent(); //camera transform cam = GetComponentInChildren(); + capCol.enabled = false; //Wallrun //wallRun = gameObject.GetComponent(); } @@ -104,7 +107,6 @@ public class PlayerMovement : MonoBehaviour } else{ - //if suffiecient impact magnitude is applied then move player if (rB.velocity.magnitude < 0.2f){ firstHit = false; @@ -118,14 +120,13 @@ public class PlayerMovement : MonoBehaviour //Debug.LogWarning("MoveController is either Disabled or wasn't retrieved correctly"); } - //TESTING RAGDOLL STUFF NEEDS SOME WORk - /* + //TESTING RAGDOLL STUFF NEEDS SOME WORK + if (Input.GetMouseButton(1) && heldDown == false){ - Debug.Log("yup"); - getHit(new Vector3(1,1,1), 2000); + getHit(new Vector3(vel.x, 0, vel.z), 30); heldDown = true; } - */ + if(!Input.GetMouseButton(1)){ heldDown = false; @@ -338,18 +339,20 @@ public class PlayerMovement : MonoBehaviour if(firstHit == false){ EnableRagdoll(); dir.Normalize(); - rB.AddForce(dir * force); + rB.AddForce(dir * force, ForceMode.Impulse); firstHit = true; } } private void EnableRagdoll(){ prevRot = transform.localEulerAngles; + capCol.enabled = true; moveController.enabled = false; rB.isKinematic = false; rB.detectCollisions = true; } private void DisableRagdoll(){ + capCol.enabled = false; moveController.enabled = true; rB.isKinematic = true; rB.detectCollisions = false;