From ccdd618d5eb79697e2704c0a8a1934213b6c9bb5 Mon Sep 17 00:00:00 2001 From: sebastianhampel1 Date: Thu, 1 Jun 2023 11:52:41 -0400 Subject: [PATCH] changes to astronaut prefab --- .../Astronaut/AstronautWithCamera.prefab | 16 +++- .../EnemyExperimentation1.unity | 89 ++++++++++++++++--- 2 files changed, 93 insertions(+), 12 deletions(-) diff --git a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab index a56858f..63e92ea 100644 --- a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab +++ b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab @@ -1144,7 +1144,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318977785173328} - m_LocalRotation: {x: -0.053374406, y: -3.9161743e-10, z: 5.6392228e-11, w: 0.9985746} + m_LocalRotation: {x: -0.053374406, y: -0.000000034718123, z: 0.0000000049993236, w: 0.9985746} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1464,7 +1464,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318978543542559} - m_LocalRotation: {x: 0.04479234, y: 0.0000000344453, z: -0.0000000015444355, w: 0.9989963} + m_LocalRotation: {x: 0.04479234, y: -0.0000000344453, z: 0.0000000015444355, w: 0.9989963} m_LocalPosition: {x: 0, y: 0.82000005, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1829,6 +1829,10 @@ PrefabInstance: propertyPath: cameraFreeLook value: objectReference: {fileID: 365318977167042205} + - target: {fileID: 367716966863965416, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: m_Name + value: HealthText + objectReference: {fileID: 0} - target: {fileID: 1830643123924126821, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: shift value: @@ -1841,6 +1845,10 @@ PrefabInstance: propertyPath: freelook value: objectReference: {fileID: 365318977167042205} + - target: {fileID: 3871953178811630791, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: m_Name + value: OxygenText + objectReference: {fileID: 0} - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_RootOrder value: 0 @@ -1901,6 +1909,10 @@ PrefabInstance: propertyPath: hiddenCam value: objectReference: {fileID: 365318978543542556} + - target: {fileID: 8148338960242662890, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: m_Name + value: StaminaText + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} --- !u!4 &365318977280207447 stripped diff --git a/Assets/Scenes/Experimentation/EnemyExperimentation1.unity b/Assets/Scenes/Experimentation/EnemyExperimentation1.unity index cfa62d3..a01c221 100644 --- a/Assets/Scenes/Experimentation/EnemyExperimentation1.unity +++ b/Assets/Scenes/Experimentation/EnemyExperimentation1.unity @@ -256,7 +256,7 @@ Transform: - {fileID: 1821628117} - {fileID: 543450652357871620} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &142648493 PrefabInstance: @@ -408,7 +408,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &144918071 MonoBehaviour: @@ -824,7 +824,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &257884400 GameObject: @@ -1074,7 +1074,7 @@ Transform: m_Children: - {fileID: 2006386676} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -44.033} --- !u!95 &326486707 Animator: @@ -1746,7 +1746,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 44.791, y: -201.833, z: -174.741} --- !u!1 &840215355 GameObject: @@ -2061,7 +2061,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &933376773 GameObject: @@ -2158,7 +2158,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &935604208 GameObject: @@ -2360,7 +2360,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 218.31, z: 0} --- !u!114 &935604213 MonoBehaviour: @@ -2543,6 +2543,75 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 +--- !u!1001 &1117557773 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalScale.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalScale.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalScale.z + value: 80 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5796149 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalPosition.y + value: 1.13 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalPosition.z + value: 6.57 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c038a760050b2c644a3947a794190aac, type: 3} + propertyPath: m_Name + value: Cryopod + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c038a760050b2c644a3947a794190aac, type: 3} --- !u!1 &1216510142 GameObject: m_ObjectHideFlags: 0 @@ -2604,7 +2673,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0.232, y: -0.028, z: -0.02} --- !u!114 &1342418930 MonoBehaviour: @@ -2898,7 +2967,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2006386675 PrefabInstance: