From 696340a434770bdb54743cb51b6dcc0d5a5a79f9 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Mon, 21 Feb 2022 22:55:52 +0100 Subject: [PATCH] Corrected Jump bug --- Assets/Prefabs/Playable/Player.prefab | 4 +- Assets/Scenes/OverDevScene.unity | 244 +++++++++--------- .../Layouts/CurrentMaximizeLayout.dwlt | 52 ++-- 3 files changed, 148 insertions(+), 152 deletions(-) diff --git a/Assets/Prefabs/Playable/Player.prefab b/Assets/Prefabs/Playable/Player.prefab index b039671..45a5a9a 100644 --- a/Assets/Prefabs/Playable/Player.prefab +++ b/Assets/Prefabs/Playable/Player.prefab @@ -29,7 +29,7 @@ Transform: m_GameObject: {fileID: 7008207192594766305} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.55, y: 0.41, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7008207193600475140} @@ -172,7 +172,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7008207193600475141} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.005, y: -0.48, z: 0} + m_LocalPosition: {x: -0.005, y: -0.491, z: 0} m_LocalScale: {x: 0.95, y: 0.05, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 5d665be..43202fe 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -123,6 +123,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &35238242 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -12.204437 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 4.697012 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!1 &65152409 GameObject: m_ObjectHideFlags: 0 @@ -148,7 +205,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 65152409} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9862347, y: 2.4404585, z: -9.967962} + m_LocalPosition: {x: 1.9862347, y: 2.5244584, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -194,6 +251,63 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1483260705} +--- !u!1001 &361923421 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -11.669386 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} @@ -283,7 +397,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &1408086266 Rigidbody2D: @@ -363,65 +477,8 @@ Transform: - {fileID: 1514474963} - {fileID: 65152410} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1464718380 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3605663502554574831, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_Name - value: Basic Ground Patrolling Enemy Variant - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalPosition.x - value: -10.9370365 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.1003778 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} --- !u!1 &1483260704 GameObject: m_ObjectHideFlags: 3 @@ -588,7 +645,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514474960} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9862347, y: 2.4404585, z: -9.967962} + m_LocalPosition: {x: 1.9862347, y: 2.5244584, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -723,63 +780,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1555312953 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalPosition.x - value: -12.28 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalPosition.y - value: 4.28 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 6987122029433902684, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_Name - value: Basic Wall Patrollling Enemy Variant - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 10633caf39c49d94c9f68742db900612, type: 3} --- !u!1001 &1584558587 PrefabInstance: m_ObjectHideFlags: 0 @@ -789,7 +789,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalScale.x @@ -917,17 +917,13 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.x value: -4.55 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.y - value: 0.45 + value: 0.534 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.z diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 2a289fd..072b8e2 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 19856 + controlID: 22277 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 19826 + controlID: 22229 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c0b0ffff8af0ffff0efbffff + m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -236,7 +236,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -245,14 +245,14 @@ MonoBehaviour: y: 381.6 width: 304 height: 349.19998 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 8} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} - {fileID: 8} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -274,7 +274,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 400.6 + y: 455.2 width: 303 height: 328.19998 m_ViewDataDictionary: {fileID: 0} @@ -308,7 +308,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -333,10 +333,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 57.80002} - m_SelectedIDs: 90b0ffff + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 40e6ffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 90b0ffff - m_LastClickedInstanceID: -20336 + m_SelectedInstanceIDs: 40e6ffff + m_LastClickedInstanceID: -6592 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 19857 + controlID: 22278 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -464,8 +464,8 @@ MonoBehaviour: y: 0 width: 880 height: 399.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} @@ -718,9 +718,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.4614882, y: -1.0482874, z: -0.0713436} + m_Target: {x: -4.399658, y: -0.4491718, z: -0.021942846} speed: 2 - m_Value: {x: -4.4614882, y: -1.0482874, z: -0.0713436} + m_Value: {x: -4.399658, y: -0.4491718, z: -0.021942846} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -771,9 +771,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.4135385 + m_Target: 0.62474537 speed: 2 - m_Value: 6.4135385 + m_Value: 0.62474537 m_Ortho: m_Target: 1 speed: 2 @@ -843,8 +843,8 @@ MonoBehaviour: y: 0 width: 352 height: 730.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -884,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -23310 + m_LastInspectedObjectInstanceID: -6592 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0