diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity index 235e512..62cec62 100644 --- a/Assets/Scenes/TuteLevelFive.unity +++ b/Assets/Scenes/TuteLevelFive.unity @@ -176,7 +176,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3} propertyPath: m_LocalPosition.z - value: -0.821 + value: -1.106 objectReference: {fileID: 0} - target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3} propertyPath: m_LocalRotation.x @@ -196,7 +196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3} propertyPath: m_RootOrder - value: 63 + value: 60 objectReference: {fileID: 0} - target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -287,7 +287,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -348,7 +348,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 31 + value: 29 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -409,7 +409,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 35 + value: 33 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -528,7 +528,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: VisualOffset: {x: 0, y: 0, z: 0} - _isWalkable: 1 + _isWalkable: 0 --- !u!65 &145025248 BoxCollider: m_ObjectHideFlags: 0 @@ -626,7 +626,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 28 + value: 26 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -687,7 +687,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -748,7 +748,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 33 + value: 31 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -809,7 +809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 44 + value: 41 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -840,7 +840,7 @@ PrefabInstance: - target: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} @@ -990,17 +990,17 @@ PrefabInstance: - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000011227485 + value: -0.000061035156 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -101.69998 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000035584977 + value: -0.000043780423 objectReference: {fileID: 0} - target: {fileID: 5195354183101525346, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} @@ -1017,6 +1017,11 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 0 objectReference: {fileID: 0} + - target: {fileID: 5195354181250555040, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -70.00001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} --- !u!1 &202511528 stripped @@ -1076,7 +1081,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &204689276 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1184,7 +1189,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 24 + value: 22 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1444,7 +1449,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1505,7 +1510,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1566,7 +1571,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1627,7 +1632,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_RootOrder - value: 58 + value: 54 objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1700,7 +1705,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 47 + value: 45 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1800,7 +1805,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 21 + value: 19 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1871,7 +1876,7 @@ PrefabInstance: - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} propertyPath: m_RootOrder - value: 60 + value: 56 objectReference: {fileID: 0} - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} @@ -1915,7 +1920,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: VisualOffset: {x: 0, y: 0, z: 0} - _isWalkable: 1 + _isWalkable: 0 --- !u!65 &417311778 BoxCollider: m_ObjectHideFlags: 0 @@ -2038,6 +2043,11 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: characterSpeed + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: blockReader.LogicChain.Array.size @@ -2204,7 +2214,7 @@ PrefabInstance: - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} propertyPath: m_RootOrder - value: 59 + value: 55 objectReference: {fileID: 0} - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} @@ -2346,7 +2356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 19 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2563,7 +2573,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2624,7 +2634,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2685,7 +2695,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2791,7 +2801,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2930,7 +2940,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 38 + value: 36 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2946,45 +2956,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} ---- !u!1 &703910627 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1560257132984952, guid: 5cbae0602ce9acf41a98fda3a353569a, - type: 3} - m_PrefabInstance: {fileID: 1235815451} - m_PrefabAsset: {fileID: 0} ---- !u!4 &703910628 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, - type: 3} - m_PrefabInstance: {fileID: 1235815451} - m_PrefabAsset: {fileID: 0} ---- !u!114 &703910629 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703910627} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a69d64be9f9e8543b4278d7f139f6f1, type: 3} - m_Name: - m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0, z: 0} - _isWalkable: 1 ---- !u!65 &703910630 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703910627} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.9999998, y: 2, z: 2.0000005} - m_Center: {x: -0.000000923872, y: 0, z: 0} --- !u!1001 &728125253 PrefabInstance: m_ObjectHideFlags: 0 @@ -3040,7 +3011,7 @@ PrefabInstance: - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} propertyPath: m_RootOrder - value: 63 + value: 59 objectReference: {fileID: 0} - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} @@ -3104,7 +3075,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 36 + value: 34 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3165,7 +3136,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 27 + value: 25 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3265,7 +3236,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 52 + value: 48 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3337,7 +3308,6 @@ Transform: - {fileID: 1761352397} - {fileID: 1345966486} - {fileID: 531347386} - - {fileID: 703910628} - {fileID: 1694299} - {fileID: 1231722610} - {fileID: 1749089644} @@ -3351,14 +3321,12 @@ Transform: - {fileID: 2053586745} - {fileID: 1448554373} - {fileID: 1132672705} - - {fileID: 1917117044} - {fileID: 1903567338} - {fileID: 574177568} - {fileID: 1478305553} - {fileID: 417311776} - {fileID: 1993257728} - {fileID: 145025246} - - {fileID: 900568607} - {fileID: 202511529} - {fileID: 164333534} - {fileID: 265791555} @@ -3578,7 +3546,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 30 + value: 28 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3639,45 +3607,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 399411514} m_PrefabAsset: {fileID: 0} ---- !u!1 &900568606 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, - type: 3} - m_PrefabInstance: {fileID: 1749996257} - m_PrefabAsset: {fileID: 0} ---- !u!4 &900568607 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, - type: 3} - m_PrefabInstance: {fileID: 1749996257} - m_PrefabAsset: {fileID: 0} ---- !u!114 &900568608 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900568606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a69d64be9f9e8543b4278d7f139f6f1, type: 3} - m_Name: - m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0, z: 0} - _isWalkable: 1 ---- !u!65 &900568609 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900568606} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.9999998, y: 2, z: 2.0000005} - m_Center: {x: -0.000000923872, y: 0, z: 0} --- !u!1 &977715559 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, @@ -3762,7 +3691,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 37 + value: 35 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3823,7 +3752,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3896,7 +3825,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 25 + value: 23 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4026,7 +3955,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 40 + value: 38 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4087,7 +4016,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 29 + value: 27 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4157,7 +4086,7 @@ PrefabInstance: - target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} @@ -4415,7 +4344,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_LocalPosition.z - value: -1.1429999 + value: -1.428 objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_LocalRotation.x @@ -4435,7 +4364,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_RootOrder - value: 64 + value: 61 objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4553,7 +4482,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 45 + value: 42 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4614,7 +4543,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4708,67 +4637,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.9999998, y: 2, z: 2.0000005} m_Center: {x: -0.000000923872, y: 0, z: 0} ---- !u!1001 &1235815451 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 821954416} - m_Modifications: - - target: {fileID: 1560257132984952, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_Name - value: Floor - objectReference: {fileID: 0} - - target: {fileID: 1560257132984952, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} --- !u!1 &1252696508 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1915119254101614, guid: 7fe364418169a2e4f9dd663ecb4d5311, @@ -4853,7 +4721,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 41 + value: 39 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4914,7 +4782,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_RootOrder - value: 56 + value: 52 objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4987,7 +4855,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_RootOrder - value: 55 + value: 51 objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5060,7 +4928,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 49 + value: 46 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5121,7 +4989,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 22 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5299,7 +5167,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 20 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5340,7 +5208,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: VisualOffset: {x: 0, y: 0, z: 0} - _isWalkable: 1 + _isWalkable: 0 --- !u!65 &1448554375 BoxCollider: m_ObjectHideFlags: 0 @@ -5399,7 +5267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 39 + value: 37 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5460,7 +5328,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 26 + value: 24 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5707,7 +5575,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 47 + value: 44 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5768,7 +5636,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5868,7 +5736,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_RootOrder - value: 53 + value: 49 objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5941,7 +5809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_RootOrder - value: 57 + value: 53 objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6020,7 +5888,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 42 + value: 40 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6103,67 +5971,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1486101088} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1649946638 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 821954416} - m_Modifications: - - target: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_Name - value: Floor - objectReference: {fileID: 0} - - target: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_RootOrder - value: 41 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} --- !u!1 &1691679946 GameObject: m_ObjectHideFlags: 0 @@ -6319,7 +6126,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6374,67 +6181,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.9999998, y: 2, z: 2.0000005} m_Center: {x: -0.000000923872, y: 0, z: 0} ---- !u!1001 &1749996257 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 821954416} - m_Modifications: - - target: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_Name - value: Floor - objectReference: {fileID: 0} - - target: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalPosition.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_RootOrder - value: 49 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} --- !u!1001 &1756995997 PrefabInstance: m_ObjectHideFlags: 0 @@ -6490,7 +6236,7 @@ PrefabInstance: - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} propertyPath: m_RootOrder - value: 62 + value: 58 objectReference: {fileID: 0} - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} @@ -6602,7 +6348,7 @@ PrefabInstance: - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} @@ -6789,7 +6535,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_RootOrder - value: 54 + value: 50 objectReference: {fileID: 0} - target: {fileID: 4695608386412040, guid: 7fe364418169a2e4f9dd663ecb4d5311, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6862,7 +6608,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6923,7 +6669,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 32 + value: 30 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6984,7 +6730,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 34 + value: 32 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7078,45 +6824,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.9999998, y: 2, z: 2.0000005} m_Center: {x: -0.000000923872, y: 0, z: 0} ---- !u!1 &1917117043 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1619558185565566, guid: 1d9cc67243350f643b8c562ed0503c49, - type: 3} - m_PrefabInstance: {fileID: 1649946638} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1917117044 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, - type: 3} - m_PrefabInstance: {fileID: 1649946638} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1917117045 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1917117043} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a69d64be9f9e8543b4278d7f139f6f1, type: 3} - m_Name: - m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0, z: 0} - _isWalkable: 1 ---- !u!65 &1917117046 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1917117043} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.9999998, y: 2, z: 2.0000005} - m_Center: {x: -0.000000923872, y: 0, z: 0} --- !u!1001 &1927865286 PrefabInstance: m_ObjectHideFlags: 0 @@ -7162,7 +6869,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7242,7 +6949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_LocalPosition.z - value: -0.7149999 + value: -1 objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_LocalRotation.x @@ -7262,7 +6969,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_RootOrder - value: 65 + value: 62 objectReference: {fileID: 0} - target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7419,7 +7126,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 50 + value: 47 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7519,7 +7226,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 23 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7580,7 +7287,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 14 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7680,7 +7387,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_RootOrder - value: 46 + value: 43 objectReference: {fileID: 0} - target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7751,7 +7458,7 @@ PrefabInstance: - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} propertyPath: m_RootOrder - value: 61 + value: 57 objectReference: {fileID: 0} - target: {fileID: 5857971677613878141, guid: 294b606c3a106394bbb96600703a5a0a, type: 3} diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index cb4adf3..1ee532f 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -45,8 +45,14 @@ public class Character : MonoBehaviour #region Class Implementation + public Vector3 yValue(float time, float heightMultiplier) + { + float y = Mathf.Sin((Mathf.PI*time)) * heightMultiplier; + return new Vector3(0, y, 0); + } + - IEnumerator MoveCoRoutine(Block Target, Transform Current, float time) + IEnumerator MoveCoroutine(Block Target, Transform Current, float time, float heightMax) { float elapsedTime = 0; Vector3 startPosition = Current.position; @@ -54,12 +60,30 @@ public class Character : MonoBehaviour while (elapsedTime < time) { transform.position = Vector3.Lerp(startPosition, Target.VisualPosition, (elapsedTime / time)); + transform.position += yValue((elapsedTime / time), heightMax); yield return new WaitForEndOfFrame(); elapsedTime += Time.deltaTime; } transform.position = Target.VisualPosition; } + IEnumerator rotateCoroutine(Direction direction, Transform Current, float time, float heightMax) + { + float elapsedTime = 0; + time *= 0.8f; + Vector3 endDirection = direction.ToVector(Current); + Vector3 startDirection = Current.forward; + Vector3 startPosition = transform.position; + while (elapsedTime < time) + { + transform.forward = Vector3.Slerp(startDirection, endDirection, (elapsedTime / time)); + transform.position = startPosition +yValue((elapsedTime / time), heightMax); + yield return new WaitForEndOfFrame(); + elapsedTime += Time.deltaTime; + } + transform.forward = endDirection; + } + /// /// Moves one block in specefied direction, Can walk off obstacles @@ -87,18 +111,16 @@ public class Character : MonoBehaviour //set current block && move CurrentBlock = moveTo; - StartCoroutine(MoveCoRoutine(CurrentBlock, transform, speed)); + StartCoroutine(MoveCoroutine(CurrentBlock, transform, speed, 0.3f)); //transform.position = CurrentBlock.VisualPosition; } - - /// /// Upon collision with a floating block, collect its /// Upon collision with the end portal, end of level /// /// name of collided object - void OnTriggerEnter(Collider other) + void OnTriggerEnter(Collider other) { Collectable collectable = other.GetComponentInChildren(); @@ -109,32 +131,31 @@ public class Character : MonoBehaviour if (other.gameObject.name == "End Portal") { other.GetComponent().enabled = false; - Debug.Log("You finished this level!"); SceneManager.LoadScene(nextScene); } - } /// /// Rotates to point in specific direction based on current direction /// /// Local direction to point - public void Rotate(Direction direction) + public void Rotate(Direction direction, float speed) { - transform.forward = direction.ToVector(transform); + StartCoroutine(rotateCoroutine(direction, transform, speed, 0.15f)); + //transform.forward = direction.ToVector(transform); } /// /// Jumps in specefied direction, picks between Long Jump and Jumping up /// /// Direction to Jump - public void Jump(Direction direction) + public void Jump(Direction direction, float speed) { //if there is a block infront JumpUp else LongJump if (Block.isBlockAtPosition(CurrentBlock.position + direction.ToVector(transform) + Vector3.up, 1, ~Ignore)) - JumpUp(direction); + JumpUp(direction, speed); else - JumpLong(direction); + JumpLong(direction, speed); } #endregion Class Implementation @@ -146,7 +167,7 @@ public class Character : MonoBehaviour /// /// Direction of obstacle /// max height - private void JumpUp(Direction direction, int height = 1) + private void JumpUp(Direction direction, float speed, int height = 1) { //setting up variables Vector3 position; // position wanted @@ -163,10 +184,11 @@ public class Character : MonoBehaviour if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) moveTo = hit; } - + //set current block && move CurrentBlock = moveTo; - transform.position = CurrentBlock.VisualPosition; + StartCoroutine(MoveCoroutine(CurrentBlock, transform, speed, 0.5f)); + //transform.position = CurrentBlock.VisualPosition; } /// @@ -174,7 +196,7 @@ public class Character : MonoBehaviour /// /// Direction to Jump /// Max distance - private void JumpLong(Direction direction, int Distance = 2) + private void JumpLong(Direction direction, float speed, int Distance = 2) { //setting up variables Vector3 position; // position wanted @@ -200,10 +222,11 @@ public class Character : MonoBehaviour moveTo = hit; }//end for - + //Set Current Block and move CurrentBlock = moveTo; - transform.position = CurrentBlock.VisualPosition; + StartCoroutine(MoveCoroutine(CurrentBlock, transform, speed, 0.5f)); + //transform.position = CurrentBlock.VisualPosition; } #endregion Private Functions diff --git a/Assets/Scripts/KeyboardInput.cs b/Assets/Scripts/KeyboardInput.cs index b172a1d..607e951 100644 --- a/Assets/Scripts/KeyboardInput.cs +++ b/Assets/Scripts/KeyboardInput.cs @@ -25,11 +25,11 @@ public class KeyboardInput : MonoBehaviour if (Input.GetKeyDown(KeyCode.LeftArrow)) { - character.Rotate(Direction.Left); + character.Rotate(Direction.Left, characterSpeed); } if (Input.GetKeyDown(KeyCode.RightArrow)) { - character.Rotate(Direction.Right); + character.Rotate(Direction.Right, characterSpeed); } if (Input.GetKeyDown(KeyCode.UpArrow)) { @@ -37,7 +37,7 @@ public class KeyboardInput : MonoBehaviour } if (Input.GetKeyDown(KeyCode.Space)) { - character.Jump(Direction.Forward); + character.Jump(Direction.Forward, characterSpeed); } } diff --git a/Assets/Scripts/Logic/Blocks/Jump.cs b/Assets/Scripts/Logic/Blocks/Jump.cs index 7fd5a89..25edc93 100644 --- a/Assets/Scripts/Logic/Blocks/Jump.cs +++ b/Assets/Scripts/Logic/Blocks/Jump.cs @@ -21,7 +21,7 @@ public class Jump : LogicBlock /// Player to move protected override void BlockLogic(Character player, float animationTime) { - player.Jump(direction); + player.Jump(direction, animationTime); } #endregion Class Functions diff --git a/Assets/Scripts/Logic/Blocks/Rotate.cs b/Assets/Scripts/Logic/Blocks/Rotate.cs index 98a9a6d..bd7f4b3 100644 --- a/Assets/Scripts/Logic/Blocks/Rotate.cs +++ b/Assets/Scripts/Logic/Blocks/Rotate.cs @@ -24,7 +24,7 @@ public class Rotate : LogicBlock /// Player to rotate protected override void BlockLogic(Character player, float animationTime) { - player.Rotate(direction); + player.Rotate(direction, animationTime); } #endregion Class Functions