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

add saw

Browse Source
This commit is contained in:
haitem
2021-01-30 17:44:13 +01:00
parent 4a70125fff
commit 883b1bfb9f
8 changed files with 1017 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Assets/Scripts/DamageObjectsManager.cs
View File

@@ -4,7 +4,7 @@ using UnityEngine;
public class DamageObjectsManager : MonoBehaviour
{
public enum ObjectType { Object, HideSpikes, ShowSpikes };
public enum ObjectType { Object, HideSpikes, ShowSpikes, StaticSaw, RidingSaw };
public ObjectType objectType = ObjectType.Object;
private Animation animation;
private bool animate = false;
@@ -13,6 +13,8 @@ public class DamageObjectsManager : MonoBehaviour
public float damage = 10f;
public float damageRate = 5f;
private float actualDamageRate = 0f;
private bool interact = false;
private PlayerManager playerManager;
void Start()
{
@@ -22,6 +24,51 @@ public class DamageObjectsManager : MonoBehaviour
// Update is called once per frame
void Update()
{
if (interact)
{
if (objectType == ObjectType.HideSpikes)
{
if (!animate)
{
animation["Spikes"].speed = 1f;
animation["Spikes"].normalizedTime = 0f;
animation.Play("Spikes");
animate = true;
}
}
if (objectType == ObjectType.ShowSpikes)
{
if (actualDamageRate < Time.time)
{
actualDamageRate = Time.time + damageRate;
playerManager.damage(damage, instaKill);
}
}
if (objectType == ObjectType.StaticSaw)
{
Debug.Log(!animation.isPlaying);
if (!animation.isPlaying)
{
animation.Play("Saw");
}
if (actualDamageRate < Time.time)
{
actualDamageRate = Time.time + damageRate;
playerManager.damage(damage, instaKill);
}
}
if (objectType == ObjectType.RidingSaw)
{
if (actualDamageRate < Time.time)
{
actualDamageRate = Time.time + damageRate;
playerManager.damage(damage, instaKill);
}
}
}
}
public void damagePlayer(PlayerManager playerManager)
@@ -35,28 +82,19 @@ public class DamageObjectsManager : MonoBehaviour
private void OnTriggerStay(Collider other)
{
if (objectType == ObjectType.HideSpikes)
if (other.gameObject.tag == "Player")
{
if (other.gameObject.tag == "Player" && !animate)
{
Debug.Log(other.tag);
animation["Spikes"].speed = 1f;
animation["Spikes"].normalizedTime = 0f;
animation.Play("Spikes");
animate = true;
}
interact = true;
playerManager = other.gameObject.GetComponent<PlayerManager>();
}
}
if (objectType == ObjectType.ShowSpikes)
private void OnTriggerExit(Collider other)
{
if (other.gameObject.tag == "Player")
{
if (other.gameObject.tag == "Player")
{
if (actualDamageRate < Time.time)
{
actualDamageRate = Time.time + damageRate;
other.gameObject.GetComponent<PlayerManager>().damage(damage, instaKill);
}
}
interact = false;
playerManager = null;
}
}

11
Assets/Scripts/ObjectManager.cs
View File

@@ -30,7 +30,7 @@ public class ObjectManager : MonoBehaviour
{
if (Input.GetKeyUp(KeyCode.E))
{
if (playerManager.GetPushPullObject() == null)
if (playerManager.GetPushPullObject() == null && playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 2)
{
playerManager.SetPushPullObject(this.gameObject);
meshRenderer.materials[1].SetColor("_OutlineColor", new Color(0.5568628f, 0.3785397f, 0.1176471f));
@@ -68,8 +68,15 @@ public class ObjectManager : MonoBehaviour
Vector3 hit = collision.contacts[0].normal;
if (hit.x != 0 && hit.y == 0)
{
meshRenderer.materials[1].SetFloat("_Outline", 0.25f);
playerManager = collision.gameObject.GetComponent<PlayerManager>();
if (playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 2)
{
meshRenderer.materials[1].SetFloat("_Outline", 0.25f);
}
else
{
meshRenderer.materials[1].SetFloat("_Outline", 0.0f);
}
interact = true;
}
}