merge conflicts resolved
This commit is contained in:
parent
bad5bb7f04
commit
3b5e1800ae
@ -5,10 +5,9 @@ public class DimensionController : MonoBehaviour
|
|||||||
public const int STARTING_HP = 25;
|
public const int STARTING_HP = 25;
|
||||||
|
|
||||||
[SerializeField] private int dimensionId;
|
[SerializeField] private int dimensionId;
|
||||||
|
|
||||||
private float _hp;
|
private float _hp;
|
||||||
private float _maxHp;
|
private float _maxHp;
|
||||||
|
[SerializeField] private LayerMask mask;
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
_maxHp = STARTING_HP;
|
_maxHp = STARTING_HP;
|
||||||
@ -30,4 +29,9 @@ public class DimensionController : MonoBehaviour
|
|||||||
|
|
||||||
GameManager.Instance.DealDamage(dimensionId, _hp, _maxHp);
|
GameManager.Instance.DealDamage(dimensionId, _hp, _maxHp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int GetDimensionMask()
|
||||||
|
{
|
||||||
|
return mask;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user