diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab index b2c6c33..8e76aa5 100644 --- a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab @@ -343,7 +343,7 @@ Rigidbody: m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 0 + m_CollisionDetection: 3 --- !u!136 &3559681995605743320 CapsuleCollider: m_ObjectHideFlags: 0 @@ -438,15 +438,18 @@ MonoBehaviour: m_EditorClassIdentifier: pStats: {fileID: 0} vel: {x: 0, y: 0, z: 0} + driftVel: {x: 0, y: 0, z: 0} curJumpNum: 0 lowJumpMultiplier: 0.3 fallMultiplier: 1.5 + g: 0 isGrounded: 0 groundCheckDistance: 0.05 cam: {fileID: 4654986889578046791} minAngle: -30 maxAngle: 45 sensitivity: 200 + isSliding: 0 --- !u!114 &4788888989419098570 MonoBehaviour: m_ObjectHideFlags: 0 @@ -474,6 +477,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxGrappleDistance: 25 + isGrappled: 0 + ropeLength: 0 --- !u!114 &5784126162129930074 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index c7aad01..9070625 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -152,15 +152,18 @@ MonoBehaviour: m_EditorClassIdentifier: pStats: {fileID: 0} vel: {x: 0, y: 0, z: 0} + driftVel: {x: 0, y: 0, z: 0} curJumpNum: 0 lowJumpMultiplier: 0.3 fallMultiplier: 1.5 + g: 0 isGrounded: 0 groundCheckDistance: 0.05 cam: {fileID: 7188906082643956516} minAngle: -30 maxAngle: 45 sensitivity: 301 + isSliding: 0 --- !u!114 &273103334658887749 MonoBehaviour: m_ObjectHideFlags: 0 @@ -224,6 +227,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxGrappleDistance: 25 + isGrappled: 0 + ropeLength: 0 --- !u!114 &2356773567935625033 MonoBehaviour: m_ObjectHideFlags: 0 @@ -265,7 +270,7 @@ Rigidbody: m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 0 + m_CollisionDetection: 3 --- !u!136 &3772338269032432186 CapsuleCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/KingAbilities/Bumper.cs b/Assets/Scripts/KingAbilities/Bumper.cs index 57f8fab..d0089d2 100644 --- a/Assets/Scripts/KingAbilities/Bumper.cs +++ b/Assets/Scripts/KingAbilities/Bumper.cs @@ -19,6 +19,7 @@ public class Bumper : MonoBehaviour { DirBump = Vector3.Normalize(DirBump);//Normalizes the vector to be used as a bump direction playerMovement.GetHit(DirBump, bumpPower); + // } } }