From f3fe5ea4cd8ef270fbfc6c1be90b25b6576f5a93 Mon Sep 17 00:00:00 2001 From: Krazerleo Date: Thu, 5 May 2022 16:26:23 +0700 Subject: [PATCH 1/5] commit 665 --- Assets/Prefabs/Player.prefab.meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From ba1b350c6283b0ebb3d6e48bf7de66db8f6503a6 Mon Sep 17 00:00:00 2001 From: Krazerleo Date: Thu, 5 May 2022 16:49:21 +0700 Subject: [PATCH 2/5] resolved merge conflicts --- .../Scripts/Character/CharacterCondition.cs | 9 ---- .../Scripts/Character/MovementController.cs | 26 ----------- Assets/Scripts/Character/NPC.cs | 45 ------------------- Assets/Scripts/Misc/NavPoint.cs | 9 ---- 4 files changed, 89 deletions(-) diff --git a/Assets/Scripts/Character/CharacterCondition.cs b/Assets/Scripts/Character/CharacterCondition.cs index 1efa341..8d7d5c5 100755 --- a/Assets/Scripts/Character/CharacterCondition.cs +++ b/Assets/Scripts/Character/CharacterCondition.cs @@ -9,14 +9,6 @@ public class CharacterCondition public event Action OnChangeAmmunitionEvent; private int health; -<<<<<<< HEAD - public int HealthPoints - { - get - { - return health; - } -======= public int HealthPoints { @@ -24,7 +16,6 @@ public class CharacterCondition { return health; } ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 private set { health = value; diff --git a/Assets/Scripts/Character/MovementController.cs b/Assets/Scripts/Character/MovementController.cs index 3ade88a..b1849ce 100644 --- a/Assets/Scripts/Character/MovementController.cs +++ b/Assets/Scripts/Character/MovementController.cs @@ -6,18 +6,11 @@ using UnityEngine.AI; [RequireComponent(typeof(NavMeshAgent))] public class MovementController : MonoBehaviour { -<<<<<<< HEAD public int PointStartID { get; set; } public int PointEndID { get; private set; } public float FlagDistance { get; private set; } private const float updateFlagPositionDelay = 5; private const float updateReachedDestinationDelay = 5; -======= - public NavPoint currentPosition { get; set; } - private Dictionary navPoints = new Dictionary(); - - [SerializeField] private NavMeshAgent navMeshAgent; ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 [SerializeField] private NavMeshAgent navMeshAgent; [SerializeField] private GameObject flag; @@ -28,7 +21,6 @@ public class MovementController : MonoBehaviour private void Awake() { -<<<<<<< HEAD navMeshAgent.speed = SettingsReader.Instance.GetSettings.MovementSpeed; idNavPointDict = MapManager.IDToNavPoint; InvokeRepeating(nameof(UpdateFlagPosition), 0, updateFlagPositionDelay); @@ -43,12 +35,6 @@ public class MovementController : MonoBehaviour private void UpdateFlagPosition() { FlagDistance = (flag.transform.position - gameObject.transform.position).magnitude; -======= - navMeshAgent.speed = SettingsReader.Instance.GetSettings.movementSpeed; - foreach (var np in MapManager.navPoints) { - navPoints[np.PointId] = np; - } ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 } public void MoveToPointById(int id) @@ -62,27 +48,15 @@ public class MovementController : MonoBehaviour } public void MoveToRandomPoint() -<<<<<<< HEAD { - Debug.Log(MapManager.NavPoints == null); GoToNextNavPoint(MapManager.NavPoints[Random.Range(0, MapManager.NavPoints.Count)]); -======= - { - // Debug.Log(MapManager.navPoints == null); - goToNextNavPoint(MapManager.navPoints[Random.Range(0, MapManager.navPoints.Count)]); ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 } public List GetPointsCandidate() { -<<<<<<< HEAD return MapManager.NavPoints .Where(point => (idNavPointDict[PointStartID].Position - point.Position).magnitude < SettingsReader.Instance.GetSettings.MovementDistance) -======= - return MapManager.navPoints - .Where(point => (currentPosition.position - point.position).magnitude < SettingsReader.Instance.GetSettings.movementDistance) ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 .ToList(); } diff --git a/Assets/Scripts/Character/NPC.cs b/Assets/Scripts/Character/NPC.cs index 932379c..d47e377 100644 --- a/Assets/Scripts/Character/NPC.cs +++ b/Assets/Scripts/Character/NPC.cs @@ -70,14 +70,7 @@ public class NPC : Agent, ICharacter public override void CollectObservations(VectorSensor sensor) { -<<<<<<< HEAD var candidates = moveController.GetPointsCandidate(); -======= - sensor.AddObservation(Condition.HealthPoints); - sensor.AddObservation(Condition.ArmourPoints); - sensor.AddObservation(Condition.Ammunition); - sensor.AddObservation((int) NPC_State.State); ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 //common sensors sensor.AddObservation(GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(), @@ -100,7 +93,6 @@ public class NPC : Agent, ICharacter //point sensors foreach (var point in candidates) { -<<<<<<< HEAD bufferSensor.AppendObservation(new float[] { point.DeathAttr, (int)point.navType, @@ -112,35 +104,6 @@ public class NPC : Agent, ICharacter GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(), point.Position).ToInt() }); -======= - var parray = new float[] - { - //1 position in navpointId - (float) moveController.currentPosition.PointId, - //2 distance to flag - moveController.currentPosition.FlagDistance, - //3 death count in point - moveController.currentPosition.DeathAttr, - //4 flagEnemyDistance - GameManager.IsCloserToFlagFromNextNavPoint(point, transform.position) == true ? 1 : 0, - //5 EnemyVsNavPointDistance - GameManager.IsCloserToEnemyThanToNextNavPoint(point, transform.position, AgentCharacter.Team) == true - ? 1 - : 0 - }; - // var _parray = string.Join(" ", parray); - // Debug.Log("OBS: " + _parray); - bufferSensor.AppendObservation(parray); - } - } - - public override void Heuristic(in ActionBuffers actionsOut) - { - var discreteActionsOut = actionsOut.DiscreteActions; - if (Input.GetKeyDown(KeyCode.W)) - { - discreteActionsOut[0] = 1; ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 } } @@ -149,7 +112,6 @@ public class NPC : Agent, ICharacter var result = actions.DiscreteActions; if (result[0] == 0) { -<<<<<<< HEAD if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Cover) return; NpcState = CoverState; @@ -185,13 +147,6 @@ public class NPC : Agent, ICharacter case 1: moveController.ReturnToStartPoint(); NpcState = RunningState; break; default: throw new ArgumentException("Undefined Action recieved"); } -======= - moveController.MoveToRandomPoint(); - NPC_State = RunningState; - } else if (actions.DiscreteActions[0] == 2) - { - moveController.MoveToPointById(actions.DiscreteActions[1]); ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 } } #endregion diff --git a/Assets/Scripts/Misc/NavPoint.cs b/Assets/Scripts/Misc/NavPoint.cs index 473d7fa..a70fd61 100755 --- a/Assets/Scripts/Misc/NavPoint.cs +++ b/Assets/Scripts/Misc/NavPoint.cs @@ -17,21 +17,12 @@ public class NavPoint : MonoBehaviour public NavPointType navType = NavPointType.Direction; [HideInInspector] -<<<<<<< HEAD public int PointId = 0; -======= - public int PointId; ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 public float DeathAttr = 0; public List EnemiesSeen = new List(); private void Start() { -<<<<<<< HEAD FlagDistance = (GameObject.FindGameObjectWithTag("Flag").transform.position - Position).magnitude; -======= - PointId = GetInstanceID(); - FlagDistance = (GameObject.FindGameObjectWithTag("Flag").transform.position - position).magnitude; ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 } } From 2caf658d190d294de644e3042211c96566daa261 Mon Sep 17 00:00:00 2001 From: Krazerleo Date: Thu, 5 May 2022 18:11:57 +0700 Subject: [PATCH 3/5] "update unresolved conflicts" --- Assets/Scripts/Character/CharacterCondition.cs | 1 - Assets/Scripts/Character/MovementController.cs | 10 ---------- Assets/Scripts/Managers/MapManager.cs | 2 -- 3 files changed, 13 deletions(-) diff --git a/Assets/Scripts/Character/CharacterCondition.cs b/Assets/Scripts/Character/CharacterCondition.cs index 8d7d5c5..2124ddb 100755 --- a/Assets/Scripts/Character/CharacterCondition.cs +++ b/Assets/Scripts/Character/CharacterCondition.cs @@ -9,7 +9,6 @@ public class CharacterCondition public event Action OnChangeAmmunitionEvent; private int health; - public int HealthPoints { get diff --git a/Assets/Scripts/Character/MovementController.cs b/Assets/Scripts/Character/MovementController.cs index b1849ce..70341bb 100644 --- a/Assets/Scripts/Character/MovementController.cs +++ b/Assets/Scripts/Character/MovementController.cs @@ -36,16 +36,6 @@ 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() { diff --git a/Assets/Scripts/Managers/MapManager.cs b/Assets/Scripts/Managers/MapManager.cs index b28dcba..58e5c77 100755 --- a/Assets/Scripts/Managers/MapManager.cs +++ b/Assets/Scripts/Managers/MapManager.cs @@ -5,8 +5,6 @@ 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; } From b8e8e74ab448c9126b0c22b32ed7b1d25507d97d Mon Sep 17 00:00:00 2001 From: Krazerleo Date: Thu, 5 May 2022 20:45:26 +0700 Subject: [PATCH 4/5] 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(); 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 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 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) From 3908334f656b248dc1f2eb4fe5a7918685dd472e Mon Sep 17 00:00:00 2001 From: Krazerleo Date: Sat, 7 May 2022 21:45:28 +0700 Subject: [PATCH 5/5] Finally fixed --- Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta | 7 ------- ProjectSettings/ProjectVersion.txt | 2 -- 2 files changed, 9 deletions(-) delete mode 100755 Assets/ML-Agents/Timers/Greatest_map_ever_timers.json.meta delete mode 100755 ProjectSettings/ProjectVersion.txt 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/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)