From ffe76739f0e90e16a13bd77d595040df1a7f3484 Mon Sep 17 00:00:00 2001 From: cailean Date: Fri, 1 Mar 2024 14:04:13 +0000 Subject: [PATCH] wall layer added --- .../1_House/Sections/Backdoor/Backdoor.prefab | 2 +- .../Sections/Front Door/Front Door.prefab | 2 +- .../Sections/Inside Door/Inside Door.prefab | 2 +- ..._SpotMini-House_2023.blend_Dupli_50.prefab | 2 +- .../Physics Materials/Actor.physicMaterial | 4 +- .../Physics Materials/Ground.physicMaterial | 4 +- Assets/6_Scenes/Beep.unity | 93 ++++++++++++++++++- Assets/ML-Agents/Timers/Beep_timers.json | 2 +- ProjectSettings/TagManager.asset | 2 +- 9 files changed, 99 insertions(+), 14 deletions(-) diff --git a/Assets/1_House/Sections/Backdoor/Backdoor.prefab b/Assets/1_House/Sections/Backdoor/Backdoor.prefab index 47d6b9a..9e8adc5 100644 --- a/Assets/1_House/Sections/Backdoor/Backdoor.prefab +++ b/Assets/1_House/Sections/Backdoor/Backdoor.prefab @@ -491,7 +491,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5444206274498622913} - m_Layer: 0 + m_Layer: 7 m_Name: Backdoor m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/1_House/Sections/Front Door/Front Door.prefab b/Assets/1_House/Sections/Front Door/Front Door.prefab index f76e0c2..f3d5082 100644 --- a/Assets/1_House/Sections/Front Door/Front Door.prefab +++ b/Assets/1_House/Sections/Front Door/Front Door.prefab @@ -186,7 +186,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1843523244399503061} - m_Layer: 0 + m_Layer: 7 m_Name: Front Door m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/1_House/Sections/Inside Door/Inside Door.prefab b/Assets/1_House/Sections/Inside Door/Inside Door.prefab index 1c9b24e..7dce999 100644 --- a/Assets/1_House/Sections/Inside Door/Inside Door.prefab +++ b/Assets/1_House/Sections/Inside Door/Inside Door.prefab @@ -321,7 +321,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7241375966937616540} - m_Layer: 0 + m_Layer: 7 m_Name: Inside Door m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/1_House/Sections/Outside Rail/House_Porch Railing_L_BB_SpotMini-House_2023.blend_Dupli_50.prefab b/Assets/1_House/Sections/Outside Rail/House_Porch Railing_L_BB_SpotMini-House_2023.blend_Dupli_50.prefab index ac3fd29..613c6c4 100644 --- a/Assets/1_House/Sections/Outside Rail/House_Porch Railing_L_BB_SpotMini-House_2023.blend_Dupli_50.prefab +++ b/Assets/1_House/Sections/Outside Rail/House_Porch Railing_L_BB_SpotMini-House_2023.blend_Dupli_50.prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 4840150175616191010} - component: {fileID: 572255649407710708} - component: {fileID: 7096751564704388397} - m_Layer: 0 + m_Layer: 7 m_Name: House_Porch Railing_L_BB_SpotMini-House_2023.blend_Dupli_50 m_TagString: wall m_Icon: {fileID: 0} diff --git a/Assets/3_Materials/Physics Materials/Actor.physicMaterial b/Assets/3_Materials/Physics Materials/Actor.physicMaterial index 383f4d6..c642c87 100644 --- a/Assets/3_Materials/Physics Materials/Actor.physicMaterial +++ b/Assets/3_Materials/Physics Materials/Actor.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Actor - dynamicFriction: 2 - staticFriction: 2 + dynamicFriction: 0 + staticFriction: 0 bounciness: 0 frictionCombine: 2 bounceCombine: 0 diff --git a/Assets/3_Materials/Physics Materials/Ground.physicMaterial b/Assets/3_Materials/Physics Materials/Ground.physicMaterial index 4e13ab4..2ad8e74 100644 --- a/Assets/3_Materials/Physics Materials/Ground.physicMaterial +++ b/Assets/3_Materials/Physics Materials/Ground.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Ground - dynamicFriction: 1000 - staticFriction: 1000 + dynamicFriction: 0 + staticFriction: 0 bounciness: 0 frictionCombine: 0 bounceCombine: 2 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 03bcc6f..22fea4f 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -144,7 +144,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83944016} serializedVersion: 2 - m_LocalRotation: {x: 0.12893897, y: 0.8406356, z: -0.4736417, w: 0.22884533} + m_LocalRotation: {x: 0.085551925, y: 0.91226745, z: -0.31431225, w: 0.248308} m_LocalPosition: {x: -210.12523, y: 15.466, z: 510.0548} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -597,8 +597,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.12893897, y: 0.8406356, z: -0.4736417, w: 0.22884533} - m_LocalPosition: {x: -210.12523, y: 15.466, z: 510.0548} + m_LocalRotation: {x: 0.085551925, y: 0.91226745, z: -0.31431225, w: 0.248308} + m_LocalPosition: {x: -207.48357, y: 6.661335, z: 505.5625} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6232,11 +6232,31 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 547380827529143388} m_Modifications: + - target: {fileID: 1347360566370426090, guid: 42f465ca585883e4ebc5614c9fd570fd, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2166232566238515047, guid: 42f465ca585883e4ebc5614c9fd570fd, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3300076144128325400, guid: 42f465ca585883e4ebc5614c9fd570fd, type: 3} propertyPath: m_Name value: Inside Door objectReference: {fileID: 0} + - target: {fileID: 4865499103987798832, guid: 42f465ca585883e4ebc5614c9fd570fd, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6961441076556808994, guid: 42f465ca585883e4ebc5614c9fd570fd, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7241375966937616540, guid: 42f465ca585883e4ebc5614c9fd570fd, type: 3} propertyPath: m_LocalPosition.x @@ -6939,11 +6959,31 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5280690637785505442, guid: a675ba6e3554386459dabb984271bfab, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 5499488596631623843, guid: a675ba6e3554386459dabb984271bfab, type: 3} propertyPath: m_Name value: Front Door objectReference: {fileID: 0} + - target: {fileID: 6409585968859697487, guid: a675ba6e3554386459dabb984271bfab, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7719826384157559048, guid: a675ba6e3554386459dabb984271bfab, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8830648566165926502, guid: a675ba6e3554386459dabb984271bfab, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8392,11 +8432,36 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1413449885421140635, guid: 26f4eeb7f8c88c045a1dd690c0d93a23, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1983432355300712286, guid: 26f4eeb7f8c88c045a1dd690c0d93a23, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3487228444967064671, guid: 26f4eeb7f8c88c045a1dd690c0d93a23, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3752991940352976284, guid: 26f4eeb7f8c88c045a1dd690c0d93a23, type: 3} propertyPath: m_Name value: House Walls objectReference: {fileID: 0} + - target: {fileID: 4091039465939890370, guid: 26f4eeb7f8c88c045a1dd690c0d93a23, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7577900699176852597, guid: 26f4eeb7f8c88c045a1dd690c0d93a23, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8803,7 +8868,7 @@ GameObject: - component: {fileID: 666444808353467878} - component: {fileID: 9139986098392536328} - component: {fileID: 9139986098392536329} - m_Layer: 0 + m_Layer: 7 m_Name: House|Porch_L_BB_SpotMini-House_2023.blend|Dupli|43 m_TagString: ground m_Icon: {fileID: 0} @@ -10209,6 +10274,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 547380827529143388} m_Modifications: + - target: {fileID: 1479734752054701511, guid: 11e4e9dc5246ceb46936615556c5586d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1586110645434131774, guid: 11e4e9dc5246ceb46936615556c5586d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4702515179262390860, guid: 11e4e9dc5246ceb46936615556c5586d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 5444206274498622913, guid: 11e4e9dc5246ceb46936615556c5586d, type: 3} propertyPath: m_LocalPosition.x @@ -10259,6 +10339,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6071508799918963446, guid: 11e4e9dc5246ceb46936615556c5586d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 8811211774490203470, guid: 11e4e9dc5246ceb46936615556c5586d, type: 3} propertyPath: m_Name diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 0acfbab..5a5bcb1 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":38.1027328,"total":38.697915699999996,"children":{"InitializeActuators":{"count":1,"self":0.0015126,"total":0.0015126,"children":null},"InitializeSensors":{"count":1,"self":0.0020038,"total":0.0020038,"children":null},"AgentSendState":{"count":1214,"self":0.0136207,"total":0.2929302,"children":{"CollectObservations":{"count":243,"self":0.0074198999999999992,"total":0.0074198999999999992,"children":null},"WriteActionMask":{"count":243,"self":0.0010341,"total":0.0010341,"children":null},"RequestDecision":{"count":243,"self":0.27085549999999997,"total":0.27085549999999997,"children":null}}},"DecideAction":{"count":1214,"self":0.2815834,"total":0.2866267,"children":{"RayPerceptionSensor.Perceive":{"count":243,"self":0.0050433,"total":0.0050433,"children":null}}},"AgentAct":{"count":1214,"self":0.0121106,"total":0.0121106,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709301189","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":"1709301228"}} \ No newline at end of file +{"count":1,"self":22.1533968,"total":22.364477299999997,"children":{"InitializeActuators":{"count":1,"self":0.0010178,"total":0.0010178,"children":null},"InitializeSensors":{"count":1,"self":0.0020058999999999997,"total":0.0020058999999999997,"children":null},"AgentSendState":{"count":786,"self":0.0070199,"total":0.024118399999999998,"children":{"CollectObservations":{"count":158,"self":0.0035277999999999998,"total":0.0035277999999999998,"children":null},"WriteActionMask":{"count":158,"self":0.0005032,"total":0.0005032,"children":null},"RequestDecision":{"count":158,"self":0.0130675,"total":0.0130675,"children":null}}},"DecideAction":{"count":786,"self":0.170895,"total":0.1729041,"children":{"RayPerceptionSensor.Perceive":{"count":158,"self":0.0020090999999999998,"total":0.0020090999999999998,"children":null}}},"AgentAct":{"count":786,"self":0.0100348,"total":0.0100348,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709301810","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":"1709301832"}} \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index bed7a84..d91829b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -24,7 +24,7 @@ TagManager: - Water - UI - virtualCamPost - - + - Walls - - -