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

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

Browse Source
This commit is contained in:
Andrey Gumirov
2022-05-07 21:53:09 +07:00
parent cfb7b71a8a 3908334f65
commit 4962a4b5da
10 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta generated
View File

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

2
Assets/Prefabs/Player.prefab.meta generated
View File

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

12
Assets/Scripts/Character/CharacterCondition.cs
View File

@ -9,12 +9,12 @@ public class CharacterCondition
public event Action<int> OnChangeAmmunitionEvent;
private int health;
public int HealthPoints
{
get
{
return health;
}
public int HealthPoints
{
get
{
return health;
}
private set
{
health = value;

11
Assets/Scripts/Character/MovementController.cs
View File

@ -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)]);
}

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

@ -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;

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

@ -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;
}
}

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

@ -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>();
private static Dictionary<int, NavPoint> iDToNavPoint = new Dictionary<int, NavPoint>();
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()
{

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

@ -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);
}
}

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

@ -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)

2
ProjectSettings/ProjectVersion.txt
View File

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