diff --git a/Art/Blocks.psd b/Art/Blocks.psd new file mode 100644 index 0000000..21f8a6e Binary files /dev/null and b/Art/Blocks.psd differ diff --git a/Art/Border.psd b/Art/Border.psd new file mode 100644 index 0000000..144b30f Binary files /dev/null and b/Art/Border.psd differ diff --git a/Assets/Sprites/Blue.png b/Assets/Sprites/Blue.png index 453c03f..83f1ddc 100644 Binary files a/Assets/Sprites/Blue.png and b/Assets/Sprites/Blue.png differ diff --git a/Assets/Sprites/Border.png b/Assets/Sprites/Border.png new file mode 100644 index 0000000..5a78af1 Binary files /dev/null and b/Assets/Sprites/Border.png differ diff --git a/Assets/Sprites/Border.png.meta b/Assets/Sprites/Border.png.meta new file mode 100644 index 0000000..72ba1bb --- /dev/null +++ b/Assets/Sprites/Border.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: dcd88b8f2120d9c4f8d1d9826b673819 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 192 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Cyan.png b/Assets/Sprites/Cyan.png index f404c0d..55e5354 100644 Binary files a/Assets/Sprites/Cyan.png and b/Assets/Sprites/Cyan.png differ diff --git a/Assets/Sprites/Ghost.png b/Assets/Sprites/Ghost.png new file mode 100644 index 0000000..dd5943d Binary files /dev/null and b/Assets/Sprites/Ghost.png differ diff --git a/Assets/Sprites/Gray.png.meta b/Assets/Sprites/Ghost.png.meta similarity index 98% rename from Assets/Sprites/Gray.png.meta rename to Assets/Sprites/Ghost.png.meta index 623043c..d3fc3b1 100644 --- a/Assets/Sprites/Gray.png.meta +++ b/Assets/Sprites/Ghost.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 201aebd630f12cf41bd9524548e38803 +guid: de0f4de3209ba2c42874afb3c5329c15 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Sprites/Gray.png b/Assets/Sprites/Gray.png deleted file mode 100644 index 8c5058a..0000000 Binary files a/Assets/Sprites/Gray.png and /dev/null differ diff --git a/Assets/Sprites/Green.png b/Assets/Sprites/Green.png index 00a7405..3c01d40 100644 Binary files a/Assets/Sprites/Green.png and b/Assets/Sprites/Green.png differ diff --git a/Assets/Sprites/Grid.png b/Assets/Sprites/Grid.png new file mode 100644 index 0000000..c45cb7f Binary files /dev/null and b/Assets/Sprites/Grid.png differ diff --git a/Assets/Sprites/Grid.png.meta b/Assets/Sprites/Grid.png.meta new file mode 100644 index 0000000..d94a67b --- /dev/null +++ b/Assets/Sprites/Grid.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 6ff6b85966aeb3f4ab304af07f4dd424 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 192 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Orange.png b/Assets/Sprites/Orange.png index 5e8302e..3082995 100644 Binary files a/Assets/Sprites/Orange.png and b/Assets/Sprites/Orange.png differ diff --git a/Assets/Sprites/Purple.png b/Assets/Sprites/Purple.png index b5d2eea..59db053 100644 Binary files a/Assets/Sprites/Purple.png and b/Assets/Sprites/Purple.png differ diff --git a/Assets/Sprites/Red.png b/Assets/Sprites/Red.png index 018713c..88399e4 100644 Binary files a/Assets/Sprites/Red.png and b/Assets/Sprites/Red.png differ diff --git a/Assets/Sprites/Yellow.png b/Assets/Sprites/Yellow.png index c1e6ee8..f0eb992 100644 Binary files a/Assets/Sprites/Yellow.png and b/Assets/Sprites/Yellow.png differ diff --git a/Assets/Tiles/Blocks.prefab b/Assets/Tiles/Blocks.prefab index 7d609b1..2cbc6ec 100644 --- a/Assets/Tiles/Blocks.prefab +++ b/Assets/Tiles/Blocks.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4442038887208273871 +--- !u!1 &5506218118612893584 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,8 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4198507236585720799} - - component: {fileID: 5835910971353386228} + - component: {fileID: 6169148418393543136} + - component: {fileID: 1249045004527993685} m_Layer: 31 m_Name: Blocks m_TagString: Untagged @@ -17,34 +17,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4198507236585720799 +--- !u!4 &6169148418393543136 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4442038887208273871} + m_GameObject: {fileID: 5506218118612893584} 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: 7588981626310639142} + - {fileID: 4919126790882711734} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!156049354 &5835910971353386228 +--- !u!156049354 &1249045004527993685 Grid: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4442038887208273871} + m_GameObject: {fileID: 5506218118612893584} m_Enabled: 1 m_CellSize: {x: 1, y: 1, z: 0} m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!1 &6795079444853065573 +--- !u!1 &7476385142761944101 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -52,9 +52,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7588981626310639142} - - component: {fileID: 181651932633356770} - - component: {fileID: 556346316875449304} + - component: {fileID: 4919126790882711734} + - component: {fileID: 226224497391443430} + - component: {fileID: 3701275862944092796} m_Layer: 0 m_Name: Layer1 m_TagString: Untagged @@ -62,27 +62,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7588981626310639142 +--- !u!4 &4919126790882711734 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6795079444853065573} + m_GameObject: {fileID: 7476385142761944101} 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: 4198507236585720799} + m_Father: {fileID: 6169148418393543136} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1839735485 &181651932633356770 +--- !u!1839735485 &226224497391443430 Tilemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6795079444853065573} + m_GameObject: {fileID: 7476385142761944101} m_Enabled: 1 m_Tiles: - first: {x: -1, y: -2, z: 0} @@ -172,7 +172,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: aa44b5216a5f39e4881c5323564afe81, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 9e2688d592617d44ea74683c8f61accf, type: 2} + m_Data: {fileID: 11400000, guid: a10927dec698b7c49b1375f89e8db4d2, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: ae5c5dcd9d2744248ba2beb6b8dab80f, type: 2} - m_RefCount: 1 @@ -189,7 +189,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 21300000, guid: 774fa586ba243f54f92bce708ecb917b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 201aebd630f12cf41bd9524548e38803, type: 3} + m_Data: {fileID: 21300000, guid: de0f4de3209ba2c42874afb3c5329c15, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: 3e2fc5b3b3411a94d990b263cc821a0a, type: 3} - m_RefCount: 1 @@ -246,13 +246,13 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!483693784 &556346316875449304 +--- !u!483693784 &3701275862944092796 TilemapRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6795079444853065573} + m_GameObject: {fileID: 7476385142761944101} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -294,7 +294,7 @@ TilemapRenderer: m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &8295858695920005497 +--- !u!114 &7722594749468874435 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Tiles/Blocks.prefab.meta b/Assets/Tiles/Blocks.prefab.meta index 5cc6956..244469b 100644 --- a/Assets/Tiles/Blocks.prefab.meta +++ b/Assets/Tiles/Blocks.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec4ace931cfd6484aa9120cd4eeb0705 +guid: 9c930264a44982948b8933c439c72393 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Tiles/Gray.asset b/Assets/Tiles/Gray.asset deleted file mode 100644 index bceaf3c..0000000 --- a/Assets/Tiles/Gray.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: Gray - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: 201aebd630f12cf41bd9524548e38803, 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/Tiles/Gray.asset.meta b/Assets/Tiles/Gray.asset.meta deleted file mode 100644 index 4efeb70..0000000 --- a/Assets/Tiles/Gray.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e2688d592617d44ea74683c8f61accf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: