"update unresolved conflicts"

This commit is contained in:
2022-05-05 18:11:57 +07:00
parent ba1b350c62
commit 2caf658d19
3 changed files with 0 additions and 13 deletions

View File

@ -9,7 +9,6 @@ public class CharacterCondition
public event Action<int> OnChangeAmmunitionEvent;
private int health;
public int HealthPoints
{
get

View File

@ -36,16 +36,6 @@ public class MovementController : MonoBehaviour
{
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()
{

View File

@ -5,8 +5,6 @@ public class MapManager : MonoBehaviour
{
private static MapManager 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 Dictionary<int, NavPoint> IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; }