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

resolved merge conflicts

Browse Source
This commit is contained in:
Krazerleo
2022-05-05 16:49:21 +07:00
parent 6514599f22
commit ba1b350c62
4 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,18 +6,11 @@ using UnityEngine.AI;
[RequireComponent(typeof(NavMeshAgent))]
public class MovementController : MonoBehaviour
{
<<<<<<< HEAD
public int PointStartID { get; set; }
public int PointEndID { get; private set; }
public float FlagDistance { get; private set; }
private const float updateFlagPositionDelay = 5;
private const float updateReachedDestinationDelay = 5;
=======
public NavPoint currentPosition { get; set; }
private Dictionary<int, NavPoint> navPoints = new Dictionary<int, NavPoint>();
[SerializeField] private NavMeshAgent navMeshAgent;
>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
[SerializeField] private NavMeshAgent navMeshAgent;
[SerializeField] private GameObject flag;
@ -28,7 +21,6 @@ public class MovementController : MonoBehaviour
private void Awake()
{
<<<<<<< HEAD
navMeshAgent.speed = SettingsReader.Instance.GetSettings.MovementSpeed;
idNavPointDict = MapManager.IDToNavPoint;
InvokeRepeating(nameof(UpdateFlagPosition), 0, updateFlagPositionDelay);
@ -43,12 +35,6 @@ public class MovementController : MonoBehaviour
private void UpdateFlagPosition()
{
FlagDistance = (flag.transform.position - gameObject.transform.position).magnitude;
=======
navMeshAgent.speed = SettingsReader.Instance.GetSettings.movementSpeed;
foreach (var np in MapManager.navPoints) {
navPoints[np.PointId] = np;
}
>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
}
public void MoveToPointById(int id)
@ -62,27 +48,15 @@ public class MovementController : MonoBehaviour
}
public void MoveToRandomPoint()
<<<<<<< HEAD
{
Debug.Log(MapManager.NavPoints == null);
GoToNextNavPoint(MapManager.NavPoints[Random.Range(0, MapManager.NavPoints.Count)]);
=======
{
// Debug.Log(MapManager.navPoints == null);
goToNextNavPoint(MapManager.navPoints[Random.Range(0, MapManager.navPoints.Count)]);
>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
}
public List<NavPoint> GetPointsCandidate()
{
<<<<<<< HEAD
return MapManager.NavPoints
.Where(point =>
(idNavPointDict[PointStartID].Position - point.Position).magnitude < SettingsReader.Instance.GetSettings.MovementDistance)
=======
return MapManager.navPoints
.Where(point => (currentPosition.position - point.position).magnitude < SettingsReader.Instance.GetSettings.movementDistance)
>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
.ToList();
}