diff --git a/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta b/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta deleted file mode 100755 index 1400775..0000000 --- a/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 80ef0d75029e25243857877facd14d75 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta index 9180d60..1fa6659 100755 --- a/Assets/Prefabs/Player.prefab.meta +++ b/Assets/Prefabs/Player.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 99bb17a23a489624baeaf337f91a4f84 +guid: 80f6c1c85e5daed4c96c70205ed5503d PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Character/CharacterCondition.cs b/Assets/Scripts/Character/CharacterCondition.cs index de60740..2124ddb 100755 --- a/Assets/Scripts/Character/CharacterCondition.cs +++ b/Assets/Scripts/Character/CharacterCondition.cs @@ -9,12 +9,12 @@ public class CharacterCondition public event Action OnChangeAmmunitionEvent; private int health; - public int HealthPoints - { - get - { - return health; - } + public int HealthPoints + { + get + { + return health; + } private set { health = value; diff --git a/Assets/Scripts/Character/MovementController.cs b/Assets/Scripts/Character/MovementController.cs index 0022357..70341bb 100644 --- a/Assets/Scripts/Character/MovementController.cs +++ b/Assets/Scripts/Character/MovementController.cs @@ -36,20 +36,9 @@ 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() { - Debug.Log(MapManager.NavPoints == null); GoToNextNavPoint(MapManager.NavPoints[Random.Range(0, MapManager.NavPoints.Count)]); } diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index b6467d8..9299c9b 100755 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -25,8 +25,8 @@ public class GameManager : MonoBehaviour { Academy.Instance.OnEnvironmentReset += ResetScene; - GlobalEventManager.onCaptureFlag += FlagCaptured; - GlobalEventManager.onTimeLeft += TimeOut; + GlobalEventManager.OnCaptureFlag += FlagCaptured; + GlobalEventManager.OnTimeLeft += TimeOut; var agents = GameObject.FindObjectsOfType(); foreach (var item in agents) @@ -138,8 +138,8 @@ public class GameManager : MonoBehaviour private void OnDestroy() { - GlobalEventManager.onCaptureFlag -= FlagCaptured; - GlobalEventManager.onTimeLeft -= TimeOut; + GlobalEventManager.OnCaptureFlag -= FlagCaptured; + GlobalEventManager.OnTimeLeft -= TimeOut; } public static event Action OnResetScene; diff --git a/Assets/Scripts/Managers/GlobalEventManager.cs b/Assets/Scripts/Managers/GlobalEventManager.cs index e0461af..753b7d2 100755 --- a/Assets/Scripts/Managers/GlobalEventManager.cs +++ b/Assets/Scripts/Managers/GlobalEventManager.cs @@ -2,18 +2,18 @@ public class GlobalEventManager { - public static event Action onCaptureFlag; + public static event Action OnCaptureFlag; public static void SendCaptureFlag(Team team) { - onCaptureFlag?.Invoke(team); - onCaptureFlag = null; + OnCaptureFlag?.Invoke(team); + OnCaptureFlag = null; } - public static event Action onTimeLeft; + public static event Action OnTimeLeft; public static void SendTimeout() { - onTimeLeft?.Invoke(); - onTimeLeft = null; + OnTimeLeft?.Invoke(); + OnTimeLeft = null; } } diff --git a/Assets/Scripts/Managers/MapManager.cs b/Assets/Scripts/Managers/MapManager.cs index b28dcba..14d70af 100755 --- a/Assets/Scripts/Managers/MapManager.cs +++ b/Assets/Scripts/Managers/MapManager.cs @@ -5,10 +5,9 @@ public class MapManager : MonoBehaviour { private static MapManager instance; public static MapManager Instance => instance; - private static List navPoints = new List(); - private static Dictionary iDToNavPoint = new Dictionary(); - public static List NavPoints { get => navPoints; private set => navPoints = value; } - public static Dictionary IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; } + [SerializeField] static List _navPoints; + public static List NavPoints { get => _navPoints; private set => _navPoints = value; } + public static Dictionary IDToNavPoint {get; private set; } private void Awake() { diff --git a/Assets/Scripts/Statistics/Logger.cs b/Assets/Scripts/Statistics/Logger.cs index e293d25..df7ce3d 100644 --- a/Assets/Scripts/Statistics/Logger.cs +++ b/Assets/Scripts/Statistics/Logger.cs @@ -3,17 +3,17 @@ using UnityEngine; public class Logger { - private const string directory = "/Logs/"; - private const string baseName = "Log#"; + private const string Directory = "/Logs/"; + private const string BaseName = "Log#"; public static void SaveLog(T objToSerialize) { - string dir = Application.persistentDataPath + directory; - if (!Directory.Exists(dir)) - Directory.CreateDirectory(dir); + var dir = Application.persistentDataPath + Directory; + if (!System.IO.Directory.Exists(dir)) + System.IO.Directory.CreateDirectory(dir); - var logName = baseName + (Directory.GetFiles(dir).Length + 1).ToString(); - string json = JsonUtility.ToJson(objToSerialize); + var logName = BaseName + (System.IO.Directory.GetFiles(dir).Length + 1).ToString(); + var json = JsonUtility.ToJson(objToSerialize); File.WriteAllText(dir + logName, json); } } \ No newline at end of file diff --git a/Assets/Scripts/Statistics/StatisticManager.cs b/Assets/Scripts/Statistics/StatisticManager.cs index 399e7fb..a9c4883 100644 --- a/Assets/Scripts/Statistics/StatisticManager.cs +++ b/Assets/Scripts/Statistics/StatisticManager.cs @@ -19,8 +19,8 @@ public class StatisticManager : MonoBehaviour foreach (var npc in GameObject.FindObjectsOfType()) npc.OnDamageRecieved += RegisterDamage; - GlobalEventManager.onCaptureFlag += RegisterWin; - GlobalEventManager.onTimeLeft += RegisterTimeOut; + GlobalEventManager.OnCaptureFlag += RegisterWin; + GlobalEventManager.OnTimeLeft += RegisterTimeOut; } private void RegisterDamage(int damage, Team team) diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt deleted file mode 100755 index bf8f7eb..0000000 --- a/ProjectSettings/ProjectVersion.txt +++ /dev/null @@ -1,2 +0,0 @@ -m_EditorVersion: 2019.4.36f1 -m_EditorVersionWithRevision: 2019.4.36f1 (660c164b2fc5)