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

Fixes in Map Manager

Browse Source
This commit is contained in:
Krazerleo
2022-05-05 20:45:26 +07:00
parent 2caf658d19
commit b8e8e74ab4
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scripts/Managers/GameManager.cs
View File

@ -25,8 +25,8 @@ public class GameManager : MonoBehaviour
{ {
Academy.Instance.OnEnvironmentReset += ResetScene; Academy.Instance.OnEnvironmentReset += ResetScene;
GlobalEventManager.onCaptureFlag += FlagCaptured; GlobalEventManager.OnCaptureFlag += FlagCaptured;
GlobalEventManager.onTimeLeft += TimeOut; GlobalEventManager.OnTimeLeft += TimeOut;
var agents = GameObject.FindObjectsOfType<Agent>(); var agents = GameObject.FindObjectsOfType<Agent>();
foreach (var item in agents) foreach (var item in agents)
@ -138,8 +138,8 @@ public class GameManager : MonoBehaviour
private void OnDestroy() private void OnDestroy()
{ {
GlobalEventManager.onCaptureFlag -= FlagCaptured; GlobalEventManager.OnCaptureFlag -= FlagCaptured;
GlobalEventManager.onTimeLeft -= TimeOut; GlobalEventManager.OnTimeLeft -= TimeOut;
} }
public static event Action OnResetScene; public static event Action OnResetScene;

12
Assets/Scripts/Managers/GlobalEventManager.cs
View File

@ -2,18 +2,18 @@
public class GlobalEventManager public class GlobalEventManager
{ {
public static event Action<Team> onCaptureFlag; public static event Action<Team> OnCaptureFlag;
public static void SendCaptureFlag(Team team) 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() public static void SendTimeout()
{ {
onTimeLeft?.Invoke(); OnTimeLeft?.Invoke();
onTimeLeft = null; OnTimeLeft = null;
} }
} }

5
Assets/Scripts/Managers/MapManager.cs
View File

@ -5,8 +5,9 @@ public class MapManager : MonoBehaviour
{ {
private static MapManager instance; private static MapManager instance;
public static MapManager Instance => instance; public static MapManager Instance => instance;
public static List<NavPoint> NavPoints { get => navPoints; private set => navPoints = value; } [SerializeField] static List<NavPoint> _navPoints;
public static Dictionary<int, NavPoint> IDToNavPoint { get => iDToNavPoint; private set => iDToNavPoint = value; } public static List<NavPoint> NavPoints { get => _navPoints; private set => _navPoints = value; }
public static Dictionary<int, NavPoint> IDToNavPoint {get; private set; }
private void Awake() private void Awake()
{ {

14
Assets/Scripts/Statistics/Logger.cs
View File

@ -3,17 +3,17 @@ using UnityEngine;
public class Logger 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) 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); File.WriteAllText(dir + logName, json);
} }
} }

4
Assets/Scripts/Statistics/StatisticManager.cs
View File

@ -19,8 +19,8 @@ public class StatisticManager : MonoBehaviour
foreach (var npc in GameObject.FindObjectsOfType<NPC>()) foreach (var npc in GameObject.FindObjectsOfType<NPC>())
npc.OnDamageRecieved += RegisterDamage; npc.OnDamageRecieved += RegisterDamage;
GlobalEventManager.onCaptureFlag += RegisterWin; GlobalEventManager.OnCaptureFlag += RegisterWin;
GlobalEventManager.onTimeLeft += RegisterTimeOut; GlobalEventManager.OnTimeLeft += RegisterTimeOut;
} }
private void RegisterDamage(int damage, Team team) private void RegisterDamage(int damage, Team team)