Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
0be0f47acd
1 changed files with 109 additions and 99 deletions
|
|
@ -947,16 +947,6 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -26, y: -19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 1
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 6, y: -19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -997,26 +987,6 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -23, y: -17, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 1
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -26, y: -15, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 1
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 2, y: -14, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -1067,16 +1037,6 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -23, y: -13, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 1
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 18, y: -8, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -1461,8 +1421,8 @@ Tilemap:
|
|||
m_TileAssetArray:
|
||||
- m_RefCount: 55
|
||||
m_Data: {fileID: 11400000, guid: d4b7e623eb6495a4d9ed497d23e3e179, type: 2}
|
||||
- m_RefCount: 4
|
||||
m_Data: {fileID: 11400000, guid: 555180d230ec42f41946fa10e07de03a, type: 2}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
|
|
@ -1470,14 +1430,14 @@ Tilemap:
|
|||
m_TileSpriteArray:
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 4
|
||||
m_Data: {fileID: 245033472, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 55
|
||||
m_Data: {fileID: 1604744257, guid: 249c6558812008e49a55f8cd21220ae9, type: 3}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 59
|
||||
- m_RefCount: 55
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
|
|
@ -1496,7 +1456,7 @@ Tilemap:
|
|||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 59
|
||||
- m_RefCount: 55
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_TileObjectToInstantiateArray: []
|
||||
m_AnimationFrameRate: 1
|
||||
|
|
@ -2261,7 +2221,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 293094549}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 22.35, y: -21.71, z: -10}
|
||||
m_LocalPosition: {x: 0.62, y: 0.61, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
|
@ -3045,10 +3005,10 @@ Camera:
|
|||
m_FocalLength: 50
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0.07026071
|
||||
y: 0
|
||||
width: 0.85952276
|
||||
height: 0.9998184
|
||||
x: 0
|
||||
y: 0.0828125
|
||||
width: 1
|
||||
height: 0.83313686
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 60
|
||||
|
|
@ -3077,7 +3037,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 519420028}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 22.35, y: -21.71, z: -10}
|
||||
m_LocalPosition: {x: 0.62, y: 0.61, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
|
@ -4749,7 +4709,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 832780273}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 22.35, y: -21.71, z: 0}
|
||||
m_LocalPosition: {x: 0.62, y: 0.61, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
|
@ -19725,16 +19685,6 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 16, y: 18, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 2
|
||||
m_TileSpriteIndex: 7
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 27, y: 18, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -19795,16 +19745,6 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 16, y: 19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 2
|
||||
m_TileSpriteIndex: 7
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 22, y: 19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -19885,16 +19825,6 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 16, y: 20, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 2
|
||||
m_TileSpriteIndex: 7
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 27, y: 20, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -21701,8 +21631,8 @@ Tilemap:
|
|||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 3
|
||||
m_Data: {fileID: 11400000, guid: b1c834a1dbe507d4fa2ebf10517be3b2, type: 2}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 46
|
||||
m_Data: {fileID: 11400000, guid: 6c36631ab5a6ba345b240d58a49cc139, type: 2}
|
||||
- m_RefCount: 0
|
||||
|
|
@ -21726,8 +21656,8 @@ Tilemap:
|
|||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 3
|
||||
m_Data: {fileID: -966210798, guid: 249c6558812008e49a55f8cd21220ae9, type: 3}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 1
|
||||
|
|
@ -21757,7 +21687,7 @@ Tilemap:
|
|||
- m_RefCount: 27
|
||||
m_Data: {fileID: 1685374653, guid: df027b9d09b195c4590d5e94902b10bf, type: 3}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 1102
|
||||
- m_RefCount: 1099
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
|
|
@ -21776,7 +21706,7 @@ Tilemap:
|
|||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 1102
|
||||
- m_RefCount: 1099
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_TileObjectToInstantiateArray: []
|
||||
m_AnimationFrameRate: 1
|
||||
|
|
@ -27556,6 +27486,16 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 16, y: 18, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 0
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -22, y: 19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -27566,6 +27506,16 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 16, y: 19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 0
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -22, y: 20, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -27576,19 +27526,29 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 16, y: 20, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 0
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
m_AnimatedTiles: {}
|
||||
m_TileAssetArray:
|
||||
- m_RefCount: 51
|
||||
- m_RefCount: 54
|
||||
m_Data: {fileID: 11400000, guid: b1c834a1dbe507d4fa2ebf10517be3b2, type: 2}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileSpriteArray:
|
||||
- m_RefCount: 51
|
||||
- m_RefCount: 54
|
||||
m_Data: {fileID: -966210798, guid: 249c6558812008e49a55f8cd21220ae9, type: 3}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 51
|
||||
- m_RefCount: 54
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
|
|
@ -27607,7 +27567,7 @@ Tilemap:
|
|||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 51
|
||||
- m_RefCount: 54
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_TileObjectToInstantiateArray: []
|
||||
m_AnimationFrameRate: 1
|
||||
|
|
@ -27740,6 +27700,16 @@ Tilemap:
|
|||
m_GameObject: {fileID: 1281979634}
|
||||
m_Enabled: 1
|
||||
m_Tiles:
|
||||
- first: {x: -26, y: -19, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 14, y: -18, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -27760,6 +27730,16 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -23, y: -17, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -13, y: -17, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -27800,6 +27780,16 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -26, y: -15, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 2, y: -14, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -27870,6 +27860,16 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -23, y: -13, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -18, y: -12, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -27960,6 +27960,16 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: -1, y: -9, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 1
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741826
|
||||
- first: {x: 18, y: -9, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
|
|
@ -28462,21 +28472,21 @@ Tilemap:
|
|||
m_AllTileFlags: 1073741826
|
||||
m_AnimatedTiles: {}
|
||||
m_TileAssetArray:
|
||||
- m_RefCount: 72
|
||||
- m_RefCount: 77
|
||||
m_Data: {fileID: 11400000, guid: 555180d230ec42f41946fa10e07de03a, type: 2}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileSpriteArray:
|
||||
- m_RefCount: 19
|
||||
m_Data: {fileID: 1576286969, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3}
|
||||
- m_RefCount: 34
|
||||
- m_RefCount: 39
|
||||
m_Data: {fileID: 245033472, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3}
|
||||
- m_RefCount: 19
|
||||
m_Data: {fileID: 1314846579, guid: 4bcf59b2b9958064c998e954fd7af53b, type: 3}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 72
|
||||
- m_RefCount: 77
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
|
|
@ -28495,13 +28505,13 @@ Tilemap:
|
|||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 72
|
||||
- m_RefCount: 77
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_TileObjectToInstantiateArray: []
|
||||
m_AnimationFrameRate: 1
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Origin: {x: -26, y: -18, z: 0}
|
||||
m_Size: {x: 53, y: 37, z: 1}
|
||||
m_Origin: {x: -26, y: -19, z: 0}
|
||||
m_Size: {x: 53, y: 38, z: 1}
|
||||
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
|
||||
m_TileOrientation: 0
|
||||
m_TileOrientationMatrix:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue