diff --git a/.gitignore b/.gitignore index 1b03b79..5ce9cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 +.*DS_Store + # User-specific stuff .idea .idea/**/workspace.xml diff --git a/Assets/Tile.meta b/Assets/DevMocks.meta similarity index 77% rename from Assets/Tile.meta rename to Assets/DevMocks.meta index e96c1be..70e5188 100644 --- a/Assets/Tile.meta +++ b/Assets/DevMocks.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66f467ab5afc0a24493aced70797c5e1 +guid: dab5da68831f44f63b7b6ba9f49a4d17 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Sprites/CogBullet.png b/Assets/DevMocks/CogBullet.png similarity index 100% rename from Assets/Sprites/CogBullet.png rename to Assets/DevMocks/CogBullet.png diff --git a/Assets/Sprites/CogBullet.png.meta b/Assets/DevMocks/CogBullet.png.meta similarity index 100% rename from Assets/Sprites/CogBullet.png.meta rename to Assets/DevMocks/CogBullet.png.meta diff --git a/Assets/Sprites/ParticleSpriteAtlas.png b/Assets/DevMocks/ParticleSpriteAtlas.png similarity index 100% rename from Assets/Sprites/ParticleSpriteAtlas.png rename to Assets/DevMocks/ParticleSpriteAtlas.png diff --git a/Assets/Sprites/ParticleSpriteAtlas.png.meta b/Assets/DevMocks/ParticleSpriteAtlas.png.meta similarity index 100% rename from Assets/Sprites/ParticleSpriteAtlas.png.meta rename to Assets/DevMocks/ParticleSpriteAtlas.png.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f89e7a5..9f883f9 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -8156,7 +8156,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.029009, y: -4.0430503, z: -2.7893844} + m_LocalPosition: {x: 10.241558, y: -4.0430503, z: -2.7893844} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -8242,7 +8242,6 @@ MonoBehaviour: type: 3} destructibleWallPrefab: {fileID: 4177940729222266681, guid: da559e681f8d34d58bb5f3457045664a, type: 3} - enemyPrefabs: [] boardHolder: {fileID: 585332173} --- !u!4 &840487112 Transform: @@ -8356,6 +8355,8 @@ MonoBehaviour: m_EditorClassIdentifier: movementSpeed: 4 respawnPosition: {fileID: 185746015} + bombPrefab: {fileID: 5909392949477884267, guid: 28467e0d65b5d3844bf1862ac0c49ad9, + type: 3} --- !u!212 &1352658976 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Tile/FloorBricksToGrassCorner.png b/Assets/Tile/FloorBricksToGrassCorner.png deleted file mode 100644 index baccfdb..0000000 Binary files a/Assets/Tile/FloorBricksToGrassCorner.png and /dev/null differ diff --git a/Assets/Tile/FloorBricksToGrassCorner.png.meta b/Assets/Tile/FloorBricksToGrassCorner.png.meta deleted file mode 100644 index 0302d35..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner.png.meta +++ /dev/null @@ -1,288 +0,0 @@ -fileFormatVersion: 2 -guid: 47f80eda1cc4dc44cad33a12f3bf9bc6 -TextureImporter: - fileIDToRecycleName: - 21300000: FloorBricksToGrassCorner_0 - 21300002: FloorBricksToGrassCorner_1 - 21300004: FloorBricksToGrassCorner_2 - 21300006: FloorBricksToGrassCorner_3 - 21300008: FloorBricksToGrassCorner_4 - 21300010: FloorBricksToGrassCorner_5 - 21300012: FloorBricksToGrassCorner_6 - 21300014: FloorBricksToGrassCorner_7 - 21300016: FloorBricksToGrassCorner_8 - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 64 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: FloorBricksToGrassCorner_0 - rect: - serializedVersion: 2 - x: 0 - y: 128 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 53dd4c3e990cbbf4b89a3b0f28803d67 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_1 - rect: - serializedVersion: 2 - x: 64 - y: 128 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e4ebfd1a84647b14db379baacef145fd - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_2 - rect: - serializedVersion: 2 - x: 128 - y: 128 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 0ead5f09189ca2e4484186e14b1af864 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_3 - rect: - serializedVersion: 2 - x: 0 - y: 64 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 63ce003eb6b81414094e8f1a43fc14c2 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_4 - rect: - serializedVersion: 2 - x: 64 - y: 64 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2056101334a0afc4ab577af9886b053e - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_5 - rect: - serializedVersion: 2 - x: 128 - y: 64 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: fb6121b18cc55bf45b4b20994ae5a5de - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_6 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 66c4ccfe880524f4097d5fbc48f50c4c - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_7 - rect: - serializedVersion: 2 - x: 64 - y: 0 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f5110be438ceab84983f85f271e97afe - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: FloorBricksToGrassCorner_8 - rect: - serializedVersion: 2 - x: 128 - y: 0 - width: 64 - height: 64 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: d4f932727738a364881c17f41fb868d3 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 9b65ee805dbf70045a450e9509b08cb4 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_0.asset b/Assets/Tile/FloorBricksToGrassCorner_0.asset deleted file mode 100644 index d06a4ad..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_0.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_0 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_0.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_0.asset.meta deleted file mode 100644 index 7e150a3..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_0.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb0995c5401aee7479089b4db7bf35a5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_1.asset b/Assets/Tile/FloorBricksToGrassCorner_1.asset deleted file mode 100644 index edc21e8..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_1.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_1 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300002, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_1.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_1.asset.meta deleted file mode 100644 index 10b29fb..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_1.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d0c96404f7d5c5849b26a42efe4057f6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_2.asset b/Assets/Tile/FloorBricksToGrassCorner_2.asset deleted file mode 100644 index bdf1842..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_2.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_2 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300004, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_2.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_2.asset.meta deleted file mode 100644 index f94e9b4..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_2.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eb7a551456b0fbc4eaa9fe52b2f0dc84 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_3.asset b/Assets/Tile/FloorBricksToGrassCorner_3.asset deleted file mode 100644 index f52b141..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_3.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_3 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300006, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_3.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_3.asset.meta deleted file mode 100644 index 3fce5d6..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_3.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bd179c4d7a6ff9845a1e99bb0bd07ad0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_4.asset b/Assets/Tile/FloorBricksToGrassCorner_4.asset deleted file mode 100644 index 4aff76a..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_4.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_4 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300008, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_4.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_4.asset.meta deleted file mode 100644 index df1c07f..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_4.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09bf0f8052d70414f98ec11bd0af2742 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_5.asset b/Assets/Tile/FloorBricksToGrassCorner_5.asset deleted file mode 100644 index 51a476c..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_5.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_5 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300010, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_5.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_5.asset.meta deleted file mode 100644 index 7e953e1..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_5.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f403570f65953eb488ec723e5f7b1759 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_6.asset b/Assets/Tile/FloorBricksToGrassCorner_6.asset deleted file mode 100644 index d73eba4..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_6.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_6 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300012, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_6.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_6.asset.meta deleted file mode 100644 index fb2a892..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_6.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b1237e6934259e44ea8fe3469fdfa732 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_7.asset b/Assets/Tile/FloorBricksToGrassCorner_7.asset deleted file mode 100644 index 5cd5bb3..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_7.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_7 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300014, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_7.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_7.asset.meta deleted file mode 100644 index d8f5e71..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_7.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ba6c8dcbc6dfd94a9c21dc25be5e9ec -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/FloorBricksToGrassCorner_8.asset b/Assets/Tile/FloorBricksToGrassCorner_8.asset deleted file mode 100644 index 9f5d48b..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_8.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: FloorBricksToGrassCorner_8 - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300016, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/FloorBricksToGrassCorner_8.asset.meta b/Assets/Tile/FloorBricksToGrassCorner_8.asset.meta deleted file mode 100644 index a2e05f3..0000000 --- a/Assets/Tile/FloorBricksToGrassCorner_8.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2745a558052ff65489989f58d080477c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/New Palette.prefab b/Assets/Tile/New Palette.prefab deleted file mode 100644 index 4d7733b..0000000 --- a/Assets/Tile/New Palette.prefab +++ /dev/null @@ -1,321 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2935519345230158114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8819624665482511580} - - component: {fileID: 7375849463781081058} - m_Layer: 31 - m_Name: New Palette - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8819624665482511580 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2935519345230158114} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1120308526272650903} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!156049354 &7375849463781081058 -Grid: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2935519345230158114} - m_Enabled: 1 - m_CellSize: {x: 0.64, y: 0.64, z: 0} - m_CellGap: {x: 0, y: 0, z: 0} - m_CellLayout: 0 - m_CellSwizzle: 0 ---- !u!1 &8291461206512007059 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1120308526272650903} - - component: {fileID: 4159495970414477255} - - component: {fileID: 9209542592885117305} - m_Layer: 31 - m_Name: Layer1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1120308526272650903 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8291461206512007059} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8819624665482511580} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1839735485 &4159495970414477255 -Tilemap: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8291461206512007059} - m_Enabled: 1 - m_Tiles: - - first: {x: -2, y: -2, z: 0} - second: - m_TileIndex: 6 - m_TileSpriteIndex: 6 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: -1, y: -2, z: 0} - second: - m_TileIndex: 7 - m_TileSpriteIndex: 7 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: 0, y: -2, z: 0} - second: - m_TileIndex: 8 - m_TileSpriteIndex: 8 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: -4, y: -1, z: 0} - second: - m_TileIndex: 9 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: -2, y: -1, z: 0} - second: - m_TileIndex: 3 - m_TileSpriteIndex: 3 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: -1, y: -1, z: 0} - second: - m_TileIndex: 4 - m_TileSpriteIndex: 4 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: 0, y: -1, z: 0} - second: - m_TileIndex: 5 - m_TileSpriteIndex: 5 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: -2, y: 0, z: 0} - second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: -1, y: 0, z: 0} - second: - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - - first: {x: 0, y: 0, z: 0} - second: - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - m_AnimatedTiles: {} - m_TileAssetArray: - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: bb0995c5401aee7479089b4db7bf35a5, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: d0c96404f7d5c5849b26a42efe4057f6, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: eb7a551456b0fbc4eaa9fe52b2f0dc84, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: bd179c4d7a6ff9845a1e99bb0bd07ad0, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 09bf0f8052d70414f98ec11bd0af2742, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: f403570f65953eb488ec723e5f7b1759, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: b1237e6934259e44ea8fe3469fdfa732, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 7ba6c8dcbc6dfd94a9c21dc25be5e9ec, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 2745a558052ff65489989f58d080477c, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 7ddf520c517789942b5844a6f3178f5c, type: 2} - m_TileSpriteArray: - - m_RefCount: 2 - m_Data: {fileID: 21300000, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300002, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300004, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300006, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300008, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300010, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300012, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300014, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300016, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, type: 3} - m_TileMatrixArray: - - m_RefCount: 10 - m_Data: - 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_TileColorArray: - - m_RefCount: 10 - m_Data: {r: 1, g: 1, b: 1, a: 1} - m_AnimationFrameRate: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -4, y: -2, z: 0} - m_Size: {x: 5, y: 3, z: 1} - m_TileAnchor: {x: 0.5, y: 0.5, z: 0} - m_TileOrientation: 0 - m_TileOrientationMatrix: - 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 ---- !u!483693784 &9209542592885117305 -TilemapRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8291461206512007059} - m_Enabled: 0 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} - m_MaxChunkCount: 16 - m_MaxFrameAge: 16 - m_SortOrder: 0 - m_Mode: 0 - m_DetectChunkCullingBounds: 0 - m_MaskInteraction: 0 ---- !u!114 &114041517991379256 -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: 12395, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Palette Settings - m_EditorClassIdentifier: - cellSizing: 0 diff --git a/Assets/Tile/New Palette.prefab.meta b/Assets/Tile/New Palette.prefab.meta deleted file mode 100644 index 03ba43c..0000000 --- a/Assets/Tile/New Palette.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6168329b878814a43aaff06aa1c7e89a -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tile/TestTile.asset b/Assets/Tile/TestTile.asset deleted file mode 100644 index 6df37a0..0000000 --- a/Assets/Tile/TestTile.asset +++ /dev/null @@ -1,36 +0,0 @@ -%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: TestTile - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: 47f80eda1cc4dc44cad33a12f3bf9bc6, 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/Tile/TestTile.asset.meta b/Assets/Tile/TestTile.asset.meta deleted file mode 100644 index e58a5a6..0000000 --- a/Assets/Tile/TestTile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ddf520c517789942b5844a6f3178f5c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8faef1b..a774d0b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Explosion layers: - Default - TransparentFX