From b8e8e74ab448c9126b0c22b32ed7b1d25507d97d Mon Sep 17 00:00:00 2001
From: Krazerleo <krazerleo@gmail.com>
Date: Thu, 5 May 2022 20:45:26 +0700
Subject: [PATCH] Fixes in Map Manager

---
 Assets/Scripts/Managers/GameManager.cs        |  8 ++++----
 Assets/Scripts/Managers/GlobalEventManager.cs | 12 ++++++------
 Assets/Scripts/Managers/MapManager.cs         |  5 +++--
 Assets/Scripts/Statistics/Logger.cs           | 14 +++++++-------
 Assets/Scripts/Statistics/StatisticManager.cs |  4 ++--
 5 files changed, 22 insertions(+), 21 deletions(-)

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<Agent>();
         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<Team> onCaptureFlag;
+    public static event Action<Team> 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 58e5c77..14d70af 100755
--- a/Assets/Scripts/Managers/MapManager.cs
+++ b/Assets/Scripts/Managers/MapManager.cs
@@ -5,8 +5,9 @@ public class MapManager : MonoBehaviour
 {
     private static MapManager instance;
     public static MapManager Instance => instance;
-    public static List<NavPoint> NavPoints { get => navPoints; private set => navPoints = value; }
-    public static Dictionary<int, NavPoint> IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; }
+    [SerializeField] static List<NavPoint> _navPoints;
+    public static List<NavPoint> NavPoints { get => _navPoints; private set => _navPoints = value; }
+    public static Dictionary<int, NavPoint> 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>(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>())
             npc.OnDamageRecieved += RegisterDamage;
 
-        GlobalEventManager.onCaptureFlag += RegisterWin;
-        GlobalEventManager.onTimeLeft += RegisterTimeOut;
+        GlobalEventManager.OnCaptureFlag += RegisterWin;
+        GlobalEventManager.OnTimeLeft += RegisterTimeOut;
     }
 
     private void RegisterDamage(int damage, Team team)