From 15491b727295f2f60393b6e62c6703241c0684f7 Mon Sep 17 00:00:00 2001 From: haitem Date: Tue, 1 Feb 2022 23:01:17 +0100 Subject: [PATCH] remaking new move system Styl not complete --- .../Prefabs/Platforms/platform_neutral.prefab | 26 +- .../Platforms/platform_neutral_sharp.prefab | 20 +- .../Prefabs/Platforms/platform_power.prefab | 17 - .../Prefabs/Platforms/platform_rrange.prefab | 17 - .../Prefabs/Platforms/platform_speed.prefab | 26 +- .../Prefabs/Platforms/platform_start.prefab | 23 +- Assets/Prefabs/Player.prefab | 64 ++- Assets/Prefabs/platforms/Platform 5.prefab | 26 +- Assets/Prefabs/platforms/Platform_Blue.prefab | 21 +- .../Prefabs/platforms/Platform_Green.prefab | 23 +- Assets/Prefabs/platforms/Platform_Red.prefab | 17 - .../Prefabs/platforms/Platform_empty.prefab | 4 +- .../platforms/Platform_green_basic.prefab | 21 +- .../Prefabs/platforms/Platform_yellow.prefab | 21 +- Assets/Prefabs/platforms/platform 6.prefab | 26 +- Assets/Scenes/Vasek.unity | 4 + Assets/Scripts/PlatformManager.cs | 44 ++ Assets/Scripts/PlayerController.cs | 250 ++++++----- Assets/Scripts/ProceduralGeneration.cs | 7 +- Assets/Scripts/gizmoManager.cs | 2 +- UserSettings/Layouts/default-2021.dwlt | 396 ++++++++---------- 21 files changed, 460 insertions(+), 595 deletions(-) diff --git a/Assets/Prefabs/Platforms/platform_neutral.prefab b/Assets/Prefabs/Platforms/platform_neutral.prefab index a1f2cef..c7aafec 100644 --- a/Assets/Prefabs/Platforms/platform_neutral.prefab +++ b/Assets/Prefabs/Platforms/platform_neutral.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &5204016726758810502 Transform: @@ -99,7 +99,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &3133763052761698265 Transform: @@ -177,13 +177,13 @@ GameObject: - component: {fileID: 2665829151930005690} - component: {fileID: 7025617415223936346} - component: {fileID: 991026633550732616} - - component: {fileID: -3679359786245750542} + - component: {fileID: 5817257923490631887} m_Layer: 0 m_Name: platform_neutral m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2665829151930005690 Transform: @@ -232,19 +232,15 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: db9955a831b9d1a49a8d725397ad8326, type: 3} ---- !u!54 &-3679359786245750542 -Rigidbody: +--- !u!114 &5817257923490631887 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7308296215773848360} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Platforms/platform_neutral_sharp.prefab b/Assets/Prefabs/Platforms/platform_neutral_sharp.prefab index 4e20440..a15c859 100644 --- a/Assets/Prefabs/Platforms/platform_neutral_sharp.prefab +++ b/Assets/Prefabs/Platforms/platform_neutral_sharp.prefab @@ -95,7 +95,7 @@ GameObject: - component: {fileID: 6715234968966001404} - component: {fileID: 5071310171994536778} - component: {fileID: 8372693939530454457} - - component: {fileID: 458963570543655786} + - component: {fileID: 1381875388291725606} m_Layer: 0 m_Name: platform_neutral_sharp m_TagString: platform @@ -162,22 +162,18 @@ MonoBehaviour: speed: 5 audioSource: {fileID: 0} audioClips: [] ---- !u!54 &458963570543655786 -Rigidbody: +--- !u!114 &1381875388291725606 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1560962678462888388} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1560962679917322222 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Platforms/platform_power.prefab b/Assets/Prefabs/Platforms/platform_power.prefab index 4ff1019..c261e3e 100644 --- a/Assets/Prefabs/Platforms/platform_power.prefab +++ b/Assets/Prefabs/Platforms/platform_power.prefab @@ -97,7 +97,6 @@ GameObject: - component: {fileID: 6189155224637060765} - component: {fileID: -443919199017515566} - component: {fileID: -731181381576803345} - - component: {fileID: 3389900204265069980} m_Layer: 0 m_Name: platform_power m_TagString: platform @@ -212,19 +211,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!54 &3389900204265069980 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7678802340880963262} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/Platforms/platform_rrange.prefab b/Assets/Prefabs/Platforms/platform_rrange.prefab index 733c7eb..495a313 100644 --- a/Assets/Prefabs/Platforms/platform_rrange.prefab +++ b/Assets/Prefabs/Platforms/platform_rrange.prefab @@ -115,7 +115,6 @@ GameObject: - component: {fileID: 6218203028538785626} - component: {fileID: 1204402889283165505} - component: {fileID: 7973800414101489524} - - component: {fileID: 6165408165884203318} m_Layer: 0 m_Name: platform_rrange m_TagString: platform @@ -330,19 +329,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!54 &6165408165884203318 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6650340373999088090} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/Platforms/platform_speed.prefab b/Assets/Prefabs/Platforms/platform_speed.prefab index 8e3be55..fcac8c1 100644 --- a/Assets/Prefabs/Platforms/platform_speed.prefab +++ b/Assets/Prefabs/Platforms/platform_speed.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &4600656011211176709 Transform: @@ -94,13 +94,13 @@ GameObject: - component: {fileID: 1121309705137920178} - component: {fileID: 526948428540975981} - component: {fileID: 5794058540197003412} - - component: {fileID: 8763404315579740833} + - component: {fileID: 6002528643883098957} m_Layer: 0 m_Name: platform_speed m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1121309705137920178 Transform: @@ -149,22 +149,18 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: db9955a831b9d1a49a8d725397ad8326, type: 3} ---- !u!54 &8763404315579740833 -Rigidbody: +--- !u!114 &6002528643883098957 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7834549091241900869} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8214805574275809151 GameObject: m_ObjectHideFlags: 0 @@ -181,7 +177,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1607747057115788900 Transform: diff --git a/Assets/Prefabs/Platforms/platform_start.prefab b/Assets/Prefabs/Platforms/platform_start.prefab index 70f111b..09dcd13 100644 --- a/Assets/Prefabs/Platforms/platform_start.prefab +++ b/Assets/Prefabs/Platforms/platform_start.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2628890433357983123 Transform: @@ -99,7 +99,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2628890433674921147 Transform: @@ -179,13 +179,12 @@ GameObject: - component: {fileID: 411423064055404482} - component: {fileID: 459485775853362848} - component: {fileID: 2187729912207573111} - - component: {fileID: -6601052459336252156} m_Layer: 0 m_Name: platform_start m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2628890434173161083 Transform: @@ -279,19 +278,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!54 &-6601052459336252156 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2628890434173161082} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 605d411..7458cb4 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1281,7 +1281,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -0.000030517578} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 1, y: 0} --- !u!222 &2053745176 @@ -1771,13 +1771,12 @@ GameObject: - component: {fileID: 3244356566819001085} - component: {fileID: 3244356566819001074} - component: {fileID: 3244356566819001073} - - component: {fileID: 3244356566819001087} - component: {fileID: 3244356566819001086} - - component: {fileID: 1172583624} - component: {fileID: 1943902172017936589} + - component: {fileID: 8051388916173435998} m_Layer: 0 m_Name: Body - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1790,7 +1789,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3244356566819001084} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.82, z: -0.44} + m_LocalPosition: {x: 0, y: 1.87, z: -0.44} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1848,22 +1847,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &3244356566819001087 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3244356566819001084} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 2 --- !u!114 &3244356566819001086 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1881,9 +1864,13 @@ MonoBehaviour: maxSpeed: 15 minSpeed: 5 currentSpeed: 0 + speedModifier: 0 + rb: {fileID: 0} + chc: {fileID: 0} isRunning: 0 isFalling: 0 - jumpSpeed: 3 + jumpSpeed: 1 + jumpModifier: 0 inAir: 0 lookSpeed: 5 lookXLimit: 10 @@ -1902,19 +1889,8 @@ MonoBehaviour: - {fileID: 8300000, guid: 5e15f53ccc08c4e4496e13306a9e4743, type: 3} - {fileID: 8300000, guid: 049628ae43735224990d9bcea2f744ad, type: 3} - {fileID: 8300000, guid: 227c760da48796046b26b76b3706319b, type: 3} ---- !u!65 &1172583624 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3244356566819001084} - m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 2, z: 1} - m_Center: {x: 0, y: 0, z: 0} + collide: 0 + saveDirection: {x: 0, y: 0, z: 0} --- !u!82 &1943902172017936589 AudioSource: m_ObjectHideFlags: 0 @@ -2011,6 +1987,24 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!143 &8051388916173435998 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3244356566819001084} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 2 + m_Radius: 0.5 + m_SlopeLimit: 180 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3244356567246256140 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/platforms/Platform 5.prefab b/Assets/Prefabs/platforms/Platform 5.prefab index 37dfc6e..94899e9 100644 --- a/Assets/Prefabs/platforms/Platform 5.prefab +++ b/Assets/Prefabs/platforms/Platform 5.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1444217836988950975 Transform: @@ -99,7 +99,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &4004768572291123662 Transform: @@ -177,13 +177,13 @@ GameObject: - component: {fileID: 2448110616132624592} - component: {fileID: 3336986385195135180} - component: {fileID: 4297191551228047469} - - component: {fileID: -8845465503422763632} + - component: {fileID: 2479976511386043243} m_Layer: 0 m_Name: Platform 5 m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2448110616132624592 Transform: @@ -231,19 +231,15 @@ MonoBehaviour: speed: 0 audioSource: {fileID: 0} audioClips: [] ---- !u!54 &-8845465503422763632 -Rigidbody: +--- !u!114 &2479976511386043243 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6736808733118194127} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/platforms/Platform_Blue.prefab b/Assets/Prefabs/platforms/Platform_Blue.prefab index 4d41172..53d1760 100644 --- a/Assets/Prefabs/platforms/Platform_Blue.prefab +++ b/Assets/Prefabs/platforms/Platform_Blue.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &7023346894872375308 Transform: @@ -99,13 +99,12 @@ GameObject: - component: {fileID: 8238111678033492397} - component: {fileID: -5509448037057392871} - component: {fileID: 2527761051471871889} - - component: {fileID: 4240483973579556787} m_Layer: 0 m_Name: Platform_Blue m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8768991388683709944 Transform: @@ -329,19 +328,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!54 &4240483973579556787 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8768991388683709947} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/platforms/Platform_Green.prefab b/Assets/Prefabs/platforms/Platform_Green.prefab index 2d3e6fc..e05f021 100644 --- a/Assets/Prefabs/platforms/Platform_Green.prefab +++ b/Assets/Prefabs/platforms/Platform_Green.prefab @@ -17,7 +17,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8574925503902921965 Transform: @@ -114,13 +114,12 @@ GameObject: - component: {fileID: 3339862426328537977} - component: {fileID: 3865253352867341094} - component: {fileID: -7597049073915248875} - - component: {fileID: 3278078638141404736} m_Layer: 0 m_Name: Platform_Green m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8768991388683709944 Transform: @@ -230,22 +229,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!54 &3278078638141404736 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8768991388683709947} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 --- !u!1 &8985668614484660023 GameObject: m_ObjectHideFlags: 0 @@ -262,7 +245,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1012190739008653402 Transform: diff --git a/Assets/Prefabs/platforms/Platform_Red.prefab b/Assets/Prefabs/platforms/Platform_Red.prefab index d1fb4ef..7e8c15a 100644 --- a/Assets/Prefabs/platforms/Platform_Red.prefab +++ b/Assets/Prefabs/platforms/Platform_Red.prefab @@ -115,7 +115,6 @@ GameObject: - component: {fileID: 5316890779910729157} - component: {fileID: -142748814437030588} - component: {fileID: 5862113707430629064} - - component: {fileID: -6889792310482815023} m_Layer: 0 m_Name: Platform_Red m_TagString: platform @@ -329,19 +328,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!54 &-6889792310482815023 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8768991388683709947} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/platforms/Platform_empty.prefab b/Assets/Prefabs/platforms/Platform_empty.prefab index 5c51589..665d954 100644 --- a/Assets/Prefabs/platforms/Platform_empty.prefab +++ b/Assets/Prefabs/platforms/Platform_empty.prefab @@ -15,7 +15,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1979594279159666205 Transform: @@ -91,7 +91,7 @@ GameObject: m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8768991388683709944 Transform: diff --git a/Assets/Prefabs/platforms/Platform_green_basic.prefab b/Assets/Prefabs/platforms/Platform_green_basic.prefab index 882272f..1092a2a 100644 --- a/Assets/Prefabs/platforms/Platform_green_basic.prefab +++ b/Assets/Prefabs/platforms/Platform_green_basic.prefab @@ -17,7 +17,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2021819533839461673 Transform: @@ -115,13 +115,12 @@ GameObject: - component: {fileID: 4344779564172896453} - component: {fileID: 5433657018731068073} - component: {fileID: 8383421295717427161} - - component: {fileID: 3996111038030861644} m_Layer: 0 m_Name: Platform_green_basic m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8768991388683709944 Transform: @@ -326,19 +325,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!54 &3996111038030861644 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8768991388683709947} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/platforms/Platform_yellow.prefab b/Assets/Prefabs/platforms/Platform_yellow.prefab index 447b8ec..138ed60 100644 --- a/Assets/Prefabs/platforms/Platform_yellow.prefab +++ b/Assets/Prefabs/platforms/Platform_yellow.prefab @@ -17,7 +17,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2021819533839461673 Transform: @@ -115,13 +115,12 @@ GameObject: - component: {fileID: 4344779564172896453} - component: {fileID: 5433657018731068073} - component: {fileID: 8383421295717427161} - - component: {fileID: 3996111038030861644} m_Layer: 0 m_Name: Platform_yellow m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8768991388683709944 Transform: @@ -330,19 +329,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!54 &3996111038030861644 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8768991388683709947} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 diff --git a/Assets/Prefabs/platforms/platform 6.prefab b/Assets/Prefabs/platforms/platform 6.prefab index 1a1d1d7..0ce2236 100644 --- a/Assets/Prefabs/platforms/platform 6.prefab +++ b/Assets/Prefabs/platforms/platform 6.prefab @@ -11,13 +11,13 @@ GameObject: - component: {fileID: 6924804905937609835} - component: {fileID: 923436955745262935} - component: {fileID: 2125975832863856952} - - component: {fileID: -9158675677278049386} + - component: {fileID: 4240406909675977149} m_Layer: 0 m_Name: platform 6 m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6924804905937609835 Transform: @@ -65,22 +65,18 @@ MonoBehaviour: speed: 0 audioSource: {fileID: 0} audioClips: [] ---- !u!54 &-9158675677278049386 -Rigidbody: +--- !u!114 &4240406909675977149 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2391451336753015343} - serializedVersion: 2 - m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dae18984b7ff147ab1d77fb817687a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4924719497898627403 GameObject: m_ObjectHideFlags: 0 @@ -97,7 +93,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &4763405063613741546 Transform: @@ -180,7 +176,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &4341890187507101056 Transform: diff --git a/Assets/Scenes/Vasek.unity b/Assets/Scenes/Vasek.unity index e02d333..a9b3eb5 100644 --- a/Assets/Scenes/Vasek.unity +++ b/Assets/Scenes/Vasek.unity @@ -5269,6 +5269,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3244356566819001086, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: jumpSpeed + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3244356567246256142, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} propertyPath: menuCamera value: diff --git a/Assets/Scripts/PlatformManager.cs b/Assets/Scripts/PlatformManager.cs index 2184700..b065d58 100644 --- a/Assets/Scripts/PlatformManager.cs +++ b/Assets/Scripts/PlatformManager.cs @@ -27,4 +27,48 @@ public class PlatformManager : MonoBehaviour audioSource.PlayOneShot(audioClips[Random.Range(0, audioClips.Count)]); } } + + public void Action(PlayerController player, string status) + { + switch (type) + { + case PlatformType.Basic: + return; + case PlatformType.Pull: + if (status == "exit") + { + player.jumpModifier = speed * 10f; + } + return; + case PlatformType.Push: + if (status == "exit") + { + player.jumpModifier = speed * 10f; + } + return; + case PlatformType.RotateY: + return; + case PlatformType.RotateZ: + return; + case PlatformType.SpeedDown: + if (status == "enter") + { + if (player.speedModifier - speed >= 0) + { + player.speedModifier -= speed; + } + else + { + player.speedModifier = 0.0f; + } + } + return; + case PlatformType.SpeedUp: + if (status == "enter") + { + player.speedModifier += speed; + } + return; + } + } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index ddf346e..e82d283 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -11,10 +11,14 @@ public class PlayerController : MonoBehaviour public float minSpeed = 5.0f; [HideInInspector] public float currentSpeed = 0f; - private float speedModifier = 0.0f; + [HideInInspector] + public float speedModifier = 0.0f; Vector3 moveDirection = Vector3.zero; bool canMove = false; - Rigidbody rb; + [HideInInspector] + public Rigidbody rb; + [HideInInspector] + public CharacterController chc; float moveDirectionY; public bool isRunning = false; @@ -22,8 +26,12 @@ public class PlayerController : MonoBehaviour [Header("Jump")] public float jumpSpeed = 7.5f; [HideInInspector] + public float jumpModifier = 0.0f; + [HideInInspector] public bool inAir = false; private bool isGrounded = false; + private float jumpTimer = 0.1f; + private float jumpTime = 0f; [Header("Camera")] public float lookSpeed = 7.5f; public float lookXLimit = 40.0f; @@ -35,10 +43,14 @@ public class PlayerController : MonoBehaviour public AudioSource audioSource; public List jumpClips = new List(); public List audioClips = new List(); + PlatformManager collidePlatform; + string platformStatus = "exit"; // Start is called before the first frame update - private Vector3 saveDirection; + [HideInInspector] + public Vector3 saveDirection; private Vector3 downDirection; + Vector3 _velocity = Vector3.zero; private Vector3 follow = Vector3.zero; @@ -47,7 +59,8 @@ public class PlayerController : MonoBehaviour void Start() { - rb = GetComponent(); + //rb = GetComponent(); + chc = GetComponent(); } public void disableCursor() @@ -68,7 +81,7 @@ public class PlayerController : MonoBehaviour isRunning = Input.GetKey(KeyCode.LeftShift); if (canMove && currentSpeed < minSpeed) { - currentSpeed += 0.01f; + currentSpeed += 0.1f; } if (Input.GetAxis("Vertical") > 0 && currentSpeed < maxSpeed) @@ -85,7 +98,7 @@ public class PlayerController : MonoBehaviour } float curSpeedX = canMove ? (currentSpeed + speedModifier): 0; - float curSpeedY = canMove ? (currentSpeed + speedModifier) * Input.GetAxis("Horizontal") : 0; + float curSpeedY = canMove ? speed * Input.GetAxis("Horizontal") : 0; moveDirection = (transform.forward * curSpeedX * Time.deltaTime) + (transform.right * curSpeedY * Time.deltaTime); @@ -98,12 +111,6 @@ public class PlayerController : MonoBehaviour runningParticles.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); } - if (Input.GetKeyDown(KeyCode.Space) && isGrounded) - { - inAir = true; - isGrounded = false; - } - if (audioSource != null && audioClips.Count > 0) { if ((currentSpeed + speedModifier) > speed * 3f && (currentSpeed + speedModifier) < speed * 6f) @@ -135,21 +142,88 @@ public class PlayerController : MonoBehaviour } } - rb.MovePosition(rb.position + moveDirection); + PlatformManager localP = null; + if (collidePlatform != null) + { + collidePlatform.Step(); + collidePlatform.Action(this, platformStatus); + localP = collidePlatform; + if (platformStatus == "enter") + { + platformStatus = "stay"; + collidePlatform = null; + } + } + else + { + if (platformStatus == "stay") + { + platformStatus = "exit"; + if (localP != null) + { + localP.Action(this, platformStatus); + localP = null; + } + } + } + + if (jumpTime <= Time.time) + { + jumpModifier = 0.0f; + Vector3 locGrav = (Physics.gravity * Time.deltaTime); + if (!isGrounded) + { + _velocity += Physics.gravity / 50 * Time.deltaTime; + } + else + { + _velocity = Physics.gravity * Time.deltaTime; + } + } + else + { + _velocity += transform.up * (jumpSpeed + jumpModifier) / 5 * Time.deltaTime; + } + + if (Input.GetKeyDown(KeyCode.Space) && isGrounded) + { + //inAir = true; + if (audioSource != null && jumpClips.Count > 0) + { + audioSource.PlayOneShot(jumpClips[Random.Range(0, jumpClips.Count)]); + } + _velocity = Vector3.zero; + jumpTime = jumpTimer + Time.time; + isGrounded = false; + } + + chc.Move(moveDirection + _velocity); + + //rb.MovePosition(rb.position + moveDirection); } private void FixedUpdate() { - if (inAir) + downDirection = -transform.up; + if (Physics.gravity != (downDirection * 9.81f)) { + if (downDirection == Vector3.forward) + { + downDirection = Vector3.down; + } + Physics.gravity = downDirection * 9.81f; + } + + /*if (inAir) { // Debug.Log("Jump"); if (audioSource != null && jumpClips.Count > 0) { audioSource.PlayOneShot(jumpClips[Random.Range(0, jumpClips.Count)]); } - rb.AddForce(transform.up * jumpSpeed * 100f * Time.deltaTime, ForceMode.Impulse); + chc.Move(transform.up * jumpSpeed * 100f * Time.deltaTime); + //rb.AddForce(transform.up * jumpSpeed * 100f * Time.deltaTime, ForceMode.Impulse); inAir = false; - } + }*/ if (Vector3.Distance(transform.position, new Vector3(0f, 0f, transform.position.z)) > 10f) { @@ -161,7 +235,7 @@ public class PlayerController : MonoBehaviour this.isFalling = false; } - if (saveDirection != Vector3.zero) + if (saveDirection != -transform.up) { Vector3 axis; float angle; @@ -171,125 +245,83 @@ public class PlayerController : MonoBehaviour transform.RotateAround(axis, angle * Time.deltaTime * 8f); } - var distanceFromYAxis = new Vector2(rb.position.x, rb.position.y).magnitude; + var distanceFromYAxis = new Vector2(transform.position.x, transform.position.y).magnitude; if (UiController.isInMenu == false && distanceFromYAxis > this.maxDistanceFromCenterLine) { Debug.Log("Player fell out of map."); - rb.velocity = Vector3.zero; + //rb.velocity = Vector3.zero; UiController.isInMenu = true; - Physics.gravity = -Vector3.up * 9.81f; + Physics.gravity = Vector3.down * 9.81f; UiController.SaveGame(); UnityEngine.SceneManagement.SceneManager.LoadScene(0); } } - void OnCollisionExit(Collision other) + /*void OnCollisionExit(Collision other) { - if (other.gameObject.tag == "platform") - { - Physics.gravity = this.downDirection * 9.81f; + if (other.gameObject.tag != "platform") return; - PlatformManager platform = other.gameObject.GetComponent(); + PlatformManager platform = other.gameObject.GetComponent(); - if (platform != null) - { - platform.Step(); - float step = platform.speed * Time.deltaTime * 10f; - switch (platform.type) - { - case PlatformManager.PlatformType.Push: - rb.AddForce(-saveDirection * step, ForceMode.VelocityChange); - break; - case PlatformManager.PlatformType.Pull: - rb.AddForce(saveDirection * step, ForceMode.VelocityChange); - break; - } - } - } + if (platform == null) return; + + platform.Step(); + platform.Action(this, "exit"); } void OnCollisionStay(Collision other) { if (other.gameObject.tag != "platform") return; - PlatformManager platform = other.gameObject.GetComponent(); - if (platform == null) - { - // FIXME: Should platforms be allowed to not to have a PlatformManager? - // Debug.Log("ERROR"); + + Vector3 contact = other.GetContact(other.contacts.Length - 1).normal; + if (contact != -other.transform.up && contact != other.transform.up) { return; } - if (other.GetContact(other.contacts.Length - 1).normal == other.transform.forward - || other.GetContact(other.contacts.Length - 1).normal == -other.transform.forward - || other.GetContact(other.contacts.Length - 1).normal == -other.transform.right - || other.GetContact(other.contacts.Length - 1).normal == other.transform.right - || (other.GetContact(other.contacts.Length - 1).normal != -other.transform.up - && other.GetContact(other.contacts.Length - 1).normal != other.transform.up) - ) - { - return; - } - this.downDirection = -transform.up; - saveDirection = -other.GetContact(other.contacts.Length - 1).normal; - - // TODO: Handle other PlatformTypes - Physics.gravity = this.downDirection * 9.81f; - + saveDirection = -contact; } void OnCollisionEnter(Collision other) { + Debug.Log("Collide :D"); isGrounded = true; - if (other.gameObject.tag == "platform") + if (other.gameObject.tag != "platform") return; + + PlatformManager platform = other.gameObject.GetComponent(); + + if (platform != null) { - PlatformManager platform = other.gameObject.GetComponent(); - if (platform != null) - { - platform.Step(); - switch (platform.type) - { - case PlatformManager.PlatformType.Push: - break; - case PlatformManager.PlatformType.Pull: - break; - case PlatformManager.PlatformType.RotateY: - break; - case PlatformManager.PlatformType.RotateZ: - break; - case PlatformManager.PlatformType.SpeedUp: - speedModifier += platform.speed; - break; - case PlatformManager.PlatformType.SpeedDown: - if (speedModifier - platform.speed >= 0) - { - speedModifier -= platform.speed; - } - else - { - speedModifier = 0.0f; - } - break; - } - } - if (other.GetContact(0).normal == other.transform.forward - || other.GetContact(0).normal == -other.transform.forward - || other.GetContact(0).normal == -other.transform.right - || other.GetContact(0).normal == other.transform.right - || (other.GetContact(0).normal != -other.transform.up - && other.GetContact(0).normal != other.transform.up) - ) - { - return; - } - saveDirection = -other.GetContact(0).normal; - Vector3 gDirection = -transform.up; - if (platform == null) - { - gDirection = -transform.up; - } - this.downDirection = gDirection; - Physics.gravity = gDirection * 9.81f; + platform.Step(); + platform.Action(this, "enter"); } + + Vector3 contact = other.GetContact(other.contacts.Length - 1).normal; + if (contact != -other.transform.up && + contact != other.transform.up) { + return; + } + + saveDirection = -contact; + } */ + + void OnControllerColliderHit(ControllerColliderHit hit) + { + isGrounded = true; + if (platformStatus == "exit") { + platformStatus = "enter"; + } + if (hit.gameObject.tag != "platform") return; + + collidePlatform = hit.gameObject.GetComponent(); + + Vector3 contact = hit.normal; + if (contact != -hit.gameObject.transform.up && + contact != hit.gameObject.transform.up) + { + return; + } + + saveDirection = -contact; } } diff --git a/Assets/Scripts/ProceduralGeneration.cs b/Assets/Scripts/ProceduralGeneration.cs index ad46c96..03be81e 100644 --- a/Assets/Scripts/ProceduralGeneration.cs +++ b/Assets/Scripts/ProceduralGeneration.cs @@ -79,9 +79,6 @@ public class ProceduralGeneration : MonoBehaviour float angle = 360f / (float)pieceCount; Bounds bounds = this.getPrefabBounds(lastObject); - Bounds b = this.getPrefabBounds(objToSpawn); - - Vector3 centerPoint = new Vector3(lastObject.transform.position.x, (lastObject.transform.position.y + radius), lastObject.transform.position.z + (lastObject.name.Contains("chunk") ? bounds.size.z : bounds.extents.z) + b.extents.z); float heightOffset = radius; @@ -92,7 +89,7 @@ public class ProceduralGeneration : MonoBehaviour Vector3 position = (lastObject.transform.position + (direction * radius)); GameObject newObject = Instantiate(objToSpawn, new Vector3(position.x, position.y + heightOffset, position.z + (float)(i * horizontalDistancePerPlatform) + (lastObject.name.Contains("chunk") ? bounds.extents.z : 0f)), rotation); - newObject.transform.parent = parentLevelObject.transform; + //newObject.transform.parent = parentLevelObject.transform; levelBlocksSpawnTemp.Add(newObject); } @@ -144,7 +141,7 @@ public class ProceduralGeneration : MonoBehaviour for (var i = 0; i < this.spawnedLevelBlocks.Count; i++) { float distance = Vector3.Distance(this.spawnedLevelBlocks[i].transform.position, playerPosition); - if (distance > this.maximumDistanceOfPlatformFromPlayer && this.spawnedLevelBlocks.Count >= this.maximumNumberOfPlatformsAtScene && playerPosition.z > this.spawnedLevelBlocks[i].transform.position.z) + if (distance > this.maximumDistanceOfPlatformFromPlayer && this.spawnedLevelBlocks.Count >= this.maximumNumberOfPlatformsAtScene && playerPosition.z > this.spawnedLevelBlocks[i].transform.position.z + 2) { Destroy(this.spawnedLevelBlocks[i]); this.spawnedLevelBlocks.Remove(this.spawnedLevelBlocks[i]); diff --git a/Assets/Scripts/gizmoManager.cs b/Assets/Scripts/gizmoManager.cs index 063f9ef..92875ff 100644 --- a/Assets/Scripts/gizmoManager.cs +++ b/Assets/Scripts/gizmoManager.cs @@ -7,7 +7,7 @@ public class gizmoManager : MonoBehaviour void OnDrawGizmos() { - if (this.gameObject != null && !this.gameObject.transform.parent.name.Contains("chunk")) + if (this.gameObject != null && this.gameObject.transform.parent != null && !this.gameObject.transform.parent.name.Contains("chunk")) { Bounds bounds = GetChildRendererBounds(gameObject); Gizmos.DrawWireCube(bounds.center, bounds.size); diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 9cb795d..6231b08 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -16,66 +16,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 43 - width: 2560 - height: 1357 + width: 1920 + height: 989 m_ShowMode: 4 m_Title: Game - m_RootView: {fileID: 4} + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 691 - width: 506 - height: 480 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 506 - height: 1171 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 21 ---- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -88,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 3} - {fileID: 5} - - {fileID: 7} - - {fileID: 6} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 1357 + width: 1920 + height: 989 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &5 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -120,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &6 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,11 +90,61 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1337 - width: 2560 + y: 969 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1920 + height: 939 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 42 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1531 + height: 939 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 43 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -160,68 +159,18 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 8} - - {fileID: 13} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 2560 - height: 1307 - m_MinSize: {x: 300, y: 300} - m_MaxSize: {x: 24288, y: 24288} - vertical: 0 - controlID: 92 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - {fileID: 9} - - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 2041 - height: 1307 - m_MinSize: {x: 200, y: 300} - m_MaxSize: {x: 16192, y: 24288} - vertical: 1 - controlID: 93 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 2041 - height: 1171 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} + width: 1531 + height: 582 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 94 ---- !u!114 &10 + controlID: 44 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -238,16 +187,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 506 - height: 691 + width: 380 + height: 582 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 16} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -262,20 +211,20 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 506 + x: 380 y: 0 - width: 1535 - height: 1171 + width: 1151 + height: 582 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 13} m_Panes: + - {fileID: 13} - {fileID: 15} - - {fileID: 17} - - {fileID: 18} + - {fileID: 16} m_Selected: 0 m_LastSelected: 2 ---- !u!114 &12 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -285,23 +234,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 1171 - width: 2041 - height: 136 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + y: 582 + width: 1531 + height: 357 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 20} + - {fileID: 17} + - {fileID: 18} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 + m_LastSelected: 1 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -316,19 +266,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2041 + x: 1531 y: 0 - width: 519 - height: 1307 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + width: 389 + height: 939 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 21} - - {fileID: 14} + - {fileID: 19} + - {fileID: 12} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &14 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -356,7 +306,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &15 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -376,10 +326,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 506 + x: 380 y: 73 - width: 1533 - height: 1150 + width: 1149 + height: 561 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -390,7 +340,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} + snapOffsetDelta: {x: -101, y: -1} snapCorner: 3 id: Tool Settings index: 0 @@ -412,7 +362,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: unity-scene-view-toolbar index: 0 @@ -423,7 +373,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -456,7 +406,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -466,7 +416,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Camera @@ -478,7 +428,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -489,7 +439,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -500,7 +450,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -511,7 +461,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -522,7 +472,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -533,7 +483,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -544,7 +494,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -555,7 +505,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -565,7 +515,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles @@ -573,17 +523,17 @@ MonoBehaviour: layout: 4 m_WindowGUID: f698b044e833d684aa193cc39aa339e2 m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_OverrideSceneCullingMask: 0 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -9.554611, y: 15.874056, z: -20.83077} + m_Target: {x: 0.63433224, y: 0.5161089, z: -0.06508292} speed: 2 - m_Value: {x: -9.554611, y: 15.874056, z: -20.83077} + m_Value: {x: 0.63433224, y: 0.5161089, z: -0.06508292} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -595,7 +545,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -630,13 +580,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.27555874, y: 0.32472298, z: -0.09946412, w: 0.8993302} + m_Target: {x: 0.2175823, y: 0.19176582, z: -0.04361403, w: 0.9558543} speed: 2 - m_Value: {x: 0.2755497, y: 0.32471234, z: -0.099460855, w: 0.8993007} + m_Value: {x: 0.21761759, y: 0.19179691, z: -0.0436211, w: 0.95600927} m_Size: - m_Target: 1.1502473 + m_Target: 2.7803905 speed: 2 - m_Value: 1.1502473 + m_Value: 2.7803905 m_Ortho: m_Target: 0 speed: 2 @@ -661,7 +611,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -683,8 +633,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 505 - height: 670 + width: 379 + height: 561 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -692,9 +642,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 668efcffc08efcffa690fcff82f7ffff84f7ffff + m_SelectedIDs: 94400100 + m_LastClickedID: 82068 + m_ExpandedIDs: f660cbff94400100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -710,7 +660,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -718,7 +668,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 5be6ec573dcaae241af953c00b16773f ---- !u!114 &17 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -746,7 +696,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &18 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -766,10 +716,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 506 + x: 380 y: 73 - width: 1533 - height: 1150 + width: 1149 + height: 561 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -780,7 +730,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1533, y: 1129} + m_TargetSize: {x: 1149, y: 540} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -795,10 +745,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766.5 - m_HBaseRangeMax: 766.5 - m_VBaseRangeMin: -564.5 - m_VBaseRangeMax: 564.5 + m_HBaseRangeMin: -574.5 + m_HBaseRangeMax: 574.5 + m_VBaseRangeMin: -270 + m_VBaseRangeMax: 270 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -816,29 +766,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1533 - height: 1129 + width: 1149 + height: 540 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766.5, y: 564.5} + m_Translation: {x: 574.5, y: 270} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766.5 - y: -564.5 - width: 1533 - height: 1129 + x: -574.5 + y: -270 + width: 1149 + height: 540 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1533, y: 1150} + m_LastWindowPixelSize: {x: 1149, y: 561} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &19 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -859,9 +809,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 764 - width: 505 - height: 459 + y: 655 + width: 1530 + height: 336 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -887,14 +837,14 @@ MonoBehaviour: m_LastFolders: - Assets/Prefabs/platforms m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\sande\Desktop\Gamejam\GGJ2022 + m_LastProjectPath: F:\Git\GGJ2022 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: e6540000 - m_LastClickedID: 21734 - m_ExpandedIDs: 00000000d0540000d25400005656000000ca9a3b + scrollPos: {x: 0, y: 308} + m_SelectedIDs: a65d0000 + m_LastClickedID: 23974 + m_ExpandedIDs: 00000000885d00008a5d00008c5d00008e5d0000905d0000925d0000945d0000a05d000052e7000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -922,7 +872,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d0540000d2540000 + m_ExpandedIDs: 00000000885d00008a5d00008c5d00008e5d0000905d0000925d0000945d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -950,7 +900,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000885500001855000016550000 + m_ExpandedInstanceIDs: c623000088550000185500001655000056e70000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -966,7 +916,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 2} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -974,11 +924,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 58} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 226 ---- !u!114 &20 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -999,14 +949,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 1244 - width: 2040 - height: 115 + y: 655 + width: 1530 + height: 336 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &21 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1026,10 +976,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2041 + x: 1531 y: 73 - width: 518 - height: 1286 + width: 388 + height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default