diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 3743c75..82b539c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -561,7 +561,7 @@ TilemapRenderer: m_SortingLayer: 2 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.019230783, y: 0.0153846145, z: 0} + m_ChunkCullingBounds: {x: 0.038461566, y: 0.0153846145, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 @@ -2862,7 +2862,7 @@ GameObject: - component: {fileID: 411449915} - component: {fileID: 411449916} m_Layer: 0 - m_Name: Sprite + m_Name: Visual m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2924,7 +2924,7 @@ SpriteRenderer: m_SortingLayerID: -133646357 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0ad2983bed21bb049b065cbc6efc57e8, type: 3} + m_Sprite: {fileID: 2032460506, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -3458,6 +3458,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b3ead8e41e973dd43b93a8638ea30a36, type: 3} m_Name: m_EditorClassIdentifier: + _openDoor: {fileID: -1152093481, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} --- !u!61 &679297303 BoxCollider2D: m_ObjectHideFlags: 0 @@ -4521,7 +4522,7 @@ TilemapRenderer: m_SortingLayer: 2 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.019230783, y: 0.007692337, z: 0} + m_ChunkCullingBounds: {x: 0.0153846145, y: 0.007692337, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 @@ -5054,7 +5055,7 @@ TilemapRenderer: m_SortingLayer: 2 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.019230783, y: 0.0038461685, z: 0} + m_ChunkCullingBounds: {x: 0.019230783, y: 0, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 diff --git a/Assets/Scripts/Door.cs b/Assets/Scripts/MapElements/Door.cs similarity index 67% rename from Assets/Scripts/Door.cs rename to Assets/Scripts/MapElements/Door.cs index 9513981..5099431 100644 --- a/Assets/Scripts/Door.cs +++ b/Assets/Scripts/MapElements/Door.cs @@ -3,10 +3,14 @@ using UnityEngine; public class Door : MonoBehaviour,IDoor { + [SerializeField] + private Sprite _openDoor; + + public void OpenDoor() { //PlayOpenAnimation - + GetComponentInChildren().sprite= _openDoor; //Disable box collider gameObject.GetComponent().enabled=false; } diff --git a/Assets/Scripts/Door.cs.meta b/Assets/Scripts/MapElements/Door.cs.meta similarity index 100% rename from Assets/Scripts/Door.cs.meta rename to Assets/Scripts/MapElements/Door.cs.meta diff --git a/Assets/Sprites/Tileset.png b/Assets/Sprites/Tileset.png index f5e4c6b..98dd478 100644 Binary files a/Assets/Sprites/Tileset.png and b/Assets/Sprites/Tileset.png differ diff --git a/Assets/Sprites/Tileset.png.meta b/Assets/Sprites/Tileset.png.meta index 2aa6551..bddb14a 100644 --- a/Assets/Sprites/Tileset.png.meta +++ b/Assets/Sprites/Tileset.png.meta @@ -110,12 +110,12 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: Tileset_0 + name: StoneWithDirt rect: serializedVersion: 2 - x: 91 - y: 175 - width: 135 + x: 7 + y: 248 + width: 140 height: 133 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -131,12 +131,12 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_1 + name: Ladder rect: serializedVersion: 2 - x: 230 - y: 176 - width: 135 + x: 163 + y: 248 + width: 134 height: 132 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -152,13 +152,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_2 + name: Bridge rect: serializedVersion: 2 - x: 371 - y: 177 + x: 310 + y: 350 width: 135 - height: 131 + height: 23 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -173,11 +173,11 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_3 + name: Chest rect: serializedVersion: 2 - x: 519 - y: 176 + x: 457 + y: 302 width: 105 height: 68 alignment: 0 @@ -194,11 +194,11 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_4 + name: OpenChest rect: serializedVersion: 2 - x: 633 - y: 176 + x: 571 + y: 302 width: 102 height: 72 alignment: 0 @@ -215,11 +215,11 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_5 + name: Stone rect: serializedVersion: 2 - x: 91 - y: 35 + x: 7 + y: 108 width: 135 height: 134 alignment: 0 @@ -236,13 +236,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_6 + name: Breakable rect: serializedVersion: 2 - x: 242 - y: 32 - width: 133 - height: 131 + x: 170 + y: 104 + width: 135 + height: 133 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -257,15 +257,15 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: Tileset_7 + name: DoorClosed rect: serializedVersion: 2 - x: 425 - y: 113 - width: 40 - height: 32 + x: 315 + y: 106 + width: 133 + height: 131 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -277,6 +277,27 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: DoorOpen + rect: + serializedVersion: 2 + x: 462 + y: 106 + width: 133 + height: 131 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f84bf45c4e72f0e469f1871ee52dab15 + internalID: -1152093481 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -288,14 +309,15 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - Tileset_0: 1045964120 - Tileset_1: -974747892 - Tileset_2: 606517438 - Tileset_3: -277072053 - Tileset_4: 362627935 - Tileset_5: 221868806 - Tileset_6: -1109035998 - Tileset_7: 2032460506 + Breakable: -1109035998 + Bridge: 606517438 + Chest: -277072053 + DoorClosed: 2032460506 + DoorOpen: -1152093481 + Ladder: -974747892 + OpenChest: 362627935 + Stone: 221868806 + StoneWithDirt: 1045964120 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Sprites/water.png b/Assets/Sprites/water.png index 7facfc8..4a71b32 100644 Binary files a/Assets/Sprites/water.png and b/Assets/Sprites/water.png differ diff --git a/Assets/Sprites/wooden-ladder.asset b/Assets/Sprites/wooden-ladder.asset deleted file mode 100644 index 3135550..0000000 --- a/Assets/Sprites/wooden-ladder.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: wooden-ladder - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: 89ef4f64706367d498e9e80cd9d2819b, 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/Sprites/wooden-ladder.asset.meta b/Assets/Sprites/wooden-ladder.asset.meta deleted file mode 100644 index d00a102..0000000 --- a/Assets/Sprites/wooden-ladder.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 54907339171673047ba183db663902df -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/wooden-ladder.png b/Assets/Sprites/wooden-ladder.png deleted file mode 100644 index bbff34b..0000000 Binary files a/Assets/Sprites/wooden-ladder.png and /dev/null differ diff --git a/Assets/Sprites/wooden-ladder.png.meta b/Assets/Sprites/wooden-ladder.png.meta deleted file mode 100644 index a0ed775..0000000 --- a/Assets/Sprites/wooden-ladder.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 89ef4f64706367d498e9e80cd9d2819b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - 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: 1000 - 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: