From e183de2dc24797ca665d61c43991fd1346f82298 Mon Sep 17 00:00:00 2001 From: cailean Date: Fri, 1 Mar 2024 13:21:18 +0000 Subject: [PATCH] collider changes --- Assets/2_Chair/Chair.prefab | 17 +++---- Assets/6_Scenes/Beep.unity | 61 +++++------------------- Assets/ML-Agents/Timers/Beep_timers.json | 2 +- 3 files changed, 22 insertions(+), 58 deletions(-) diff --git a/Assets/2_Chair/Chair.prefab b/Assets/2_Chair/Chair.prefab index ca37f58..cd83aaf 100644 --- a/Assets/2_Chair/Chair.prefab +++ b/Assets/2_Chair/Chair.prefab @@ -2038,9 +2038,9 @@ MonoBehaviour: VectorActionDescriptions: [] VectorActionSpaceType: 1 hasUpgradedBrainParametersWithActionSpec: 1 - m_Model: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} - m_InferenceDevice: 0 - m_BehaviorType: 0 + m_Model: {fileID: 5022602860645237092, guid: 00d0acaeb52a3894a9b8ca8c664b12db, type: 3} + m_InferenceDevice: 1 + m_BehaviorType: 2 m_BehaviorName: c_Walker TeamId: 0 m_UseChildSensors: 1 @@ -2062,15 +2062,15 @@ MonoBehaviour: agentParameters: maxStep: 0 hasUpgradedFromAgentParameters: 1 - MaxStep: 5000 - m_SelectedBrain: 2 + MaxStep: 0 + m_SelectedBrain: 4 m_TargetWalkingSpeed: 8 rWalkSpeedEachEpisode: 0 m_RandomiseYRotation: 0 m_RandomiseXYZRotation: 0 m_ModelSwap: 1 m_ProximitySwapper: 0 - m_SwitchModelAfterFalling: 0 + m_SwitchModelAfterFalling: 1 m_StepCountAtLastMeter: 0 m_LastXPosition: 0 m_FinishedSwap: 0 @@ -2132,7 +2132,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4d4f1f9b90b1b3949a25ccabbf8429d4, type: 3} m_Name: m_EditorClassIdentifier: - m_InitialModel: {fileID: 5022602860645237092, guid: 4e2e22c8058641f4f943af2d50b147f6, + m_InitialModel: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} nnModelList: - {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} @@ -2141,6 +2141,7 @@ MonoBehaviour: - {fileID: 5022602860645237092, guid: 4564a8c073c3e134b96ce1698dbae60b, type: 3} agent: {fileID: 0} currentModel: 0 + m_currentModelName: m_PastModel: 0 --- !u!1 &6163716254022380080 GameObject: @@ -2599,7 +2600,7 @@ Transform: - {fileID: 6935270707601542135} - {fileID: 1751972560819908944} m_Father: {fileID: 2722580235232797026} - m_LocalEulerAnglesHint: {x: 0, y: -2.06, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -52.3, z: 0} --- !u!65 &7445707003514573868 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 5e71f2d..766c3b4 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -144,8 +144,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83944016} serializedVersion: 2 - m_LocalRotation: {x: 0.48614922, y: -0.120646, z: 0.06797593, w: 0.86283416} - m_LocalPosition: {x: -243.0392, y: 48.23103, z: 445.67957} + m_LocalRotation: {x: 0.12893899, y: 0.8406356, z: -0.4736417, w: 0.22884533} + m_LocalPosition: {x: -209.92891, y: 48.23103, z: 460.5729} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -275,7 +275,7 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -246.86632 + value: -197.75632 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -285,7 +285,7 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 509.56186 + value: 490.23187 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -597,8 +597,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.48614922, y: -0.120646, z: 0.06797593, w: 0.86283416} - m_LocalPosition: {x: -243.0392, y: 48.23103, z: 445.67957} + m_LocalRotation: {x: 0.12893899, y: 0.8406356, z: -0.4736417, w: 0.22884533} + m_LocalPosition: {x: -209.92891, y: 48.23103, z: 460.5729} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1584,7 +1584,7 @@ Transform: m_GameObject: {fileID: 1201075075} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.77, y: 2.05, z: 36.62} + m_LocalPosition: {x: 35.34, y: 2.05, z: 17.29} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1706,7 +1706,7 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.x - value: -245.03485 + value: -206.8 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -1716,12 +1716,12 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.z - value: 501.46985 + value: 504.4 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalRotation.w - value: 0.9500255 + value: -0.18946251 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -1731,7 +1731,7 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalRotation.y - value: 0.31217235 + value: 0.981888 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -1746,24 +1746,13 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 36.38 + value: 201.843 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3382247266651750635, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: m_Model - value: - objectReference: {fileID: 5022602860645237092, guid: 00d0acaeb52a3894a9b8ca8c664b12db, - type: 3} - - target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -52.3 - objectReference: {fileID: 0} - target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_Name @@ -1774,32 +1763,6 @@ PrefabInstance: propertyPath: target value: objectReference: {fileID: 387060610} - - target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: MaxStep - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: m_ModelSwap - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: m_SelectedBrain - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: m_SwitchModelAfterFalling - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8187530526923920244, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - propertyPath: m_InitialModel - value: - objectReference: {fileID: 5022602860645237092, guid: 00d0acaeb52a3894a9b8ca8c664b12db, - type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index cdc9511..db840e7 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":102.3287168,"total":103.5031497,"children":{"InitializeActuators":{"count":1,"self":0.0015086,"total":0.0015086,"children":null},"InitializeSensors":{"count":1,"self":0.0020095,"total":0.0020095,"children":null},"AgentSendState":{"count":4862,"self":0.057065399999999995,"total":0.3548618,"children":{"CollectObservations":{"count":973,"self":0.0172076,"total":0.0172076,"children":null},"WriteActionMask":{"count":973,"self":0.0015118,"total":0.0015118,"children":null},"RequestDecision":{"count":973,"self":0.27907699999999996,"total":0.27907699999999996,"children":null}}},"DecideAction":{"count":4862,"self":0.7736535,"total":0.78123259999999994,"children":{"RayPerceptionSensor.Perceive":{"count":973,"self":0.0075791,"total":0.0075791,"children":null}}},"AgentAct":{"count":4862,"self":0.034820699999999996,"total":0.034820699999999996,"children":null}},"gauges":{"c_Walker.CumulativeReward":{"count":2,"max":26.0910969,"min":-0.8243657,"runningAverage":12.6333656,"value":-0.8243657,"weightedAverage":19.36223}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1708963677","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 -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":"1708963780"}} \ No newline at end of file +{"count":1,"self":19.264816,"total":19.3959936,"children":{"InitializeActuators":{"count":1,"self":0.0010225,"total":0.0010225,"children":null},"InitializeSensors":{"count":1,"self":0.0020038,"total":0.0020038,"children":null},"AgentSendState":{"count":436,"self":0.0060198,"total":0.016113099999999998,"children":{"CollectObservations":{"count":88,"self":0.001006,"total":0.001006,"children":null},"WriteActionMask":{"count":88,"self":0,"total":0,"children":null},"RequestDecision":{"count":88,"self":0.0090873,"total":0.0090873,"children":null}}},"DecideAction":{"count":436,"self":0.1080299,"total":0.1080299,"children":{"RayPerceptionSensor.Perceive":{"count":88,"self":0,"total":0,"children":null}}},"AgentAct":{"count":436,"self":0.0040087,"total":0.0040087,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709299247","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":"1709299266"}} \ No newline at end of file