Commit 66c2270c authored by 18손재민's avatar 18손재민

Merge remote-tracking branch 'origin/prefab'

parents 1e3251a5 a82f883c
fileFormatVersion: 2
guid: f6be48c48b8c41848a89d377655ce077
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
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: 1
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8004499dfa9e61e4492dd522039768ab
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 867564e82d17ab64aa290dcdabb75e2e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
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: 1
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: fca886ca671d42a429f0c89bea0b404a
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 003bac19693f6f349a3c18926837f4cd
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
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: 1
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 88569d2ab5abef444992edddcf8a9652
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 68f90a17fff8572478bdc5acba7d0b0f
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
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: 1
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d0e30049721865b4b9d4ff53f754e8a3
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3b089fc30284eec4bbccfa169a483407
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
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: 1
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6636392e00c541941b8ef299fddd91df
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
...@@ -180,6 +180,15 @@ Tilemap: ...@@ -180,6 +180,15 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 1, y: -7, z: 0}
second:
m_TileIndex: 41
m_TileSpriteIndex: 41
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -3, y: -6, z: 0} - first: {x: -3, y: -6, z: 0}
second: second:
m_TileIndex: 37 m_TileIndex: 37
...@@ -288,6 +297,15 @@ Tilemap: ...@@ -288,6 +297,15 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 1, y: -5, z: 0}
second:
m_TileIndex: 42
m_TileSpriteIndex: 42
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -3, y: -4, z: 0} - first: {x: -3, y: -4, z: 0}
second: second:
m_TileIndex: 20 m_TileIndex: 20
...@@ -597,6 +615,10 @@ Tilemap: ...@@ -597,6 +615,10 @@ Tilemap:
m_Data: {fileID: 11400000, guid: fed924c0de37ea54d9cf7f8c1b023415, type: 2} m_Data: {fileID: 11400000, guid: fed924c0de37ea54d9cf7f8c1b023415, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: f2e0d651aceb3794684dc5054419e5ac, type: 2} m_Data: {fileID: 11400000, guid: f2e0d651aceb3794684dc5054419e5ac, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 4fb31c87ddf259948b8873bc66601f9d, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 38e0da454028d824eb49f43f987ad562, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: b802dd074becb7c45a3998ccae90ce91, type: 3} m_Data: {fileID: 21300000, guid: b802dd074becb7c45a3998ccae90ce91, type: 3}
...@@ -680,8 +702,12 @@ Tilemap: ...@@ -680,8 +702,12 @@ Tilemap:
m_Data: {fileID: 21300000, guid: 98bd0bc10c5388649a0085354d0cb1b0, type: 3} m_Data: {fileID: 21300000, guid: 98bd0bc10c5388649a0085354d0cb1b0, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 64f45b3b330f57140ab57c33347a44ed, type: 3} m_Data: {fileID: 21300000, guid: 64f45b3b330f57140ab57c33347a44ed, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: f6be48c48b8c41848a89d377655ce077, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 867564e82d17ab64aa290dcdabb75e2e, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 41 - m_RefCount: 43
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
...@@ -700,7 +726,7 @@ Tilemap: ...@@ -700,7 +726,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 41 - m_RefCount: 43
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
......
...@@ -144,6 +144,24 @@ Tilemap: ...@@ -144,6 +144,24 @@ Tilemap:
m_GameObject: {fileID: 1834918008511144} m_GameObject: {fileID: 1834918008511144}
m_Enabled: 1 m_Enabled: 1
m_Tiles: m_Tiles:
- first: {x: -1, y: -4, z: 0}
second:
m_TileIndex: 41
m_TileSpriteIndex: 41
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 0, y: -4, z: 0}
second:
m_TileIndex: 42
m_TileSpriteIndex: 42
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -1, y: -3, z: 0} - first: {x: -1, y: -3, z: 0}
second: second:
m_TileIndex: 35 m_TileIndex: 35
...@@ -597,6 +615,10 @@ Tilemap: ...@@ -597,6 +615,10 @@ Tilemap:
m_Data: {fileID: 11400000, guid: e86502c95a7831241aced30d4a3a82f2, type: 2} m_Data: {fileID: 11400000, guid: e86502c95a7831241aced30d4a3a82f2, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 1872608f0bf4efb44b36692b5e975fe1, type: 2} m_Data: {fileID: 11400000, guid: 1872608f0bf4efb44b36692b5e975fe1, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 4b7c85e4ddcad124e8dcb69e856229ce, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 985d2d01d390234479b19ba82d087c9a, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 906fe86b94aac634e8ad9883dc1e6357, type: 3} m_Data: {fileID: 21300000, guid: 906fe86b94aac634e8ad9883dc1e6357, type: 3}
...@@ -680,8 +702,12 @@ Tilemap: ...@@ -680,8 +702,12 @@ Tilemap:
m_Data: {fileID: 21300000, guid: 93d3774ff0b3fb44db37ec3b84f47e70, type: 3} m_Data: {fileID: 21300000, guid: 93d3774ff0b3fb44db37ec3b84f47e70, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 7a1212c87a705f14abcd7caa74080387, type: 3} m_Data: {fileID: 21300000, guid: 7a1212c87a705f14abcd7caa74080387, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 68f90a17fff8572478bdc5acba7d0b0f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 003bac19693f6f349a3c18926837f4cd, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 41 - m_RefCount: 43
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
...@@ -700,12 +726,12 @@ Tilemap: ...@@ -700,12 +726,12 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 41 - m_RefCount: 43
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -1, y: -3, z: 0} m_Origin: {x: -1, y: -4, z: 0}
m_Size: {x: 7, y: 6, z: 1} m_Size: {x: 7, y: 7, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0 m_TileOrientation: 0
m_TileOrientationMatrix: m_TileOrientationMatrix:
......
...@@ -198,6 +198,15 @@ Tilemap: ...@@ -198,6 +198,15 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 4, y: -5, z: 0}
second:
m_TileIndex: 48
m_TileSpriteIndex: 48
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -2, y: -4, z: 0} - first: {x: -2, y: -4, z: 0}
second: second:
m_TileIndex: 35 m_TileIndex: 35
...@@ -674,6 +683,8 @@ Tilemap: ...@@ -674,6 +683,8 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 43795a1cfbb56d747bfb7b9f48d840dd, type: 2} m_Data: {fileID: 11400000, guid: 43795a1cfbb56d747bfb7b9f48d840dd, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 665befd42b770554a94ca09398c476e4, type: 2} m_Data: {fileID: 11400000, guid: 665befd42b770554a94ca09398c476e4, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 11005e6e7c04a3f429b4364af2397029, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 73871840e639e794380fc818b52efc65, type: 3} m_Data: {fileID: 21300000, guid: 73871840e639e794380fc818b52efc65, type: 3}
...@@ -771,8 +782,10 @@ Tilemap: ...@@ -771,8 +782,10 @@ Tilemap:
m_Data: {fileID: 21300000, guid: 0ca2a32fcc23e5b498f2951bc79c7605, type: 3} m_Data: {fileID: 21300000, guid: 0ca2a32fcc23e5b498f2951bc79c7605, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 8af9865fea502be42b8428b3c9c67187, type: 3} m_Data: {fileID: 21300000, guid: 8af9865fea502be42b8428b3c9c67187, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 3b089fc30284eec4bbccfa169a483407, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 48 - m_RefCount: 49
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
...@@ -791,7 +804,7 @@ Tilemap: ...@@ -791,7 +804,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 48 - m_RefCount: 49
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
......
...@@ -744,14 +744,6 @@ CompositeCollider2D: ...@@ -744,14 +744,6 @@ CompositeCollider2D:
Y: 190000000 Y: 190000000
- X: 10000000 - X: 10000000
Y: 190000000 Y: 190000000
- - X: 130000000
Y: 210039056
- X: 110000000
Y: 210039056
- X: 110000000
Y: 205351568
- X: 130000000
Y: 205351568
- - X: 180000000 - - X: 180000000
Y: 180000000 Y: 180000000
- X: 60000000 - X: 60000000
...@@ -878,10 +870,6 @@ CompositeCollider2D: ...@@ -878,10 +870,6 @@ CompositeCollider2D:
- {x: 0, y: 24} - {x: 0, y: 24}
- {x: 0, y: 19} - {x: 0, y: 19}
- {x: 1, y: 19} - {x: 1, y: 19}
- - {x: 13, y: 21.003906}
- {x: 11, y: 21.003906}
- {x: 11, y: 20.535156}
- {x: 13, y: 20.535156}
- - {x: 18, y: 18} - - {x: 18, y: 18}
- {x: 6, y: 18} - {x: 6, y: 18}
- {x: 6, y: 17} - {x: 6, y: 17}
...@@ -2786,24 +2774,6 @@ Tilemap: ...@@ -2786,24 +2774,6 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 11, y: 20, 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: 12, y: 20, z: 0}
second:
m_TileIndex: 15
m_TileSpriteIndex: 15
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 23, y: 20, z: 0} - first: {x: 23, y: 20, z: 0}
second: second:
m_TileIndex: 16 m_TileIndex: 16
...@@ -3051,8 +3021,8 @@ Tilemap: ...@@ -3051,8 +3021,8 @@ Tilemap:
m_TileAssetArray: m_TileAssetArray:
- m_RefCount: 3 - m_RefCount: 3
m_Data: {fileID: 11400000, guid: dc3200317ac5d9c45b4116ad7975f166, type: 2} m_Data: {fileID: 11400000, guid: dc3200317ac5d9c45b4116ad7975f166, type: 2}
- m_RefCount: 1 - m_RefCount: 0
m_Data: {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2} m_Data: {fileID: 0}
- m_RefCount: 20 - m_RefCount: 20
m_Data: {fileID: 11400000, guid: 87f27825f48c3394ea02d8bd4a5c646a, type: 2} m_Data: {fileID: 11400000, guid: 87f27825f48c3394ea02d8bd4a5c646a, type: 2}
- m_RefCount: 3 - m_RefCount: 3
...@@ -3079,15 +3049,15 @@ Tilemap: ...@@ -3079,15 +3049,15 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 422af6123b96a56498ff5186bd9e5eb3, type: 2} m_Data: {fileID: 11400000, guid: 422af6123b96a56498ff5186bd9e5eb3, type: 2}
- m_RefCount: 10 - m_RefCount: 10
m_Data: {fileID: 11400000, guid: d4a019c0fb2fc824292e8d51566a3352, type: 2} m_Data: {fileID: 11400000, guid: d4a019c0fb2fc824292e8d51566a3352, type: 2}
- m_RefCount: 1 - m_RefCount: 0
m_Data: {fileID: 11400000, guid: 9e0a3a715e976bb489ec8bedeeb2ab32, type: 2} m_Data: {fileID: 0}
- m_RefCount: 76 - m_RefCount: 76
m_Data: {fileID: 11400000, guid: b020cda901d4db14ca4935cd00d3243b, type: 2} m_Data: {fileID: 11400000, guid: b020cda901d4db14ca4935cd00d3243b, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 3 - m_RefCount: 3
m_Data: {fileID: 21300000, guid: 803035f7f3c2ec24b9951147a4f7fc4d, type: 3} m_Data: {fileID: 21300000, guid: 803035f7f3c2ec24b9951147a4f7fc4d, type: 3}
- m_RefCount: 1 - m_RefCount: 0
m_Data: {fileID: 21300000, guid: 35acb4a1959d8114092813b66a3b25de, type: 3} m_Data: {fileID: 0}
- m_RefCount: 20 - m_RefCount: 20
m_Data: {fileID: 21300000, guid: b802dd074becb7c45a3998ccae90ce91, type: 3} m_Data: {fileID: 21300000, guid: b802dd074becb7c45a3998ccae90ce91, type: 3}
- m_RefCount: 3 - m_RefCount: 3
...@@ -3114,12 +3084,12 @@ Tilemap: ...@@ -3114,12 +3084,12 @@ Tilemap:
m_Data: {fileID: 21300000, guid: 3aa0616396041d2469c243e06a5515af, type: 3} m_Data: {fileID: 21300000, guid: 3aa0616396041d2469c243e06a5515af, type: 3}
- m_RefCount: 10 - m_RefCount: 10
m_Data: {fileID: 21300000, guid: 6435cead746168e44b2d5fd2e6d2214b, type: 3} m_Data: {fileID: 21300000, guid: 6435cead746168e44b2d5fd2e6d2214b, type: 3}
- m_RefCount: 1 - m_RefCount: 0
m_Data: {fileID: 21300000, guid: 7258c55f6670d424891e2b6b63208168, type: 3} m_Data: {fileID: 0}
- m_RefCount: 76 - m_RefCount: 76
m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3} m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 156 - m_RefCount: 154
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
...@@ -3138,7 +3108,7 @@ Tilemap: ...@@ -3138,7 +3108,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 156 - m_RefCount: 154
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
...@@ -3218,8 +3188,8 @@ Tilemap: ...@@ -3218,8 +3188,8 @@ Tilemap:
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 12, y: 20, z: 0} - first: {x: 12, y: 20, z: 0}
second: second:
m_TileIndex: 2 m_TileIndex: 3
m_TileSpriteIndex: 2 m_TileSpriteIndex: 3
m_TileMatrixIndex: 0 m_TileMatrixIndex: 0
m_TileColorIndex: 0 m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
...@@ -3231,18 +3201,18 @@ Tilemap: ...@@ -3231,18 +3201,18 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 3e080c4399f301449b77f178cc4f45d4, type: 2} m_Data: {fileID: 11400000, guid: 3e080c4399f301449b77f178cc4f45d4, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 34f016109eac61640bfe7f6205c00a59, type: 2} m_Data: {fileID: 11400000, guid: 34f016109eac61640bfe7f6205c00a59, type: 2}
- m_RefCount: 2 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 9e0a3a715e976bb489ec8bedeeb2ab32, type: 2} m_Data: {fileID: 11400000, guid: 9e0a3a715e976bb489ec8bedeeb2ab32, type: 2}
- m_RefCount: 2 - m_RefCount: 3
m_Data: {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2} m_Data: {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: ad46987f159f472428d27c0b4c63e4f9, type: 3} m_Data: {fileID: 21300000, guid: ad46987f159f472428d27c0b4c63e4f9, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 6427ea4de61aaec43a19c26ff2448cbd, type: 3} m_Data: {fileID: 21300000, guid: 6427ea4de61aaec43a19c26ff2448cbd, type: 3}
- m_RefCount: 2 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: 7258c55f6670d424891e2b6b63208168, type: 3} m_Data: {fileID: 21300000, guid: 7258c55f6670d424891e2b6b63208168, type: 3}
- m_RefCount: 2 - m_RefCount: 3
m_Data: {fileID: 21300000, guid: 35acb4a1959d8114092813b66a3b25de, type: 3} m_Data: {fileID: 21300000, guid: 35acb4a1959d8114092813b66a3b25de, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 6 - m_RefCount: 6
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 11osos
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: f6be48c48b8c41848a89d377655ce077, 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
fileFormatVersion: 2
guid: 4fb31c87ddf259948b8873bc66601f9d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 11soso
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 867564e82d17ab64aa290dcdabb75e2e, 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
fileFormatVersion: 2
guid: 38e0da454028d824eb49f43f987ad562
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
...@@ -9,7 +9,7 @@ MonoBehaviour: ...@@ -9,7 +9,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Right_Down1 m_Name: 11o213
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 79c62b8a36cf6d741bf7c289624ef857, type: 3} m_Sprite: {fileID: 21300000, guid: 79c62b8a36cf6d741bf7c289624ef857, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 12osos
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 003bac19693f6f349a3c18926837f4cd, 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
fileFormatVersion: 2
guid: 985d2d01d390234479b19ba82d087c9a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 12soso
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 68f90a17fff8572478bdc5acba7d0b0f, 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
fileFormatVersion: 2
guid: 4b7c85e4ddcad124e8dcb69e856229ce
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 12o213
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 3b089fc30284eec4bbccfa169a483407, 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
fileFormatVersion: 2
guid: 11005e6e7c04a3f429b4364af2397029
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment