From 247723cbda9ba1005e9e42422b6f5403ca56a8ca Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Wed, 12 May 2021 18:45:56 +0100 Subject: [PATCH] reposition player and add collider to entrance --- .../Environment/Entrance Courtyard.prefab | 29 ++++++++-- game/Assets/Scenes/Main.unity | 58 +++++++++---------- 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab b/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab index 0b523d4..9f2bcf0 100644 --- a/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab +++ b/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab @@ -1065,6 +1065,20 @@ Transform: m_Father: {fileID: 5390718527995891586} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &5028543942449267792 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5374444887580352796} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8433832427835393222, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} --- !u!1 &5390718527497362304 GameObject: m_ObjectHideFlags: 0 @@ -2087,16 +2101,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} ---- !u!4 &7451918716768069829 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} - m_PrefabInstance: {fileID: 6980634304434327342} - m_PrefabAsset: {fileID: 0} --- !u!1 &5711431803845258964 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5790743888752385542, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} m_PrefabInstance: {fileID: 6980634304434327342} m_PrefabAsset: {fileID: 0} +--- !u!4 &7451918716768069829 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} + m_PrefabInstance: {fileID: 6980634304434327342} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7293289580210569446 PrefabInstance: m_ObjectHideFlags: 0 @@ -2166,6 +2180,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} +--- !u!1 &5374444887580352796 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5790743888752385542, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} + m_PrefabInstance: {fileID: 7293289580210569446} + m_PrefabAsset: {fileID: 0} --- !u!4 &7114633281017947917 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index d4957df..8282f51 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -2166,19 +2166,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.74222577 + value: 0.7449754 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.6488458 + value: -0.6512494 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.15286176 + value: 0.13178663 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.06879994 + value: 0.059314452 objectReference: {fileID: 0} - target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_RendererIndex @@ -2190,11 +2190,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0.062641144 + value: 0.06264305 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: -1.2534504 + value: -1.2534503 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z @@ -2202,19 +2202,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.18137905 + value: -0.16372055 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.10918191 + value: 0.0985523 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.8373338 + value: 0.84096485 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.5040367 + value: 0.5062225 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2230,15 +2230,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: -35.9 + value: -26.614 objectReference: {fileID: 0} - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: 0.04 + value: 1.906 objectReference: {fileID: 0} - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z - value: 92.9 + value: 108.854 objectReference: {fileID: 0} - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w @@ -2334,27 +2334,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.90820515 + value: 0.9082052 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.41790095 + value: -0.41790092 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.022642646 + value: -0.02264136 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.0030939914 + value: -0.0030938145 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0.062641144 + value: 0.06264305 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: -1.2534505 + value: -1.2534503 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z @@ -2394,19 +2394,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.84388006 + value: 0.8445457 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.5318591 + value: -0.5322786 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.068155356 + value: 0.05642691 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.01863661 + value: 0.015429547 objectReference: {fileID: 0} - target: {fileID: 4676633833077728950, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.Value @@ -2438,11 +2438,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0.062641144 + value: 0.06264305 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: -1.2534504 + value: -1.2534503 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z @@ -2450,19 +2450,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.18137908 + value: -0.16372055 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.10918194 + value: 0.0985523 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.8373338 + value: 0.84096485 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.50403684 + value: 0.5062225 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}