Assemblied created
This commit is contained in:
@ -25,14 +25,15 @@ public class SkinlessMonsterComponent : MonoBehaviour
|
||||
|
||||
private bool atTarget;
|
||||
private float distanceToPlayer;
|
||||
private FlareRegister flareRegister;
|
||||
|
||||
private Item.FlareRegister flareRegister;
|
||||
private bool inDamageMargin;
|
||||
private bool inDamageRange;
|
||||
|
||||
|
||||
private bool isAlive = true;
|
||||
|
||||
private Game.InGameManager manager;
|
||||
|
||||
|
||||
|
||||
private Vector3 oppositeVector;
|
||||
@ -51,12 +52,12 @@ public class SkinlessMonsterComponent : MonoBehaviour
|
||||
if (p.isActiveAndEnabled)
|
||||
player = p;
|
||||
|
||||
manager = FindObjectOfType<Game.InGameManager>();
|
||||
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
flareRegister = FindObjectOfType<FlareRegister>();
|
||||
flareRegister = FindObjectOfType<Item.FlareRegister>();
|
||||
if (targetObject == null)
|
||||
targetObject = new GameObject();
|
||||
targetObject.name = "Enemy Target";
|
||||
@ -106,8 +107,8 @@ public class SkinlessMonsterComponent : MonoBehaviour
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if (other.gameObject.GetComponent<BulletComponent>() != null)
|
||||
health -= other.gameObject.GetComponent<BulletComponent>().DamageMagnitude;
|
||||
if (other.gameObject.GetComponent<Item.BulletComponent>() != null)
|
||||
health -= other.gameObject.GetComponent<Item.BulletComponent>().DamageMagnitude;
|
||||
}
|
||||
|
||||
private void HandleTargetOperations()
|
||||
@ -269,7 +270,7 @@ public class SkinlessMonsterComponent : MonoBehaviour
|
||||
//Stop();
|
||||
return;
|
||||
|
||||
BulletComponent closestBullet = null;
|
||||
Item.BulletComponent closestBullet = null;
|
||||
var closestDistance = Mathf.Infinity;
|
||||
foreach (var bullet in flareRegister.bullets)
|
||||
{
|
||||
|
@ -19,7 +19,7 @@ namespace Enemy
|
||||
|
||||
private void OnCollisionEnter(Collision collision)
|
||||
{
|
||||
if (collision.gameObject.GetComponent<BulletComponent>() != null) anim.Play("DummyFall");
|
||||
if (collision.gameObject.GetComponent<Item.BulletComponent>() != null) anim.Play("DummyFall");
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user