From dc1265226ca08f7e63000319a3bd4f7fee0a1319 Mon Sep 17 00:00:00 2001 From: cailean Date: Fri, 8 Mar 2024 15:07:13 +0000 Subject: [PATCH] changes to wp override --- Assets/15_Prefabs/Waypoints.prefab | 4 ++-- Assets/6_Scenes/Beep.unity | 10 +++++----- Assets/7_Scripts/Model Swapping/ModelSwap.cs | 3 +++ Assets/ML-Agents/Timers/Beep_timers.json | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Assets/15_Prefabs/Waypoints.prefab b/Assets/15_Prefabs/Waypoints.prefab index 6079d19..3c571c2 100644 --- a/Assets/15_Prefabs/Waypoints.prefab +++ b/Assets/15_Prefabs/Waypoints.prefab @@ -118,7 +118,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointPosition: {fileID: 322217618113553874} m_WaitTime: 0 - m_ModelName: Walker + m_ModelName: Stairs m_Index: 2 m_Touched: 0 --- !u!65 &8995364599858444108 @@ -244,7 +244,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointPosition: {fileID: 1594025285695098325} m_WaitTime: 0 - m_ModelName: Walker + m_ModelName: Stairs m_Index: 3 m_Touched: 0 --- !u!65 &6841600456297735987 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index db3f92c..76f5769 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -1065,7 +1065,7 @@ Camera: m_ShutterSpeed: 0.0005 m_Aperture: 2.2 m_FocusDistance: 8.93528 - m_FocalLength: 20 + m_FocalLength: 5.9999995 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -1080,7 +1080,7 @@ Camera: height: 1 near clip plane: 0.01 far clip plane: 5000 - field of view: 61.927517 + field of view: 126.8699 orthographic: 0 orthographic size: 10 m_Depth: 0 @@ -1106,8 +1106,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: -0.15766335, y: 0.6501475, z: 0.14043982, w: 0.7298816} - m_LocalPosition: {x: -5.4363403, y: -6.517355, z: -11.485382} + m_LocalRotation: {x: 0.29879025, y: -0.6448607, z: 0.2788991, w: 0.64582855} + m_LocalPosition: {x: 41.58, y: 5.960001, z: -7.8299866} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1174,7 +1174,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: -0.15766335, y: 0.6501475, z: 0.14043982, w: 0.7298816} + m_LocalRotation: {x: -0.15766333, y: 0.6501475, z: 0.14043981, w: 0.7298816} m_LocalPosition: {x: -5.4363403, y: -6.517355, z: -11.485382} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/7_Scripts/Model Swapping/ModelSwap.cs b/Assets/7_Scripts/Model Swapping/ModelSwap.cs index e2fd29e..fd0015b 100644 --- a/Assets/7_Scripts/Model Swapping/ModelSwap.cs +++ b/Assets/7_Scripts/Model Swapping/ModelSwap.cs @@ -102,6 +102,9 @@ public class ModelSwap : MonoBehaviour if (!m_currentModelName.Equals("Getup")) { SwapModelOnReachingWaypoint(modelName); + } else + { + m_PastModel = modelName; } } diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 4419f4a..9713050 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":75.631232,"total":76.535063,"children":{"InitializeActuators":{"count":1,"self":0.00050539999999999992,"total":0.00050539999999999992,"children":null},"InitializeSensors":{"count":1,"self":0.0020036999999999998,"total":0.0020036999999999998,"children":null},"AgentSendState":{"count":3533,"self":0.0376888,"total":0.3303442,"children":{"CollectObservations":{"count":707,"self":0.023062199999999998,"total":0.023062199999999998,"children":null},"WriteActionMask":{"count":707,"self":0.00050369999999999994,"total":0.00050369999999999994,"children":null},"RequestDecision":{"count":707,"self":0.2690895,"total":0.2690895,"children":null}}},"DecideAction":{"count":3533,"self":0.5322958,"total":0.5353066,"children":{"RayPerceptionSensor.Perceive":{"count":707,"self":0.0030107999999999997,"total":0.0030107999999999997,"children":null}}},"AgentAct":{"count":3533,"self":0.0356702,"total":0.0356702,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709909796","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final Git\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1709909872"}} \ No newline at end of file +{"count":1,"self":7.2371263999999993,"total":7.3128879,"children":{"InitializeActuators":{"count":1,"self":0.0015011,"total":0.0015011,"children":null},"InitializeSensors":{"count":1,"self":0.0020039999999999997,"total":0.0020039999999999997,"children":null},"AgentSendState":{"count":62,"self":0.0030066999999999997,"total":0.0135824,"children":{"CollectObservations":{"count":13,"self":0,"total":0,"children":null},"WriteActionMask":{"count":13,"self":0,"total":0,"children":null},"RequestDecision":{"count":13,"self":0.0105757,"total":0.0105757,"children":null}}},"DecideAction":{"count":62,"self":0.056674199999999994,"total":0.057674199999999995,"children":{"RayPerceptionSensor.Perceive":{"count":13,"self":0.001,"total":0.001,"children":null}}},"AgentAct":{"count":62,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709910372","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final Git\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1709910380"}} \ No newline at end of file