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

Fixed merge errors

Browse Source
This commit is contained in:
Andrey Gumirov
2022-05-05 15:37:51 +07:00
parent 1cf5776a1b
commit cfb7b71a8a
4 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Scripts/Misc/NavPoint.cs
View File

@ -17,21 +17,12 @@ public class NavPoint : MonoBehaviour
public NavPointType navType = NavPointType.Direction;
[HideInInspector]
<<<<<<< HEAD
public int PointId = 0;
=======
public int PointId;
>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
public float DeathAttr = 0;
public List<Vector3> EnemiesSeen = new List<Vector3>();
private void Start()
{
<<<<<<< HEAD
FlagDistance = (GameObject.FindGameObjectWithTag("Flag").transform.position - Position).magnitude;
=======
PointId = GetInstanceID();
FlagDistance = (GameObject.FindGameObjectWithTag("Flag").transform.position - position).magnitude;
>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
}
}