GJP/GlobalGameJam-2021
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remake Hans scene

Browse Source
This commit is contained in:
haitem
2021-01-31 14:34:49 +01:00
parent 0e7d03578a
commit c14744d22f
5 changed files with 111 additions and 2203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Assets/Scripts/PlayerManager.cs
View File

@@ -29,7 +29,7 @@ public class PlayerManager : MonoBehaviour
private GameObject pushPullObject;
private float pushPullObjectDistance;
public float dashPower = 40f;
public float dashTime = 0.3f;
public float dashTime = 0.4f;
private float actualDashTime;
private int dashButton;
private bool dash = false;
@@ -114,7 +114,7 @@ public class PlayerManager : MonoBehaviour
private void FixedUpdate()
{
if (!cannotMove && !onLadder)
if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
{
Jump();
}
@@ -274,20 +274,18 @@ public class PlayerManager : MonoBehaviour
void Move()
{
if (onGround || (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4)) {
rigidBody.MovePosition(
transform.position +
(onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) +
(transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime)
);;
}
rigidBody.MovePosition(
transform.position +
(onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) +
(transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime)
);;
}
void Jump()
{
if (Input.GetAxisRaw("Jump") > 0)
{
if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)))
if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)) )
{
if (!onGround)
{
@@ -295,7 +293,6 @@ public class PlayerManager : MonoBehaviour
}
pushPullObject = null;
rigidBody.AddForce(
(transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) +
(transform.up * jump * 10 * Time.deltaTime),
ForceMode.VelocityChange
);
@@ -415,25 +412,9 @@ public class PlayerManager : MonoBehaviour
{
if (other.tag == "Ground" || other.tag == "Objects")
{
if (!onLadder) {
rigidBody.AddForce(
(transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) +
(transform.up * 10 * Time.deltaTime),
ForceMode.VelocityChange
);
}
onGround = false;
dash = false;
}
if (other.gameObject.GetComponent<ObjectManager>() != null)
{
if (other.gameObject.GetComponent<ObjectManager>().objectType == ObjectManager.ObjectType.Ladder) {
rigidBody.AddForce(
(transform.right * (run ? runSpeed : speed) * 2.5f * Input.GetAxis("Horizontal") * Time.deltaTime),
ForceMode.VelocityChange
);
}
}
if (other.gameObject.GetComponent<PowerCubeManager>() != null)
{
interact = false;