From bd4f9abb9e374ff1cb1a42ced909d7528b42556c Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Wed, 23 Feb 2022 13:28:25 +0100 Subject: [PATCH] Fixed second scene --- Assets/Scenes/OverDevScene.unity | 148 --------------------- Assets/Scenes/OverDevScene2.unity | 36 ++--- Assets/Scripts/Platforms/MovingPlatform.cs | 2 +- UserSettings/EditorUserSettings.asset | 4 +- 4 files changed, 23 insertions(+), 167 deletions(-) diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index db6a2c3..b666597 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -2378,154 +2378,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} ---- !u!1 &597989745 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 597989749} - - component: {fileID: 597989748} - - component: {fileID: 597989747} - - component: {fileID: 597989746} - - component: {fileID: 597989750} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &597989746 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597989745} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!50 &597989747 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597989745} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 7 ---- !u!212 &597989748 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597989745} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &597989749 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597989745} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.49, y: -2.68, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &597989750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597989745} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1637c8c06cf9fae4eb7bfa1a0ebb0e55, type: 3} - m_Name: - m_EditorClassIdentifier: - xOffeset: 20 - yOffset: 0 --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} diff --git a/Assets/Scenes/OverDevScene2.unity b/Assets/Scenes/OverDevScene2.unity index 1c58ae7..00ddaa5 100644 --- a/Assets/Scenes/OverDevScene2.unity +++ b/Assets/Scenes/OverDevScene2.unity @@ -183,13 +183,13 @@ CompositeCollider2D: Y: 9999959 - X: 10000100 Y: 19999900 - - X: 50000041 + - X: 9999959 Y: 19999900 - - X: 50000100 + - X: 9999900 Y: 19999959 - - X: 50000100 + - X: 9999900 Y: 30000041 - - X: 50000041 + - X: 9999959 Y: 30000100 - X: 10000100 Y: 30000100 @@ -241,10 +241,16 @@ CompositeCollider2D: Y: 30000041 - X: 210000041 Y: 30000100 - - X: 89999959 + - X: 49999959 Y: 30000100 - - X: 89999900 + - X: 49999900 Y: 30000041 + - X: 49999900 + Y: 19999959 + - X: 49999959 + Y: 19999900 + - X: 89999900 + Y: 19999900 - X: 89999900 Y: -9999900 - X: -70000041 @@ -260,10 +266,6 @@ CompositeCollider2D: m_CompositePaths: m_Paths: - - {x: 0.9999748, y: 0.99999} - - {x: 1.0000395, y: 1.99999} - - {x: 5.00001, y: 2.0000253} - - {x: 4.9999747, y: 3.00001} - - {x: 1.00001, y: 3.0000393} - {x: 0.9999748, y: 8.00001} - {x: -7.0000095, y: 7.9999747} - {x: -6.9999743, y: 0.99999} @@ -277,7 +279,9 @@ CompositeCollider2D: - {x: 17.00004, y: 1.99999} - {x: 21.00001, y: 2.0000253} - {x: 20.999975, y: 3.00001} - - {x: 8.99999, y: 2.9999747} + - {x: 4.99999, y: 2.9999747} + - {x: 5.0000253, y: 1.99999} + - {x: 8.99999, y: 1.9999607} - {x: 8.999961, y: -0.99999} - {x: -7.0000095, y: -1.0000252} - {x: -6.9999743, y: -6.00001} @@ -2858,7 +2862,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 1, y: 2, z: 0} + - first: {x: 5, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 7 @@ -2868,7 +2872,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 2, y: 2, z: 0} + - first: {x: 6, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 6 @@ -2878,7 +2882,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: 2, z: 0} + - first: {x: 7, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 5 @@ -2888,7 +2892,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 2, z: 0} + - first: {x: 8, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 4 @@ -3996,7 +4000,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3} propertyPath: m_LocalPosition.x - value: 7 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Scripts/Platforms/MovingPlatform.cs b/Assets/Scripts/Platforms/MovingPlatform.cs index ee39b3d..204d0d1 100644 --- a/Assets/Scripts/Platforms/MovingPlatform.cs +++ b/Assets/Scripts/Platforms/MovingPlatform.cs @@ -46,7 +46,7 @@ namespace Platforms { var position = transform.position; var targetPosition = new Vector3(position.x + xOffeset, position.y + yOffset, 0.0f); - position = Vector3.SmoothDamp(position, targetPosition, ref _velocity, 1.0f); + position = Vector3.SmoothDamp(position, targetPosition, ref _velocity, 1.0f, 1.0f); transform.position = position; } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 3bf518d..e75b942 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-1: - value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561 + value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d flags: 0 RecentlyUsedSceneGuid-2: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561 flags: 0 vcSharedLogLevel: value: 0d5e400f0650