merge
This commit is contained in:
@@ -40,7 +40,7 @@ Grid:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 250460987577937926}
|
||||
m_Enabled: 1
|
||||
m_CellSize: {x: 1, y: 1, z: 0}
|
||||
m_CellSize: {x: 1.375, y: 1.375, z: 0}
|
||||
m_CellGap: {x: 0, y: 0, z: 0}
|
||||
m_CellLayout: 0
|
||||
m_CellSwizzle: 0
|
||||
@@ -85,6 +85,51 @@ Tilemap:
|
||||
m_GameObject: {fileID: 7903917978724306658}
|
||||
m_Enabled: 1
|
||||
m_Tiles:
|
||||
- first: {x: -16, y: -2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 33
|
||||
m_TileSpriteIndex: 21
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -15, y: -2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 34
|
||||
m_TileSpriteIndex: 22
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -14, y: -2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 35
|
||||
m_TileSpriteIndex: 23
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -13, y: -2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 36
|
||||
m_TileSpriteIndex: 24
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -11, y: -2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 37
|
||||
m_TileSpriteIndex: 0
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -6, y: -2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 10
|
||||
@@ -121,6 +166,51 @@ Tilemap:
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -16, y: -1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 28
|
||||
m_TileSpriteIndex: 16
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -15, y: -1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 29
|
||||
m_TileSpriteIndex: 17
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -14, y: -1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 30
|
||||
m_TileSpriteIndex: 18
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -13, y: -1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 31
|
||||
m_TileSpriteIndex: 19
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -12, y: -1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 32
|
||||
m_TileSpriteIndex: 20
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -6, y: -1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 6
|
||||
@@ -166,6 +256,51 @@ Tilemap:
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -16, y: 0, z: 0}
|
||||
second:
|
||||
m_TileIndex: 23
|
||||
m_TileSpriteIndex: 11
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -15, y: 0, z: 0}
|
||||
second:
|
||||
m_TileIndex: 24
|
||||
m_TileSpriteIndex: 12
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -14, y: 0, z: 0}
|
||||
second:
|
||||
m_TileIndex: 25
|
||||
m_TileSpriteIndex: 13
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -13, y: 0, z: 0}
|
||||
second:
|
||||
m_TileIndex: 26
|
||||
m_TileSpriteIndex: 14
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -12, y: 0, z: 0}
|
||||
second:
|
||||
m_TileIndex: 27
|
||||
m_TileSpriteIndex: 15
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -6, y: 0, z: 0}
|
||||
second:
|
||||
m_TileIndex: 2
|
||||
@@ -202,14 +337,126 @@ Tilemap:
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -16, y: 1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 18
|
||||
m_TileSpriteIndex: 6
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -15, y: 1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 19
|
||||
m_TileSpriteIndex: 7
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -14, y: 1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 20
|
||||
m_TileSpriteIndex: 8
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -13, y: 1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 21
|
||||
m_TileSpriteIndex: 9
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -12, y: 1, z: 0}
|
||||
second:
|
||||
m_TileIndex: 22
|
||||
m_TileSpriteIndex: 10
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -16, y: 2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -15, y: 2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 14
|
||||
m_TileSpriteIndex: 2
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -14, y: 2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 15
|
||||
m_TileSpriteIndex: 3
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -13, y: 2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 16
|
||||
m_TileSpriteIndex: 4
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
- first: {x: -12, y: 2, z: 0}
|
||||
second:
|
||||
m_TileIndex: 17
|
||||
m_TileSpriteIndex: 5
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_ObjectToInstantiate: {fileID: 0}
|
||||
m_TileFlags: 1
|
||||
m_ColliderType: 1
|
||||
m_AnimatedTiles: {}
|
||||
m_TileAssetArray:
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 1f7bfa5ee72002646806268d14bfeb3b, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: ae6e7a8b9fa2433448a66da4090e310c, type: 2}
|
||||
- m_RefCount: 1
|
||||
@@ -232,47 +479,109 @@ Tilemap:
|
||||
m_Data: {fileID: 11400000, guid: 4c5438b1315e8d840b6c482e9710993c, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: e3c7dcade26bec746bd38fb794264216, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: bfe2d3906a2ea9a459088706930d84a6, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: a6df840757ade3b4b91133bd128a4ca7, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 31952a6eac335264bbb33d2823f28683, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 873a5cecdfc9ebf4583428797abdf980, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: eb62aa8f449e99a499ed3a9dde109158, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 8e4de2f5a5925ad47b2e5135946daee7, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: fe934cd7480abb34d85c270a61159910, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: aa0847f2d07a5de409fea20d9eef8f98, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 3892d3fd4f09d3546a9c0fa91c23804c, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 8a9fda06d52381844891193f6ed6bb07, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 5eea178b37799c04484c1d11a68c148c, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: 4a575a19b6cd8a140959a1461963418f, type: 2}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2}
|
||||
m_TileSpriteArray:
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 21300000, guid: 7b479c9679b034648b04c7b0bb947faf, type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 8894201953851282084, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 7664807735657788756, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: -5402412272178277761, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 2013261503205373015, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 3760674464881954987, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: -7811504096720598664, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: -7814535901586335685, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: -3243065930256096816, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: -5316896731886317114, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 7219830438018454713, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 3100856887975758742, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 4520375771122408675, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: -5179577679047867133, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: -3910703144431735636, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: -8085034249037642075, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 2002449761939175838, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: -8297432600200059137, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 6581902851085628065, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 5873922061639052055, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 1037043418157672090, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 6246160581572741293, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 7671842712487638309, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: 6994526540242742011, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
- m_RefCount: 1
|
||||
m_Data: {fileID: -6134105900329393699, guid: 41e19859471e9554081441f3912fd642,
|
||||
type: 3}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 13
|
||||
- m_RefCount: 38
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
@@ -291,14 +600,14 @@ Tilemap:
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 13
|
||||
- m_RefCount: 38
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
- m_RefCount: 0
|
||||
m_Data: {r: -6.304267e+13, g: -6.304267e+13, b: -6.304267e+13, a: -6.304267e+13}
|
||||
m_AnimationFrameRate: 1
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Origin: {x: -6, y: -2, z: 0}
|
||||
m_Size: {x: 7, y: 4, z: 1}
|
||||
m_Origin: {x: -16, y: -2, z: 0}
|
||||
m_Size: {x: 17, y: 5, z: 1}
|
||||
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
|
||||
m_TileOrientation: 0
|
||||
m_TileOrientationMatrix:
|
||||
|
||||
Reference in New Issue
Block a user