diff options
| author | chai <215380520@qq.com> | 2023-10-30 00:20:27 +0800 |
|---|---|---|
| committer | chai <215380520@qq.com> | 2023-10-30 00:20:27 +0800 |
| commit | 2053038f819bbaf41af72ffc37fa602446b9d7cb (patch) | |
| tree | c84e592ac27ba36670032cac65088525c8319036 /ROUNDS/_Player | |
| parent | ed42b67e0f518f6315370b29beebd49e47350450 (diff) | |
Diffstat (limited to 'ROUNDS/_Player')
| -rw-r--r-- | ROUNDS/_Player/CollisionChecker.cs | 6 | ||||
| -rw-r--r-- | ROUNDS/_Player/LegRaycasters.cs | 8 | ||||
| -rw-r--r-- | ROUNDS/_Player/PlayerCollision.cs | 10 | ||||
| -rw-r--r-- | ROUNDS/_Player/PlayerMovement.cs | 5 |
4 files changed, 22 insertions, 7 deletions
diff --git a/ROUNDS/_Player/CollisionChecker.cs b/ROUNDS/_Player/CollisionChecker.cs index f48520e..fac3d45 100644 --- a/ROUNDS/_Player/CollisionChecker.cs +++ b/ROUNDS/_Player/CollisionChecker.cs @@ -26,7 +26,11 @@ public class CollisionChecker : MonoBehaviour private void Collide(Collision2D collision) { - if (collisionAction != null) +#if IGNORE_COLLISIONCHECK + return ; +#endif + + if (collisionAction != null) { collisionAction(collision); } diff --git a/ROUNDS/_Player/LegRaycasters.cs b/ROUNDS/_Player/LegRaycasters.cs index db65cf1..2807f8d 100644 --- a/ROUNDS/_Player/LegRaycasters.cs +++ b/ROUNDS/_Player/LegRaycasters.cs @@ -67,9 +67,12 @@ public class LegRaycasters : MonoBehaviour { if (!(data.sinceJump < 0.2f) && !(Vector3.Angle(Vector3.up, hit.normal) > 70f)) { +#if !IGNORE_TOUCHGROUND // touch ground ҪӰŵغgravityΪ0 data.TouchGround(hit.point, hit.normal, hit.rigidbody); +#endif +#if !IGNORE_HITGROUND // ʩϵ Vector3 vector = ((Vector3)hit.point - leg.transform.position) / base.transform.root.localScale.x; if (data.input.direction.x != 0f) @@ -79,6 +82,7 @@ public class LegRaycasters : MonoBehaviour } rig.AddForce(animationCurve.Evaluate(Mathf.Abs(vector.y)) * Vector3.up * rig.mass * force);//һֱϵ rig.AddForce(animationCurve.Evaluate(Mathf.Abs(vector.y)) * (0f - rig.velocity.y) * Vector2.up * rig.mass * drag);//һֱõ - } - } +#endif + } + } } diff --git a/ROUNDS/_Player/PlayerCollision.cs b/ROUNDS/_Player/PlayerCollision.cs index c6f2750..36f0113 100644 --- a/ROUNDS/_Player/PlayerCollision.cs +++ b/ROUNDS/_Player/PlayerCollision.cs @@ -51,7 +51,8 @@ public class PlayerCollision : MonoBehaviour // PlayerVelocityǿһµٶȺɫûݵ£Ϊײ⡣ע͵ɫͻ private void FixedUpdate() - { + { +#if !IGNORE_CHECKWALL #region ǽ͵أҲйأ if (checkForGoThroughWall && ignoreWallFor <= 0) { @@ -78,7 +79,9 @@ public class PlayerCollision : MonoBehaviour } } #endregion +#endif +#if !IGNORE_CIRCLECAST #region ײ ignoreWallFor--; lastPos = base.transform.position; @@ -130,9 +133,10 @@ public class PlayerCollision : MonoBehaviour DoBounce(array2[j]); } } - #endregion + #endregion +#endif - lastPos = base.transform.position; + lastPos = base.transform.position; } private void DoBounce(RaycastHit2D hit) diff --git a/ROUNDS/_Player/PlayerMovement.cs b/ROUNDS/_Player/PlayerMovement.cs index c4753c6..84dd5d0 100644 --- a/ROUNDS/_Player/PlayerMovement.cs +++ b/ROUNDS/_Player/PlayerMovement.cs @@ -31,6 +31,8 @@ public class PlayerMovement : MonoBehaviour return; } Move(data.input.direction); + +#if!IGNORE_DRAG if (data.isWallGrab && data.wallDistance < 0.7f) { Vector2 velocity = data.playerVel.velocity; @@ -44,7 +46,8 @@ public class PlayerMovement : MonoBehaviour // ٶ෴Ŀ data.playerVel.velocity -= data.playerVel.velocity * TimeHandler.timeScale * 0.01f * 0.1f * extraDrag * multiplier; data.playerVel.angularVelocity -= data.playerVel.angularVelocity * TimeHandler.timeScale * 0.01f * 0.1f * extraAngularDrag * multiplier; - } +#endif + } private void Update() { |