diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9183374..005561a 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1019,7 +1019,7 @@ Tilemap: - first: {x: -5, y: -11, z: 0} second: m_TileIndex: 15 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 42 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -1028,7 +1028,7 @@ Tilemap: - first: {x: 1, y: -11, z: 0} second: m_TileIndex: 7 - m_TileSpriteIndex: 7 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -1253,7 +1253,7 @@ Tilemap: - first: {x: -4, y: -9, z: 0} second: m_TileIndex: 13 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -1271,7 +1271,7 @@ Tilemap: - first: {x: -2, y: -9, z: 0} second: m_TileIndex: 12 - m_TileSpriteIndex: 12 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -3536,8 +3536,8 @@ Tilemap: m_Data: {fileID: 21300044, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 2 m_Data: {fileID: 21300046, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300006, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 21300022, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 2 @@ -3546,14 +3546,14 @@ Tilemap: m_Data: {fileID: 21300002, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 2 m_Data: {fileID: 21300000, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300026, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300024, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 21300020, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300008, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} + m_Data: {fileID: 21300026, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 9 m_Data: {fileID: 21300184, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 9 @@ -3572,8 +3572,8 @@ Tilemap: m_Data: {fileID: 21300068, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300066, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300024, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300222, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 1 @@ -3592,8 +3592,8 @@ Tilemap: m_Data: {fileID: 21300030, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300052, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300006, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 6 m_Data: {fileID: 21300220, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 3 @@ -3606,8 +3606,8 @@ Tilemap: m_Data: {fileID: 21300244, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 2 m_Data: {fileID: 21300224, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300008, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 15 m_Data: {fileID: 21300246, guid: a060d32336dc5ef49979f4bd787ce82a, type: 3} - m_RefCount: 2 @@ -8900,7 +8900,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &2138102594 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/InventoryManager.cs b/Assets/Script/InventoryManager.cs index 6031871..f7b506e 100644 --- a/Assets/Script/InventoryManager.cs +++ b/Assets/Script/InventoryManager.cs @@ -113,7 +113,7 @@ public class InventoryManager : MonoBehaviour HideSelector(selectorPos); } - if (plotPos.x == -1 || plotPos.y == -1) + if (plotPos.x == 999 || plotPos.y == 999) return; selectorPos = plotPos; @@ -150,7 +150,7 @@ public class InventoryManager : MonoBehaviour private int GetPlotIndex(Vector3Int pos) { Vector2Int plotPos = GetPlotPosition(pos); - if (plotPos.x == -1 || plotPos.y == -1) + if (plotPos.x == 999 || plotPos.y == 999) return -1; return plotPos.x + plotPos.y * 5; } @@ -227,8 +227,11 @@ public class InventoryManager : MonoBehaviour pos.y = 4; break; } - pos.x -= 2; - pos.y -= 3; + if(pos.x != 999 || pos.y != 999) + { + pos.x -= 2; + pos.y -= 3; + } return pos; } }