gav/real-shooter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"update unresolved conflicts"

Browse Source
This commit is contained in:
Krazerleo
2022-05-05 18:11:57 +07:00
parent ba1b350c62
commit 2caf658d19
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/Character/CharacterCondition.cs
View File

@ -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

10
Assets/Scripts/Character/MovementController.cs
View File

@ -37,16 +37,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()
{ {
GoToNextNavPoint(MapManager.NavPoints[Random.Range(0, MapManager.NavPoints.Count)]); GoToNextNavPoint(MapManager.NavPoints[Random.Range(0, MapManager.NavPoints.Count)]);

2
Assets/Scripts/Managers/MapManager.cs
View File

@ -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; }