Revert "Merge branch 'leveldesign_r'"

This reverts commit 998a52fe3c.
This commit is contained in:
Jan Groß
2018-09-08 17:44:36 +02:00
parent 998a52fe3c
commit c64220a353
209 changed files with 274 additions and 59813 deletions

View File

@@ -0,0 +1,50 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EliminatePlayer : MonoBehaviour {
[SerializeField]
private string name = "Generic trap";
[SerializeField]
private float resapwnDelay = 0;
[Tooltip("Optional particle effect. Spawned when player enters the trigger")]
[SerializeField]
private GameObject effect;
[SerializeField]
private LurchRespawn player;
[SerializeField]
private bool killQueued = false;
[SerializeField]
private float rdCounter = 0;
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
if (rdCounter <= 0 && killQueued)
{
player.RespawnLurch(name);
killQueued = false;
} else
{
rdCounter -= Time.deltaTime;
}
}
private void OnTriggerEnter(Collider other)
{
if (other.transform.root.tag == "Player")
{
rdCounter = resapwnDelay;
killQueued = true;
if(effect != null)
{
GameObject.Instantiate(effect);
}
}
}
}