From 486af06da785fb21867fbb6050eda30600bdbeb4 Mon Sep 17 00:00:00 2001 From: Geri Date: Tue, 28 Feb 2023 21:17:21 +0100 Subject: [PATCH] Tiles --- Assets/Scripts/Managers/GameManager.cs | 2 +- .../Tiles/plataformaatravesable_0.asset | 36 ++++++++++ .../Tiles/plataformaatravesable_0.asset.meta | 8 +++ .../Tiles/plataformaatravesable_1.asset | 36 ++++++++++ .../Tiles/plataformaatravesable_1.asset.meta | 8 +++ .../Tiles/plataformaatravesable_2.asset | 36 ++++++++++ .../Tiles/plataformaatravesable_2.asset.meta | 8 +++ Assets/Tilesets/Tileset.prefab | 70 +++++++++++++++---- 8 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 Assets/Tilesets/Tiles/plataformaatravesable_0.asset create mode 100644 Assets/Tilesets/Tiles/plataformaatravesable_0.asset.meta create mode 100644 Assets/Tilesets/Tiles/plataformaatravesable_1.asset create mode 100644 Assets/Tilesets/Tiles/plataformaatravesable_1.asset.meta create mode 100644 Assets/Tilesets/Tiles/plataformaatravesable_2.asset create mode 100644 Assets/Tilesets/Tiles/plataformaatravesable_2.asset.meta diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index a1ba515..e1cac31 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -38,7 +38,7 @@ public class GameManager : MonoBehaviour { OrbTypes selected; Array values = Enum.GetValues(typeof(OrbTypes)); do { - selected = (OrbTypes)values.GetValue(Random.Range(0, values.Length)); + selected = (OrbTypes)values.GetValue(Random.Range(1, values.Length)); } while (selected == currentType || selected == _lastType); ChangeEventCall(selected); diff --git a/Assets/Tilesets/Tiles/plataformaatravesable_0.asset b/Assets/Tilesets/Tiles/plataformaatravesable_0.asset new file mode 100644 index 0000000..ed5dd2c --- /dev/null +++ b/Assets/Tilesets/Tiles/plataformaatravesable_0.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: plataformaatravesable_0 + m_EditorClassIdentifier: + m_Sprite: {fileID: 1314846579, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Tilesets/Tiles/plataformaatravesable_0.asset.meta b/Assets/Tilesets/Tiles/plataformaatravesable_0.asset.meta new file mode 100644 index 0000000..1562002 --- /dev/null +++ b/Assets/Tilesets/Tiles/plataformaatravesable_0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c935b8f8854ca7c41a9ef815f1bf5968 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tilesets/Tiles/plataformaatravesable_1.asset b/Assets/Tilesets/Tiles/plataformaatravesable_1.asset new file mode 100644 index 0000000..45f631e --- /dev/null +++ b/Assets/Tilesets/Tiles/plataformaatravesable_1.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: plataformaatravesable_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 245033472, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Tilesets/Tiles/plataformaatravesable_1.asset.meta b/Assets/Tilesets/Tiles/plataformaatravesable_1.asset.meta new file mode 100644 index 0000000..57d1978 --- /dev/null +++ b/Assets/Tilesets/Tiles/plataformaatravesable_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5235e3562188f19489a283bc38e0b872 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tilesets/Tiles/plataformaatravesable_2.asset b/Assets/Tilesets/Tiles/plataformaatravesable_2.asset new file mode 100644 index 0000000..6ac1c6f --- /dev/null +++ b/Assets/Tilesets/Tiles/plataformaatravesable_2.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: plataformaatravesable_2 + m_EditorClassIdentifier: + m_Sprite: {fileID: 1576286969, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Tilesets/Tiles/plataformaatravesable_2.asset.meta b/Assets/Tilesets/Tiles/plataformaatravesable_2.asset.meta new file mode 100644 index 0000000..2b0ace0 --- /dev/null +++ b/Assets/Tilesets/Tiles/plataformaatravesable_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9d10c4cef0551349848c20093b1077e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tilesets/Tileset.prefab b/Assets/Tilesets/Tileset.prefab index 0ecf40a..2eb05fb 100644 --- a/Assets/Tilesets/Tileset.prefab +++ b/Assets/Tilesets/Tileset.prefab @@ -46,7 +46,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 5 - m_TileSpriteIndex: 5 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -56,7 +56,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -66,7 +66,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -76,7 +76,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 2 - m_TileSpriteIndex: 2 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -86,7 +86,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 6 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 4 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -96,7 +96,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 4 - m_TileSpriteIndex: 4 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -106,7 +106,37 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 9 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 4 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 7 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -128,21 +158,33 @@ Tilemap: m_Data: {fileID: 11400000, guid: b1c834a1dbe507d4fa2ebf10517be3b2, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 555180d230ec42f41946fa10e07de03a, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: b9d10c4cef0551349848c20093b1077e, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 5235e3562188f19489a283bc38e0b872, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c935b8f8854ca7c41a9ef815f1bf5968, type: 2} m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: -966210798, guid: 249c6558812008e49a55f8cd21220ae9, type: 3} - m_RefCount: 1 m_Data: {fileID: 1518612283, guid: ddde1f187fc6ebc4cb74cf21cf0b5618, type: 3} - m_RefCount: 1 m_Data: {fileID: -207136144, guid: df027b9d09b195c4590d5e94902b10bf, type: 3} - m_RefCount: 1 m_Data: {fileID: -310465890, guid: fc51cb73344d7e7418454abb6f314657, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 1604744257, guid: 249c6558812008e49a55f8cd21220ae9, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 245033472, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3} - m_RefCount: 1 m_Data: {fileID: 710038559, guid: 249c6558812008e49a55f8cd21220ae9, type: 3} - m_RefCount: 1 - m_Data: {fileID: -966210798, guid: 249c6558812008e49a55f8cd21220ae9, type: 3} + m_Data: {fileID: 1604744257, guid: 249c6558812008e49a55f8cd21220ae9, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1576286969, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1314846579, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3} m_TileMatrixArray: - - m_RefCount: 7 + - m_RefCount: 10 m_Data: e00: 1 e01: 0 @@ -161,13 +203,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 7 + - m_RefCount: 10 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -1, y: -1, z: 0} - m_Size: {x: 6, y: 3, z: 1} + m_Size: {x: 6, y: 5, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -281,7 +323,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &9123492006712132977 +--- !u!114 &2484325569956085598 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0}