Commit 2cff1fa6 authored by Doemoetoer Kozak's avatar Doemoetoer Kozak
Browse files

Merge remote-tracking branch 'origin/master'

parents 2c37bb57 c979790f
......@@ -779,11 +779,11 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 68e603b0a421cf72fb31f6bca7a3e009, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 90d56014a838a8b4ba122a4b16dc96b3, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: cc1f56fdcfeab742a8df39cc52472f73, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: a52c1c0a4dd80de90808ba7ad94893f7, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: e3acbc1285750f0039519a5de99bd6cc, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: deb3d45047687915d989e5c3e20c2e94, type: 2}
......@@ -803,11 +803,11 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 849d527beffe51ec68be34f8466c7ed6, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: dea4659f35c84ff138b0addd97ba9423, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: b176470fdfb6f843b8e1435e7b0ba87c, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 6f7c91e2702737b22bd6ae1a43905820, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 629443258da3d7402ad56296ad54eeb8, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 95c5fa1a53fe6964d8e884df2eb800bb, type: 2}
......@@ -827,11 +827,11 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 68f95785a4f2bab268ce71b58d26e0a0, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 1b947fecf02cf7929999087979502fd8, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 041b17ad5f2cd3071bedadd1c6c1386a, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: a0a54e6a81ff14f8d851a42f93652e1d, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 20e9c6861bc3276dcbe9513b3ec51e75, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ad83a4c2dd32950e4960e747f6e78e46, type: 2}
......@@ -941,12 +941,12 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 7714861430389134398, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 1803682630379414355, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 762397417296963716, guid: 9be467de03e00ffa69fafa84608b63d4, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -1870896774056241089, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
......@@ -976,13 +976,13 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -2389531033332244406, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 2507676640048648699, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -6927748193163709657, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 5716963001815368896, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
......@@ -1012,13 +1012,13 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 1904188043005446761, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 6474213927409703567, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -6419233712908538232, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 5733751073146372, guid: 9be467de03e00ffa69fafa84608b63d4, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1878080615237139884, guid: 9be467de03e00ffa69fafa84608b63d4,
......@@ -1122,7 +1122,7 @@ Tilemap:
m_Data: {fileID: -1902027793379638088, guid: 9be467de03e00ffa69fafa84608b63d4,
type: 3}
m_TileMatrixArray:
- m_RefCount: 74
- m_RefCount: 83
m_Data:
e00: 1
e01: 0
......@@ -1141,12 +1141,12 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 74
- m_RefCount: 83
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: -2, y: -4, z: 0}
m_Size: {x: 12, y: 8, z: 1}
m_Size: {x: 12, y: 14, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
......
Supports Markdown
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