Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1

Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 80ef0d75029e25243857877facd14d75
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Player.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 99bb17a23a489624baeaf337f91a4f84
+guid: 80f6c1c85e5daed4c96c70205ed5503d
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/Character/MovementController.cs

@@ -37,19 +37,8 @@ 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)]);
     }
 

Assets/Scripts/Managers/GameManager.cs

@@ -25,8 +25,8 @@ public class GameManager : MonoBehaviour
     {
         Academy.Instance.OnEnvironmentReset += ResetScene;
 
-        GlobalEventManager.onCaptureFlag += FlagCaptured;
+        GlobalEventManager.OnCaptureFlag += FlagCaptured;
-        GlobalEventManager.onTimeLeft += TimeOut;
+        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.OnCaptureFlag -= FlagCaptured;
-        GlobalEventManager.onTimeLeft -= TimeOut;
+        GlobalEventManager.OnTimeLeft -= TimeOut;
     }
 
     public static event Action OnResetScene;

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?.Invoke(team);
-        onCaptureFlag = null;
+        OnCaptureFlag = null;
     }
 
-    public static event Action onTimeLeft;
+    public static event Action OnTimeLeft;
     public static void SendTimeout()
     {
-        onTimeLeft?.Invoke();
+        OnTimeLeft?.Invoke();
-        onTimeLeft = null;
+        OnTimeLeft = null;
     }
 }

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<NavPoint> navPoints = new List<NavPoint>();
+    [SerializeField] static List<NavPoint> _navPoints;
-    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; private set; }
-    public static Dictionary<int, NavPoint> IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; }
 
     private void Awake()
     {

Assets/Scripts/Statistics/Logger.cs

@@ -3,17 +3,17 @@ using UnityEngine;
 
 public class Logger
 {
-    private const string directory = "/Logs/";
+    private const string Directory = "/Logs/";
-    private const string baseName = "Log#";
+    private const string BaseName = "Log#";
 
     public static void SaveLog<T>(T objToSerialize)
     {
-        string dir = Application.persistentDataPath + directory;
+        var dir = Application.persistentDataPath + Directory;
-        if (!Directory.Exists(dir))
+        if (!System.IO.Directory.Exists(dir))
-            Directory.CreateDirectory(dir);
+            System.IO.Directory.CreateDirectory(dir);
 
-        var logName = baseName + (Directory.GetFiles(dir).Length + 1).ToString();
+        var logName = BaseName + (System.IO.Directory.GetFiles(dir).Length + 1).ToString();
-        string json = JsonUtility.ToJson(objToSerialize);
+        var json = JsonUtility.ToJson(objToSerialize);
         File.WriteAllText(dir + logName, json);
     }
 }

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.OnCaptureFlag += RegisterWin;
-        GlobalEventManager.onTimeLeft += RegisterTimeOut;
+        GlobalEventManager.OnTimeLeft += RegisterTimeOut;
     }
 
     private void RegisterDamage(int damage, Team team)

ProjectSettings/ProjectVersion.txt

@@ -1,2 +0,0 @@
-m_EditorVersion: 2019.4.36f1
-m_EditorVersionWithRevision: 2019.4.36f1 (660c164b2fc5)