From f35f9182ca59ff24c865ba26675177914adf4cfe Mon Sep 17 00:00:00 2001 From: Andrey Gumirov Date: Wed, 13 Apr 2022 14:12:40 +0700 Subject: [PATCH] Added debug log and a few todos --- Assets/ML-Agents/Timers/Greatest_map_ever_timers.json | 2 +- Assets/Scripts/Character/MovementController.cs | 2 +- Assets/Scripts/Character/NPC.cs | 1 + ProjectSettings/ProjectVersion.txt | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json b/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json index 259eaa5..dee8d64 100755 --- a/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json +++ b/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json @@ -1 +1 @@ -{"count":1,"self":27.008124799999997,"total":28.0164227,"children":{"InitializeActuators":{"count":1,"self":0.0030001,"total":0.0030001,"children":null},"InitializeSensors":{"count":1,"self":0.0020001,"total":0.0020001,"children":null},"AgentSendState":{"count":1148,"self":0.0250195,"total":0.40993029999999997,"children":{"CollectObservations":{"count":1148,"self":0.3739037,"total":0.3739037,"children":null},"WriteActionMask":{"count":1148,"self":0.0050046,"total":0.0050046,"children":null},"RequestDecision":{"count":1148,"self":0.0060025,"total":0.0060025,"children":null}}},"DecideAction":{"count":1148,"self":0.33184349999999996,"total":0.33184349999999996,"children":null},"AgentAct":{"count":1148,"self":0.2595281,"total":0.2595281,"children":null}},"gauges":{"NPC.CumulativeReward":{"count":11,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1649822158","unity_version":"2019.4.35f1","command_line_arguments":"C:\\Program Files\\unityeditorfolder\\2019.4.35f1\\Editor\\Unity.exe -projectpath F:\\SigmaRiskManagment\\real shooter Git Version -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Leonid_Krazer -hubSessionId dca9b0c0-ba6e-11ec-ba13-6d2f32043678 -accessToken h2wulrZC-_wNB02rFLc8VoUWrSoRJ5zUGCjS9AOIxNY009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Greatest_map_ever","end_time_seconds":"1649822186"}} \ No newline at end of file +{"count":1,"self":9.6690519999999989,"total":9.830432,"children":{"InitializeActuators":{"count":1,"self":0.0072819999999999994,"total":0.0072819999999999994,"children":null},"InitializeSensors":{"count":1,"self":0.0050279999999999995,"total":0.0050279999999999995,"children":null},"AgentSendState":{"count":291,"self":0.015906,"total":0.12215899999999999,"children":{"CollectObservations":{"count":291,"self":0.094488,"total":0.094488,"children":null},"WriteActionMask":{"count":291,"self":0.003096,"total":0.003096,"children":null},"RequestDecision":{"count":291,"self":0.008669,"total":0.008669,"children":null}}},"DecideAction":{"count":291,"self":0.010034999999999999,"total":0.010034999999999999,"children":null},"AgentAct":{"count":291,"self":0.01038,"total":0.01038,"children":null}},"gauges":{"NPC.CumulativeReward":{"count":2,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1649833912","unity_version":"2019.4.36f1","command_line_arguments":"\/Applications\/Unity\/Hub\/Editor\/2019.4.36f1\/Unity.app\/Contents\/MacOS\/Unity -projectpath \/Users\/gav\/tmp\/projects\/real_shooter -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-gav -hubSessionId 00bae3b0-baf3-11ec-825c-d33a32cd27c6 -accessToken lsL7HWaJbQqgjzAcs45yqgSpYnYbj_1WIJQNy6b-hEg009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Greatest_map_ever","end_time_seconds":"1649833921"}} \ No newline at end of file diff --git a/Assets/Scripts/Character/MovementController.cs b/Assets/Scripts/Character/MovementController.cs index e45bf60..9fffed3 100755 --- a/Assets/Scripts/Character/MovementController.cs +++ b/Assets/Scripts/Character/MovementController.cs @@ -26,7 +26,7 @@ public class MovementController : MonoBehaviour goToNextNavPoint(MapManager.navPoints[Random.Range(0, MapManager.navPoints.Count)]); } - private NavPoint getPointCandidate() + private NavPoint getPointCandidate() // todo тут нужно, чтобы выдавался массив точек { var NavPointsPositions = MapManager.navPoints .Select(point => point.transform.position) diff --git a/Assets/Scripts/Character/NPC.cs b/Assets/Scripts/Character/NPC.cs index 776c42f..f474558 100755 --- a/Assets/Scripts/Character/NPC.cs +++ b/Assets/Scripts/Character/NPC.cs @@ -32,6 +32,7 @@ public class NPC : Agent sensor.AddObservation(Condition.ArmourPoints); sensor.AddObservation(Condition.Ammunition); sensor.AddObservation((int)Condition.npcState); + Debug.Log("Sensors: " + sensor); } public override void Heuristic(in ActionBuffers actionsOut) diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 89a11d7..bf8f7eb 100755 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.35f1 -m_EditorVersionWithRevision: 2019.4.35f1 (0462406dff2e) +m_EditorVersion: 2019.4.36f1 +m_EditorVersionWithRevision: 2019.4.36f1 (660c164b2fc5)