From f2db371c6b90a123457b9d77ef5f698020793ee0 Mon Sep 17 00:00:00 2001 From: Dain Date: Fri, 20 Dec 2024 01:45:31 -0300 Subject: [PATCH] Update .gitignore and timer JSON files, adjust scene settings and UI text for clarity --- .gitignore | 10 ++++++++ Assets/ML-Agents/Timers/Test Mode_timers.json | 2 +- Assets/Resources.meta | 8 +++++++ Assets/Scenes/Test Mode.unity | 24 +++++++++---------- Assets/Scripts/GhostChase(RL).cs | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 ++-- 6 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 Assets/Resources.meta diff --git a/.gitignore b/.gitignore index 367fd57..9721bf7 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,8 @@ crashlytics-build.properties /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* +/ML-Agents + *~ *.pyc *.egg-info @@ -125,3 +127,11 @@ conda/_version.pyenv/ env/ ..bfg-report/2024-12-19/12-47-36/cache-stats.txt ..bfg-report/2024-12-19/12-47-36/object-id-map.old-new.txt +Assets/ML-Agents/Timers/Menu_timers.json +Assets/ML-Agents/Timers/Menu_timers.json.meta +Assets/ML-Agents/Timers/Test Mode_timers.json +Assets/Resources/PerformanceTestRunInfo.json +Assets/Resources/PerformanceTestRunInfo.json.meta +Assets/Resources/PerformanceTestRunSettings.json +Assets/Resources/PerformanceTestRunSettings.json.meta +Assets/ML-Agents/Timers/Test Mode_timers.json diff --git a/Assets/ML-Agents/Timers/Test Mode_timers.json b/Assets/ML-Agents/Timers/Test Mode_timers.json index 9924ba1..b626fb7 100644 --- a/Assets/ML-Agents/Timers/Test Mode_timers.json +++ b/Assets/ML-Agents/Timers/Test Mode_timers.json @@ -1 +1 @@ -{"count":1,"self":9.0373808,"total":9.084541,"children":{"InitializeActuators":{"count":1,"self":0.0012289999999999998,"total":0.0012289999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.001401,"total":0.001401,"children":null},"AgentSendState":{"count":247,"self":0.002155,"total":0.016573,"children":{"CollectObservations":{"count":50,"self":0.00045999999999999996,"total":0.00045999999999999996,"children":null},"WriteActionMask":{"count":50,"self":0.000274,"total":0.000274,"children":null},"RequestDecision":{"count":50,"self":0.013684,"total":0.013684,"children":null}}},"DecideAction":{"count":247,"self":0.02477,"total":0.02477,"children":null},"AgentAct":{"count":247,"self":0.0027329999999999998,"total":0.0027329999999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1734669545","unity_version":"2022.3.38f1","command_line_arguments":"\/Applications\/Unity\/Hub\/Editor\/2022.3.38f1\/Unity.app\/Contents\/MacOS\/Unity -projectpath \/Users\/yeinkim\/Documents\/GameDev\/Pacman_AI -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"3.0.0","scene_name":"Test Mode","end_time_seconds":"1734669554"}} \ No newline at end of file +{"count":1,"self":39.897439999999996,"total":39.958558,"children":{"InitializeActuators":{"count":1,"self":0.001366,"total":0.001366,"children":null},"InitializeSensors":{"count":1,"self":0.0016229999999999999,"total":0.0016229999999999999,"children":null},"AgentSendState":{"count":317,"self":0.002218,"total":0.016217,"children":{"CollectObservations":{"count":64,"self":0.000505,"total":0.000505,"children":null},"WriteActionMask":{"count":64,"self":0.000283,"total":0.000283,"children":null},"RequestDecision":{"count":64,"self":0.013210999999999999,"total":0.013210999999999999,"children":null}}},"DecideAction":{"count":317,"self":0.038474999999999995,"total":0.038474999999999995,"children":null},"AgentAct":{"count":317,"self":0.0033039999999999996,"total":0.0033039999999999996,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1734669640","unity_version":"2022.3.38f1","command_line_arguments":"\/Applications\/Unity\/Hub\/Editor\/2022.3.38f1\/Unity.app\/Contents\/MacOS\/Unity -projectpath \/Users\/yeinkim\/Documents\/GameDev\/Pacman_AI -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"3.0.0","scene_name":"Test Mode","end_time_seconds":"1734669680"}} \ No newline at end of file diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..8297c49 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee02e68c8edeb413d8e06f0fdd389e32 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test Mode.unity b/Assets/Scenes/Test Mode.unity index b1abafe..02d99a9 100644 --- a/Assets/Scenes/Test Mode.unity +++ b/Assets/Scenes/Test Mode.unity @@ -1933,7 +1933,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -15, y: -0.000014305115} + m_AnchoredPosition: {x: -22, y: -0.000014305115} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &108312851 @@ -17002,7 +17002,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 40 + orthographic size: 43 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -18538,7 +18538,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 144, y: -174} + m_AnchoredPosition: {x: 95.00002, y: -174} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &590973873 @@ -27503,7 +27503,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 146, y: 39} + m_AnchoredPosition: {x: 97, y: 39} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &877707418 @@ -34336,7 +34336,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 291.5, y: 239} + m_AnchoredPosition: {x: 296, y: 239} m_SizeDelta: {x: 200, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &974517952 @@ -34625,7 +34625,7 @@ Transform: m_GameObject: {fileID: 1023959331} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.7, y: -34.8, z: 0} + m_LocalPosition: {x: -4, y: -34.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35235,7 +35235,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -254, y: 231} + m_AnchoredPosition: {x: -220, y: 229} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1071846524 @@ -43167,7 +43167,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -237, y: 39.000004} + m_AnchoredPosition: {x: -254, y: 39.000004} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1214012057 @@ -58584,7 +58584,7 @@ Transform: m_GameObject: {fileID: 1820181623} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 55.9, y: 0, z: 0} + m_LocalPosition: {x: 51, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -61617,7 +61617,7 @@ Transform: m_GameObject: {fileID: 2001777194} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.7, y: 0, z: 0} + m_LocalPosition: {x: -4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -62258,7 +62258,7 @@ Transform: m_GameObject: {fileID: 2036094346} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 55.9, y: -34.8, z: 0} + m_LocalPosition: {x: 51, y: -34.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -62769,7 +62769,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -237, y: -174} + m_AnchoredPosition: {x: -254, y: -174} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2073946355 diff --git a/Assets/Scripts/GhostChase(RL).cs b/Assets/Scripts/GhostChase(RL).cs index de05a25..e51d764 100644 --- a/Assets/Scripts/GhostChase(RL).cs +++ b/Assets/Scripts/GhostChase(RL).cs @@ -20,7 +20,7 @@ private void Update() { if (counterText != null) { - counterText.text = $"Counter: {pacmanCaughtCounter}"; + counterText.text = $"Count: {pacmanCaughtCounter}"; } // Update timer and check for timeout diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 4c2ee31..256f99d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -15,6 +15,6 @@ EditorBuildSettings: path: Assets/Scenes/Main.unity guid: b626046fdf9464c5cbd89bd04b3ff28e - enabled: 1 - path: Assets/Scenes/Test.unity - guid: 3c74a9e8ba3bc4ddb9a1d764e7d23746 + path: Assets/Scenes/Test Mode.unity + guid: 35357843a6c00435daf791b371c9f45c m_configObjects: {}