GJP/GlobalGameJame
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remake baricade spice and tree

Browse Source
This commit is contained in:
Kotrba Filip
2020-02-01 23:28:26 +01:00
parent 2d7527ba28
commit 67effcab6d
5 changed files with 123 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scripts/BlockManager.cs
View File

@@ -133,13 +133,13 @@ public class BlockManager : MonoBehaviour
}
}
void OnTriggerEnter(Collider collider)
void OnCollisionEnter(Collision collision)
{
if (blockType == BlockType.Barricade) {
Debug.Log(collider.transform.tag);
if (collider.transform.CompareTag("Enemy"))
Debug.Log(collision.transform.tag);
if (collision.transform.CompareTag("Enemy"))
{
EnemyManager enemyManager = collider.transform.GetComponent<EnemyManager>();
EnemyManager enemyManager = collision.transform.GetComponent<EnemyManager>();
if (enemyManager != null)
{
enemyManager.Damage(100);

16
Assets/Scripts/EnemyManager.cs
View File

@@ -188,7 +188,6 @@ public class EnemyManager : MonoBehaviour
void OnTriggerEnter(Collider collider)
{
Debug.Log(collider.transform.tag);
if (collider.transform.CompareTag("Meele"))
{
WeaponManager weaponManager = collider.transform.GetComponent<WeaponManager>();
@@ -198,4 +197,19 @@ public class EnemyManager : MonoBehaviour
}
}
}
void OnCollisionEnter(Collision collision)
{
if (collision.transform.CompareTag("Spikes"))
{
BlockManager blockManager = GetComponent<Collider>().transform.GetComponent<BlockManager>();
if (blockManager != null && blockManager.blockType == BlockManager.BlockType.Barricade)
{
Damage(100);
blockManager.health = 0;
Destroy(blockManager);
Destroy(blockManager.gameObject, 3);
}
}
}
}