diff --git a/Assets/2_Chair/Chair.prefab b/Assets/2_Chair/Chair.prefab index db7ba09..b32541c 100644 --- a/Assets/2_Chair/Chair.prefab +++ b/Assets/2_Chair/Chair.prefab @@ -2139,7 +2139,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4d4f1f9b90b1b3949a25ccabbf8429d4, type: 3} m_Name: m_EditorClassIdentifier: - m_InitialModel: {fileID: 5022602860645237092, guid: b9c79f9e7b4a9794b8f05f8467777884, + m_InitialModel: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} nnModelList: - {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} diff --git a/Assets/3_Materials/Physics Materials/Actor.physicMaterial b/Assets/3_Materials/Physics Materials/Actor.physicMaterial index c642c87..383f4d6 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: 0 - staticFriction: 0 + dynamicFriction: 2 + staticFriction: 2 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 2ad8e74..4e13ab4 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: 0 - staticFriction: 0 + dynamicFriction: 1000 + staticFriction: 1000 bounciness: 0 frictionCombine: 0 bounceCombine: 2 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 2e5b354..a13b198 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -234,7 +234,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83569712} serializedVersion: 2 - m_LocalRotation: {x: 0.020231629, y: 0.9743378, z: -0.097696625, w: 0.20177199} + m_LocalRotation: {x: 0.020231545, y: 0.974338, z: -0.09769663, w: 0.20177117} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -392,7 +392,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: 0.03223712, y: 0.96677077, z: -0.15566999, w: 0.20020498} + m_LocalRotation: {x: 0.03223699, y: 0.96677095, z: -0.15567, w: 0.20020418} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -489,6 +489,78 @@ Transform: - {fileID: 2069309702} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &161849297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 161849298} + - component: {fileID: 161849299} + - component: {fileID: 161849300} + m_Layer: 0 + m_Name: wp1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &161849298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161849297} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.73, y: -35.8, z: 63.98} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 256169943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &161849299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161849297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 161849298} + m_WaitTime: 0 + m_ModelName: Stairs + m_Index: 1 + m_Touched: 0 +--- !u!65 &161849300 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161849297} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &163243333 GameObject: m_ObjectHideFlags: 0 @@ -688,7 +760,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &209465967 +--- !u!1 &219793649 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -696,71 +768,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 209465968} - - component: {fileID: 209465970} - - component: {fileID: 209465969} + - component: {fileID: 219793650} + - component: {fileID: 219793651} m_Layer: 0 - m_Name: Waypoint (1) + m_Name: Ground Manager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &209465968 +--- !u!4 &219793650 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 209465967} + m_GameObject: {fileID: 219793649} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.07, y: -32.9, z: 70.54} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2053539510} + m_Father: {fileID: 1633830349} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &209465969 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 209465967} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &209465970 +--- !u!114 &219793651 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 209465967} + m_GameObject: {fileID: 219793649} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Script: {fileID: 11500000, guid: 458ff8f25e7cfa14a9e197776f252cf6, type: 3} m_Name: m_EditorClassIdentifier: - m_StartingPosition: 0 - m_WaypointPosition: {fileID: 209465968} - m_WaitTime: 0 - m_ModelName: Climber - m_Index: 1 - m_Touched: 0 ---- !u!1 &219793649 + m_Floor: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} + m_Agent: {fileID: 13400000, guid: f5a7d4c9dbe3163459d7f47025557652, type: 2} + m_Timer: 5 + m_TimerTray: 10 + m_HasChanged: 0 +--- !u!1 &256169942 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -768,47 +817,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 219793650} - - component: {fileID: 219793651} + - component: {fileID: 256169943} m_Layer: 0 - m_Name: Ground Manager + m_Name: Path Outside Stairs m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &219793650 +--- !u!4 &256169943 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219793649} + m_GameObject: {fileID: 256169942} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1633830349} + m_Children: + - {fileID: 604093288} + - {fileID: 161849298} + - {fileID: 1594836261} + m_Father: {fileID: 1360433624} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &219793651 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219793649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 458ff8f25e7cfa14a9e197776f252cf6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Floor: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} - m_Agent: {fileID: 13400000, guid: f5a7d4c9dbe3163459d7f47025557652, type: 2} - m_Timer: 5 - m_TimerTray: 10 - m_HasChanged: 0 --- !u!1 &264146865 GameObject: m_ObjectHideFlags: 0 @@ -1097,7 +1131,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 36, y: 24} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -1212,7 +1246,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377437129} serializedVersion: 2 - m_LocalRotation: {x: -0.037838772, y: 0.8817097, z: -0.071784794, w: -0.46476156} + 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 @@ -1250,7 +1284,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 0.01 - m_SensorSize: {x: 36, y: 24} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 1.9 @@ -1329,17 +1363,17 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -258.72 + value: -244.4 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.y - value: 8.5 + value: 3.3300018 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 517.25 + value: 481.96 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -1716,8 +1750,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.16138388, y: 0.089587, z: -0.014712318, w: 0.98270696} - m_LocalPosition: {x: 9.3949585, y: -3.307354, z: -5.0979614} + m_LocalRotation: {x: 0.16138378, y: 0.089588195, z: -0.014712508, w: 0.9827069} + m_LocalPosition: {x: 9.394943, y: -3.307354, z: -5.0979614} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1838,7 +1872,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 36, y: 24} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -1881,7 +1915,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: 0.17829932, y: -0.22369513, z: 0.041663494, w: 0.9573056} + m_LocalRotation: {x: 0.17829932, y: -0.22369511, z: 0.041663487, w: 0.9573056} m_LocalPosition: {x: 9.355881, y: -3.2973547, z: -5.6164856} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1919,7 +1953,7 @@ MonoBehaviour: LensShift: {x: -0.21, y: 0.15} GateFit: 1 FocusDistance: 10 - m_SensorSize: {x: 36, y: 24} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -2060,6 +2094,78 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1412792145} m_PrefabAsset: {fileID: 0} +--- !u!1 &604093287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 604093288} + - component: {fileID: 604093289} + - component: {fileID: 604093290} + m_Layer: 0 + m_Name: wp1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &604093288 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604093287} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.5, y: -35.17, z: 58.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 256169943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &604093289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604093287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 1 + m_WaypointPosition: {fileID: 604093288} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 0 + m_Touched: 0 +--- !u!65 &604093290 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 604093287} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &604918581 GameObject: m_ObjectHideFlags: 0 @@ -2141,7 +2247,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 36, y: 24} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -2835,7 +2941,7 @@ Transform: m_GameObject: {fileID: 1124157896} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} - m_LocalPosition: {x: 9.3949585, y: -3.307354, z: -5.0979614} + m_LocalPosition: {x: 9.394943, y: -3.307354, z: -5.0979614} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3028,7 +3134,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178814724} serializedVersion: 2 - m_LocalRotation: {x: 0.020202018, y: 0.9790844, z: -0.16078894, w: 0.123015165} + m_LocalRotation: {x: 0.02020182, y: 0.97908455, z: -0.16078888, w: 0.12301403} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3443,6 +3549,12 @@ PrefabInstance: propertyPath: m_SelectedBrain value: 0 objectReference: {fileID: 0} + - target: {fileID: 8187530526923920244, guid: f03606b436da1d94e977c8ffa2825bd9, + type: 3} + propertyPath: m_InitialModel + value: + objectReference: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3930,6 +4042,78 @@ MonoBehaviour: m_ModelName: Climber m_Index: 3 m_Touched: 0 +--- !u!1 &1594836260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1594836261} + - component: {fileID: 1594836262} + - component: {fileID: 1594836263} + m_Layer: 0 + m_Name: wp1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1594836261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594836260} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.73, y: -32.86, z: 74.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 256169943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1594836262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594836260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 1594836261} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 2 + m_Touched: 0 +--- !u!65 &1594836263 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594836260} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1633830348 GameObject: m_ObjectHideFlags: 0 @@ -4461,39 +4645,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2053539509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2053539510} - m_Layer: 0 - m_Name: Path Grass > Porch Stairs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2053539510 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2053539509} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2139292022} - - {fileID: 209465968} - m_Father: {fileID: 1360433624} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2069309701 GameObject: m_ObjectHideFlags: 0 @@ -4819,78 +4970,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2139292021 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2139292022} - - component: {fileID: 2139292024} - - component: {fileID: 2139292023} - m_Layer: 0 - m_Name: Waypoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2139292022 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2139292021} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.07, y: -34.76, z: 61.09} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2053539510} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &2139292023 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2139292021} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &2139292024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2139292021} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StartingPosition: 0 - m_WaypointPosition: {fileID: 2139292022} - m_WaitTime: 0 - m_ModelName: Walker - m_Index: 0 - m_Touched: 0 --- !u!1001 &2794896440572570268 PrefabInstance: m_ObjectHideFlags: 0 @@ -4922,7 +5001,7 @@ PrefabInstance: - target: {fileID: 1082572882027964806, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2913576066548479887, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} @@ -5024,8 +5103,8 @@ PrefabInstance: addedObject: {fileID: 2072680723} - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} - insertIndex: 1 - addedObject: {fileID: 2053539510} + insertIndex: -1 + addedObject: {fileID: 256169943} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} --- !u!1001 &8839643052404795280 diff --git a/Assets/7_Scripts/Agent/Walker.cs b/Assets/7_Scripts/Agent/Walker.cs index 23188a8..5b42a53 100644 --- a/Assets/7_Scripts/Agent/Walker.cs +++ b/Assets/7_Scripts/Agent/Walker.cs @@ -144,6 +144,7 @@ public class Walker : Agent */ public override void OnEpisodeBegin() { + Debug.Log("Begin!"); // Set values of Joint Controller for exploring emrgent behvaiours if (m_SelectedBrain == Brain.DMScrambler) { @@ -345,7 +346,7 @@ public class Walker : Agent if (this.StepCount - m_StepCountAtLastMeter >= (1000)) { SetReward(-1f); - EndEpisode(); + //EndEpisode(); } //AddReward(-0.002f); diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 9c93383..231fd08 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":25.8680256,"total":26.1025293,"children":{"InitializeActuators":{"count":1,"self":0.0009994,"total":0.0009994,"children":null},"InitializeSensors":{"count":1,"self":0.0025066999999999997,"total":0.0025066999999999997,"children":null},"AgentSendState":{"count":985,"self":0.0090438999999999988,"total":0.0246679,"children":{"CollectObservations":{"count":197,"self":0.0065209,"total":0.0065209,"children":null},"WriteActionMask":{"count":197,"self":0,"total":0,"children":null},"RequestDecision":{"count":197,"self":0.0091031,"total":0.0091031,"children":null}}},"DecideAction":{"count":985,"self":0.1957949,"total":0.1983015,"children":{"RayPerceptionSensor.Perceive":{"count":197,"self":0.0025066,"total":0.0025066,"children":null}}},"AgentAct":{"count":985,"self":0.0070282,"total":0.0070282,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710855623","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":"1710855649"}} \ No newline at end of file +{"count":1,"self":65.926976,"total":66.503563,"children":{"InitializeActuators":{"count":1,"self":0.0009981,"total":0.0009981,"children":null},"InitializeSensors":{"count":1,"self":0.0010041,"total":0.0010041,"children":null},"AgentSendState":{"count":3018,"self":0.032131099999999996,"total":0.0723597,"children":{"CollectObservations":{"count":604,"self":0.0160462,"total":0.0160462,"children":null},"WriteActionMask":{"count":604,"self":0,"total":0,"children":null},"RequestDecision":{"count":604,"self":0.0241824,"total":0.0241824,"children":null}}},"DecideAction":{"count":3018,"self":0.4765636,"total":0.47956329999999997,"children":{"RayPerceptionSensor.Perceive":{"count":604,"self":0.0029996999999999997,"total":0.0029996999999999997,"children":null}}},"AgentAct":{"count":3018,"self":0.022660899999999998,"total":0.022660899999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710856847","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":"1710856913"}} \ No newline at end of file