"update unresolved conflicts"
This commit is contained in:
@ -9,7 +9,6 @@ public class CharacterCondition
|
|||||||
public event Action<int> OnChangeAmmunitionEvent;
|
public event Action<int> OnChangeAmmunitionEvent;
|
||||||
|
|
||||||
private int health;
|
private int health;
|
||||||
|
|
||||||
public int HealthPoints
|
public int HealthPoints
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
@ -36,16 +36,6 @@ public class MovementController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
FlagDistance = (flag.transform.position - gameObject.transform.position).magnitude;
|
FlagDistance = (flag.transform.position - gameObject.transform.position).magnitude;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void MoveToPointById(int id)
|
|
||||||
{
|
|
||||||
if (!navPoints.ContainsKey(id))
|
|
||||||
{
|
|
||||||
Debug.LogWarning("PIDOR");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
goToNextNavPoint(navPoints[id]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void MoveToRandomPoint()
|
public void MoveToRandomPoint()
|
||||||
{
|
{
|
||||||
|
@ -5,8 +5,6 @@ public class MapManager : MonoBehaviour
|
|||||||
{
|
{
|
||||||
private static MapManager instance;
|
private static MapManager instance;
|
||||||
public static MapManager Instance => instance;
|
public static MapManager Instance => instance;
|
||||||
private static List<NavPoint> navPoints = new List<NavPoint>();
|
|
||||||
private static Dictionary<int, NavPoint> iDToNavPoint = new Dictionary<int, NavPoint>();
|
|
||||||
public static List<NavPoint> NavPoints { get => navPoints; private set => navPoints = value; }
|
public static List<NavPoint> NavPoints { get => navPoints; private set => navPoints = value; }
|
||||||
public static Dictionary<int, NavPoint> IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; }
|
public static Dictionary<int, NavPoint> IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; }
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user