diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index db3417e..e81440e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2932,7 +2932,7 @@ MonoBehaviour: mainPlanContainer: {fileID: 557435656} emergencyPlanContainer: {fileID: 632826360} reconfigurationToggle: {fileID: 441283505} - defaultPath: + defaultPath: /home/dawp/Projects/Commisions/Parking/Assets/Data/Tablica2.csv --- !u!1 &1347097428 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ParkingManager.cs b/Assets/Scripts/ParkingManager.cs index 38432c1..72f4a0e 100644 --- a/Assets/Scripts/ParkingManager.cs +++ b/Assets/Scripts/ParkingManager.cs @@ -591,7 +591,7 @@ namespace Parking foreach (List currentLaneSpots in _spotMap) for (int i = 0; i < currentLaneSpots.Count; i++) { Spot spot = currentLaneSpots[i]; - if (!spot.Free || spot.Size == Size.D)// || spot.Reserved) + if (!spot.Free || spot.Size == Size.D || spot.Reserved) continue; if (GetSpotCountOfSize(Size.A) <= 2 && spot.Size == Size.A) continue; diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ba6df5f..31b0e97 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.6", + "version": "7.0.8", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.3", + "com.unity.2d.common": "6.0.5", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -13,7 +13,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "6.0.3", + "version": "6.0.5", "depth": 2, "source": "registry", "dependencies": { @@ -39,12 +39,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "6.0.4", + "version": "6.0.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.6", - "com.unity.2d.common": "6.0.3", + "com.unity.2d.animation": "7.0.8", + "com.unity.2d.common": "6.0.5", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -56,12 +56,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "7.0.5", + "version": "7.0.6", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.3", + "com.unity.2d.common": "6.0.4", "com.unity.2d.path": "5.0.2", "com.unity.modules.physics2d": "1.0.0" }, @@ -115,11 +115,11 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.6", + "com.unity.2d.animation": "7.0.8", "com.unity.2d.pixel-perfect": "5.0.1", - "com.unity.2d.psdimporter": "6.0.4", + "com.unity.2d.psdimporter": "6.0.6", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "7.0.5", + "com.unity.2d.spriteshape": "7.0.6", "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "2.2.3" } @@ -164,7 +164,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.4.2", + "version": "1.4.3", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8d9054d..b868996 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.9f1 -m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536) +m_EditorVersion: 2021.3.12f1 +m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1)