diff --git a/Assets/15_Prefabs/Environment.prefab b/Assets/15_Prefabs/Environment.prefab index 87ccb53..e5c632b 100644 --- a/Assets/15_Prefabs/Environment.prefab +++ b/Assets/15_Prefabs/Environment.prefab @@ -14385,6 +14385,31 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3654837400929340511} m_Modifications: + - target: {fileID: 244729283271664975, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_Size.y + value: 51.69578 + objectReference: {fileID: 0} + - target: {fileID: 244729283271664975, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_Size.z + value: 271.4547 + objectReference: {fileID: 0} + - target: {fileID: 244729283271664975, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_Center.x + value: 11.069097 + objectReference: {fileID: 0} + - target: {fileID: 244729283271664975, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_Center.y + value: -15.755419 + objectReference: {fileID: 0} + - target: {fileID: 244729283271664975, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_Center.z + value: 1.294921 + objectReference: {fileID: 0} - target: {fileID: 755586128136106229, guid: 4a514862db9328d4895ba96423f9bb05, type: 3} propertyPath: m_Name @@ -14443,7 +14468,17 @@ PrefabInstance: - target: {fileID: 5083844281805799389, guid: 4a514862db9328d4895ba96423f9bb05, type: 3} propertyPath: m_MaxForce - value: 500 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 5083844281805799389, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_RampTimer + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5083844281805799389, guid: 4a514862db9328d4895ba96423f9bb05, + type: 3} + propertyPath: m_RampIncrement + value: 10 objectReference: {fileID: 0} - target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05, type: 3} @@ -14458,12 +14493,12 @@ PrefabInstance: - target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05, type: 3} propertyPath: m_TriggerExitEvent.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05, type: 3} propertyPath: m_TriggerStayEvent.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05, type: 3} diff --git a/Assets/15_Prefabs/Waypoints.prefab b/Assets/15_Prefabs/Waypoints.prefab index 16e9192..60e9acc 100644 --- a/Assets/15_Prefabs/Waypoints.prefab +++ b/Assets/15_Prefabs/Waypoints.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2913576066548479887} - component: {fileID: 4335030826809746649} m_Layer: 0 - m_Name: Waypoint P1 + m_Name: Waypoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -45,6 +45,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 6868380804102066130} m_WaitTime: 0 m_ModelName: Walker @@ -83,7 +84,7 @@ GameObject: - component: {fileID: 7773461343564336651} - component: {fileID: 7421041746933882682} m_Layer: 0 - m_Name: Waypoint P2 + m_Name: Waypoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -98,7 +99,7 @@ Transform: m_GameObject: {fileID: 687742805697622430} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -14.46, y: -33.1, z: 82.1} + m_LocalPosition: {x: -14.46, y: -33.21, z: 95} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -116,6 +117,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 841324076368356447} m_WaitTime: 0 m_ModelName: Walker @@ -187,6 +189,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 8145516383185921032} m_WaitTime: 0 m_ModelName: Climber @@ -291,6 +294,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 5770050963811399290} m_WaitTime: 0 m_ModelName: Walker @@ -362,6 +366,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 6593423734097067594} m_WaitTime: 0 m_ModelName: Climber @@ -463,6 +468,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1170441306195283109} + - {fileID: 7419875685076643595} m_Father: {fileID: 8202717142006031211} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4218554392451596953 @@ -477,7 +483,7 @@ GameObject: - component: {fileID: 5682263026450292309} - component: {fileID: 4236027344411874421} m_Layer: 0 - m_Name: Waypoint P2 + m_Name: Waypoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -492,7 +498,7 @@ Transform: m_GameObject: {fileID: 4218554392451596953} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.17654012, z: -0, w: 0.98429346} - m_LocalPosition: {x: -37.72, y: -32.07, z: 133.3} + m_LocalPosition: {x: -38.61, y: -30.76, z: 136.95} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -510,8 +516,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 1 m_WaypointPosition: {fileID: 1170441306195283109} - m_WaitTime: 120 + m_WaitTime: 0 m_ModelName: Treadmill m_Index: 0 m_Touched: 0 @@ -581,6 +588,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 8944470618024112555} m_WaitTime: 0 m_ModelName: Climber @@ -656,10 +664,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointList: [] m_WaypointArray: - - {fileID: 7773461343564336651} - - {fileID: 401411438533769719} + - {fileID: 5682263026450292309} + - {fileID: 1835509932309003796} m_Target: {fileID: 0} - m_CurrentWaypoint: {fileID: 7773461343564336651} + m_CurrentWaypoint: {fileID: 5682263026450292309} + m_Agent: {fileID: 0} --- !u!1 &5014766339885235049 GameObject: m_ObjectHideFlags: 0 @@ -705,6 +714,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 5234230040300556613} m_WaitTime: 0 m_ModelName: Climber @@ -776,6 +786,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 7290679578337540522} m_WaitTime: 0 m_ModelName: Walker @@ -847,6 +858,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 9122741893823443035} m_WaitTime: 0 m_ModelName: Climber @@ -918,6 +930,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 640387100541436957} m_WaitTime: 0 m_ModelName: Climber @@ -989,6 +1002,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 5103288075385298553} m_WaitTime: 0 m_ModelName: Climber @@ -1060,6 +1074,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 292389143526597783} m_WaitTime: 0 m_ModelName: Climber @@ -1113,7 +1128,7 @@ Transform: m_GameObject: {fileID: 7626214685865253054} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -14.46, y: -33.1, z: 111.6} + m_LocalPosition: {x: -4.96, y: -32.61, z: 102.46} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1131,6 +1146,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 8327205213761884930} m_WaitTime: 0 m_ModelName: Walker @@ -1202,6 +1218,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 7373317026572523891} m_WaitTime: 0 m_ModelName: Climber @@ -1273,6 +1290,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 1414520434900281146} m_WaitTime: 0 m_ModelName: Walker @@ -1344,6 +1362,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} m_Name: m_EditorClassIdentifier: + m_StartingPosition: 0 m_WaypointPosition: {fileID: 6452771412434586333} m_WaitTime: 0 m_ModelName: Walker @@ -1370,3 +1389,75 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8619622059050124784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7419875685076643595} + - component: {fileID: 1835509932309003796} + - component: {fileID: 6570079907159152068} + m_Layer: 0 + m_Name: Waypoint (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7419875685076643595 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8619622059050124784} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.17654012, z: -0, w: 0.98429346} + m_LocalPosition: {x: -36.82, y: -30.76, z: 132.11} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6698792045881865934} + m_LocalEulerAnglesHint: {x: 0, y: -20.337, z: 0} +--- !u!114 &1835509932309003796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8619622059050124784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 7419875685076643595} + m_WaitTime: 0 + m_ModelName: Treadmill + m_Index: 1 + m_Touched: 0 +--- !u!65 &6570079907159152068 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8619622059050124784} + 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} diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 9131eeb..af932bd 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.12787408, y: 0.45540848, z: -0.06628496, w: -0.87855434} + m_LocalRotation: {x: 0.053786345, y: 0.8375628, z: -0.08386278, w: 0.5371803} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -320,7 +320,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: -0.1800774, y: 0.45064092, z: -0.09334513, w: -0.86935705} + m_LocalRotation: {x: 0.085748866, y: 0.83106506, z: -0.13369823, w: 0.533013} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -780,7 +780,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 @@ -897,17 +897,17 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -264.41 + value: -271.51 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.y - value: 6.4300003 + value: 7.74 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 548.08997 + value: 560.41 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -1212,8 +1212,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.024272094, y: 0.9667496, z: -0.10028434, w: 0.23398508} - m_LocalPosition: {x: -10.898407, y: -3.3373547, z: 39.527832} + m_LocalRotation: {x: 0.14773542, y: -0.4112837, z: 0.06774572, w: 0.89690053} + m_LocalPosition: {x: -8.661163, y: -2.0273552, z: 39.01758} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1377,8 +1377,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: -0.0021003054, y: 0.9872027, z: -0.15892218, w: -0.013046807} - m_LocalPosition: {x: -10.910095, y: -3.3273544, z: 40.109375} + m_LocalRotation: {x: 0.10293466, y: -0.58442324, z: 0.07506675, w: 0.80138564} + m_LocalPosition: {x: -7.278473, y: -2.017355, z: 39.804016} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2086,7 +2086,7 @@ Transform: m_GameObject: {fileID: 1124157896} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} - m_LocalPosition: {x: -10.898407, y: -3.3373547, z: 39.527832} + m_LocalPosition: {x: -8.661163, y: -2.0273552, z: 39.01758} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2279,7 +2279,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178814724} serializedVersion: 2 - m_LocalRotation: {x: -0.09275636, y: 0.43565673, z: -0.04519219, w: -0.89417964} + m_LocalRotation: {x: 0.09782185, y: 0.7879699, z: -0.12979263, w: 0.5938756} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2628,17 +2628,17 @@ PrefabInstance: - target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 12.564162 objectReference: {fileID: 0} - target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.3099995 objectReference: {fileID: 0} - target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -6.6584187 objectReference: {fileID: 0} - target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -2679,12 +2679,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1412792145} m_PrefabAsset: {fileID: 0} ---- !u!54 &1412792149 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 9100050631348364745, guid: f03606b436da1d94e977c8ffa2825bd9, - type: 3} - m_PrefabInstance: {fileID: 1412792145} - m_PrefabAsset: {fileID: 0} --- !u!1 &1457327178 GameObject: m_ObjectHideFlags: 3 @@ -3187,18 +3181,6 @@ MonoBehaviour: - {fileID: 377437131} - {fileID: 513050373} m_CMBrain: {fileID: 470663204} ---- !u!114 &1822302064 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5682263026450292309, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - m_PrefabInstance: {fileID: 2794896440572570268} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1882797708 GameObject: m_ObjectHideFlags: 3 @@ -3687,41 +3669,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 209990532492095435, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_Name - value: Waypoint - objectReference: {fileID: 0} - - target: {fileID: 687742805697622430, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_Name - value: Waypoint - objectReference: {fileID: 0} - - target: {fileID: 841324076368356447, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.y - value: -33.21 - objectReference: {fileID: 0} - - target: {fileID: 841324076368356447, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.z - value: 95 - objectReference: {fileID: 0} - - target: {fileID: 1082572882027964806, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1170441306195283109, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.x - value: -31.51 - objectReference: {fileID: 0} - - target: {fileID: 1170441306195283109, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.z - value: 124.63 - objectReference: {fileID: 0} - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_Agent @@ -3732,51 +3679,11 @@ PrefabInstance: propertyPath: m_Target value: objectReference: {fileID: 387060610} - - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_CurrentWaypoint - value: - objectReference: {fileID: 1822302064} - - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_WaypointList.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_WaypointArray.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: 'm_WaypointList.Array.data[0]' - value: - objectReference: {fileID: 1822302064} - - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: 'm_WaypointArray.Array.data[0]' - value: - objectReference: {fileID: 1822302064} - - target: {fileID: 3582199055929070180, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218554392451596953, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_Name - value: Waypoint - objectReference: {fileID: 0} - target: {fileID: 4823915812732403376, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_Name value: Waypoints objectReference: {fileID: 0} - - target: {fileID: 5682263026450292309, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_StartingPosition - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.x @@ -3827,21 +3734,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8327205213761884930, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.x - value: -4.96 - objectReference: {fileID: 0} - - target: {fileID: 8327205213761884930, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.y - value: -32.61 - objectReference: {fileID: 0} - - target: {fileID: 8327205213761884930, guid: 796c0c7bfd2e89547bd866eedcc6d386, - type: 3} - propertyPath: m_LocalPosition.z - value: 102.46 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3910,56 +3802,11 @@ PrefabInstance: propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 219793651} - - target: {fileID: 3567326802448521334, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_Body - value: - objectReference: {fileID: 1412792149} - - target: {fileID: 3567326802448521334, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_MaxForce - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 4057927836602249742, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_TriggerExitEvent.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4057927836602249742, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_TriggerStayEvent.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5958365873195825879, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 219793651} - - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_Size.y - value: 51.69578 - objectReference: {fileID: 0} - - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_Size.z - value: 271.4547 - objectReference: {fileID: 0} - - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_Center.x - value: 11.069097 - objectReference: {fileID: 0} - - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_Center.y - value: -15.755419 - objectReference: {fileID: 0} - - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa, - type: 3} - propertyPath: m_Center.z - value: 1.294921 - objectReference: {fileID: 0} - target: {fileID: 8896637230412496375, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Name diff --git a/Assets/7_Scripts/Interactable Items/Treadmill.cs b/Assets/7_Scripts/Interactable Items/Treadmill.cs index d1804c3..591f0e8 100644 --- a/Assets/7_Scripts/Interactable Items/Treadmill.cs +++ b/Assets/7_Scripts/Interactable Items/Treadmill.cs @@ -8,8 +8,15 @@ public class Treadmill : MonoBehaviour { //public Rigidbody m_Body; public float m_MaxForce; + private float m_angleOffset; + private bool m_RampActive; + + public float m_RampTimer; + + public float m_RampIncrement; + private void OnEnable() { OnChairContact.ApplyTreadmillForce += ApplyForce; @@ -25,12 +32,26 @@ public class Treadmill : MonoBehaviour public void ApplyForce(Rigidbody rb) { - //m_Force += 0.1f; - Vector3 forceDirection = Quaternion.Euler(0, -m_angleOffset, 0) * Vector3.forward; //Debug.Log($"Force added to {rb.name} {forceDirection * m_MaxForce}"); rb.AddForce(forceDirection * m_MaxForce); - //m_Body.AddForce(forceDirection * m_Force); + + if (!m_RampActive && m_RampTimer > 0f) + { + m_RampTimer -= Time.deltaTime; + } + else + { + m_RampActive = true; + } + + if( m_RampActive ) + { + m_MaxForce += Time.deltaTime * m_RampIncrement; + } + + Debug.Log($"Treadmill Speed: {m_MaxForce}"); + } public void RemoveForce(Rigidbody rb) diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 6e5dbb2..2861975 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":16.8422816,"total":17.0423705,"children":{"InitializeActuators":{"count":1,"self":0.0005094,"total":0.0005094,"children":null},"InitializeSensors":{"count":1,"self":0.0020168,"total":0.0020168,"children":null},"AgentSendState":{"count":549,"self":0.0065413,"total":0.0276907,"children":{"CollectObservations":{"count":110,"self":0.0035136,"total":0.0035136,"children":null},"WriteActionMask":{"count":110,"self":0,"total":0,"children":null},"RequestDecision":{"count":110,"self":0.0176358,"total":0.0176358,"children":null}}},"DecideAction":{"count":549,"self":0.1663493,"total":0.16685429999999998,"children":{"RayPerceptionSensor.Perceive":{"count":110,"self":0.000505,"total":0.000505,"children":null}}},"AgentAct":{"count":549,"self":0.0025093,"total":0.0025093,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710351915","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":"1710351932"}} \ No newline at end of file +{"count":1,"self":11.7395784,"total":11.8898645,"children":{"InitializeActuators":{"count":1,"self":0.0010115999999999999,"total":0.0010115999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0009999,"total":0.0009999,"children":null},"AgentSendState":{"count":292,"self":0.0049069,"total":0.0270986,"children":{"CollectObservations":{"count":59,"self":0.0045197,"total":0.0045197,"children":null},"WriteActionMask":{"count":59,"self":0,"total":0,"children":null},"RequestDecision":{"count":59,"self":0.017672,"total":0.017672,"children":null}}},"DecideAction":{"count":292,"self":0.11666489999999999,"total":0.11666489999999999,"children":{"RayPerceptionSensor.Perceive":{"count":59,"self":0,"total":0,"children":null}}},"AgentAct":{"count":292,"self":0.0045111,"total":0.0045111,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710353006","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":"1710353018"}} \ No newline at end of file