Commit 3ebf24c4 authored by 15김민규's avatar 15김민규

enemy2를 머지한 후 머지 컨플릭트 해결

parent c007cdc3
......@@ -87,6 +87,7 @@ public abstract class Enemy : MonoBehaviour {
// - Calculate value & Arrange information
public void GetDamaged(PlayerAttackInfo attack)
{
if (Invisible) { return; }
string objectName = gameObject.transform.parent.name;
float prevHealth = currHealth;
currHealth -= attack.damage;
......@@ -156,6 +157,7 @@ public abstract class Enemy : MonoBehaviour {
public void GetDamaged(float damage)
{
if (Invisible) { return; }
float prevHealth = currHealth;
currHealth -= damage;
if (currHealth <= 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment