From 476435897178f0e7665a19c6285dd29b304091e0 Mon Sep 17 00:00:00 2001 From: cailean Date: Fri, 8 Mar 2024 15:26:47 +0000 Subject: [PATCH] door opens inwards --- Assets/15_Prefabs/Environment.prefab | 5 +++ Assets/15_Prefabs/Waypoints.prefab | 8 ++-- .../Sections/Front Door/Front Door.prefab | 22 ++++----- Assets/6_Scenes/Beep.unity | 45 ++++++++++++++----- Assets/ML-Agents/Timers/Beep_timers.json | 2 +- ProjectSettings/TagManager.asset | 2 +- 6 files changed, 57 insertions(+), 27 deletions(-) diff --git a/Assets/15_Prefabs/Environment.prefab b/Assets/15_Prefabs/Environment.prefab index bc88d7b..03003f4 100644 --- a/Assets/15_Prefabs/Environment.prefab +++ b/Assets/15_Prefabs/Environment.prefab @@ -13569,6 +13569,11 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: 9117399109406583951, guid: a675ba6e3554386459dabb984271bfab, + type: 3} + propertyPath: m_Limits.max + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/15_Prefabs/Waypoints.prefab b/Assets/15_Prefabs/Waypoints.prefab index 3c571c2..8d34157 100644 --- a/Assets/15_Prefabs/Waypoints.prefab +++ b/Assets/15_Prefabs/Waypoints.prefab @@ -118,8 +118,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointPosition: {fileID: 322217618113553874} m_WaitTime: 0 - m_ModelName: Stairs - m_Index: 2 + m_ModelName: Walker + m_Index: 0 m_Touched: 0 --- !u!65 &8995364599858444108 BoxCollider: @@ -244,8 +244,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointPosition: {fileID: 1594025285695098325} m_WaitTime: 0 - m_ModelName: Stairs - m_Index: 3 + m_ModelName: Walker + m_Index: 1 m_Touched: 0 --- !u!65 &6841600456297735987 BoxCollider: diff --git a/Assets/1_House/Sections/Front Door/Front Door.prefab b/Assets/1_House/Sections/Front Door/Front Door.prefab index f3d5082..c2ef63f 100644 --- a/Assets/1_House/Sections/Front Door/Front Door.prefab +++ b/Assets/1_House/Sections/Front Door/Front Door.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 6805587958580645026} - component: {fileID: 7497401303710287352} - component: {fileID: 9117399109406583951} - m_Layer: 0 + m_Layer: 3 m_Name: House|Door_L_BB_SpotMini-House_2023.blend|Dupli|2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -152,7 +152,7 @@ HingeJoint: m_Axis: {x: 0.02, y: 0, z: 0.95} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 1 + m_UseSpring: 0 m_Spring: spring: 0 damper: 20 @@ -166,9 +166,9 @@ HingeJoint: m_ExtendedLimits: 0 m_UseAcceleration: 0 m_Limits: - min: 0 - max: 177.2319 - bounciness: 1 + min: -180 + max: 89.173546 + bounciness: 0 bounceMinVelocity: 0.2 contactDistance: 0 m_BreakForce: Infinity @@ -221,7 +221,7 @@ GameObject: - component: {fileID: 8598568887807747922} - component: {fileID: 7337101859031385368} - component: {fileID: 3597069663864603029} - m_Layer: 0 + m_Layer: 3 m_Name: House|Handle_Back_L_BB_SpotMini-House_2023.blend|Dupli|3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -306,7 +306,7 @@ GameObject: - component: {fileID: 51882220390698097} - component: {fileID: 4465743497391940274} - component: {fileID: 2801256748257818818} - m_Layer: 0 + m_Layer: 3 m_Name: House|Handle_Front_L_BB_SpotMini-House_2023.blend|Dupli|4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -480,14 +480,14 @@ BoxCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 8 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.07223368, y: 0.22100005, z: 2.4700003} - m_Center: {x: 1.2685621, y: -0.018964171, z: 1.2350001} + m_Size: {x: 0.04488998, y: 0.08203687, z: 2.4700003} + m_Center: {x: 1.2822315, y: -0.08429977, z: 1.2350001} --- !u!54 &7647584094098484916 Rigidbody: m_ObjectHideFlags: 0 @@ -513,5 +513,5 @@ Rigidbody: m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 - m_Constraints: 14 + m_Constraints: 126 m_CollisionDetection: 0 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 76f5769..03dd657 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -791,17 +791,17 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -232.87999 + value: -246.5 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.y - value: 5.619999 + value: 5.799999 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 507.07 + value: 500.56 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -1063,9 +1063,9 @@ Camera: m_FOVAxisMode: 0 m_Iso: 50 m_ShutterSpeed: 0.0005 - m_Aperture: 2.2 - m_FocusDistance: 8.93528 - m_FocalLength: 5.9999995 + m_Aperture: 1.9 + m_FocusDistance: 67.52423 + m_FocalLength: 35 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: 126.8699 + field of view: 37.84929 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.29879025, y: -0.6448607, z: 0.2788991, w: 0.64582855} - m_LocalPosition: {x: 41.58, y: 5.960001, z: -7.8299866} + m_LocalRotation: {x: -0.03783877, y: 0.8817097, z: -0.07178479, w: -0.46476156} + m_LocalPosition: {x: -128.4, y: 13, z: -248.6} 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.15766333, y: 0.6501475, z: 0.14043981, w: 0.7298816} + m_LocalRotation: {x: -0.15766336, y: 0.6501475, z: 0.14043982, 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 @@ -3038,6 +3038,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2663865915400535980, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: m_Index + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2913576066548479887, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: m_Index + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_Target @@ -3141,6 +3151,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 788867738177514625, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1744424756382034348, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.x @@ -3156,6 +3171,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.19 objectReference: {fileID: 0} + - target: {fileID: 1966167951569347436, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2925090289982896939, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3006033085249723243, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 9713050..a3334c3 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"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 +{"count":1,"self":28.310783999999998,"total":28.555429699999998,"children":{"InitializeActuators":{"count":1,"self":0.0020306,"total":0.0020306,"children":null},"InitializeSensors":{"count":1,"self":0.0015023999999999999,"total":0.0015023999999999999,"children":null},"AgentSendState":{"count":1133,"self":0.0085603,"total":0.026192999999999998,"children":{"CollectObservations":{"count":227,"self":0.0075509999999999996,"total":0.0075509999999999996,"children":null},"WriteActionMask":{"count":227,"self":0,"total":0,"children":null},"RequestDecision":{"count":227,"self":0.010081699999999999,"total":0.010081699999999999,"children":null}}},"DecideAction":{"count":1133,"self":0.2013495,"total":0.20385799999999998,"children":{"RayPerceptionSensor.Perceive":{"count":227,"self":0.0025085,"total":0.0025085,"children":null}}},"AgentAct":{"count":1133,"self":0.010551399999999999,"total":0.010551399999999999,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709911558","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":"1709911587"}} \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c008590..3eb61dc 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -29,7 +29,7 @@ TagManager: - Walls - Chair - post processing - - + - Frame - - -