more level stuff

master
Jordan Orelli 5 years ago
parent 1c42ecb9f1
commit 315a138693

File diff suppressed because it is too large Load Diff

@ -1,6 +1,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement;
[RequireComponent(typeof(MoveController))] [RequireComponent(typeof(MoveController))]
[RequireComponent(typeof(BoxCollider2D))] [RequireComponent(typeof(BoxCollider2D))]
@ -314,8 +315,14 @@ public class PlayerController : MonoBehaviour {
} }
void CheckCollisions() { void CheckCollisions() {
CollideWith(moveController.collisions.above); if (moveController.collisions.below) {
Crumble crumble = moveController.collisions.below.GetComponent<Crumble>();
if (crumble) {
crumble.Hit();
}
CollideWith(moveController.collisions.below); CollideWith(moveController.collisions.below);
}
CollideWith(moveController.collisions.above);
CollideWith(moveController.collisions.left); CollideWith(moveController.collisions.left);
CollideWith(moveController.collisions.right); CollideWith(moveController.collisions.right);
} }
@ -324,17 +331,14 @@ public class PlayerController : MonoBehaviour {
if (other == null) { if (other == null) {
return; return;
} }
Crumble crumble = other.GetComponent<Crumble>();
if (crumble) {
crumble.Hit();
}
TouchHazard hazard = other.GetComponent<TouchHazard>(); TouchHazard hazard = other.GetComponent<TouchHazard>();
if (hazard) { if (hazard) {
if (jumpState == JumpState.Dash) { if (jumpState == JumpState.Dash) {
Destroy(hazard.gameObject); Destroy(hazard.gameObject);
} else { } else {
Destroy(gameObject); SceneManager.LoadScene( SceneManager.GetActiveScene().buildIndex ) ;
// Destroy(gameObject);
} }
} }
} }

Loading…
Cancel
Save