Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Showing
with 28505 additions and 115874 deletions
...@@ -3067,6 +3067,16 @@ Tilemap: ...@@ -3067,6 +3067,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 2, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 65
m_TileSpriteIndex: 65
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 3, z: 0} - first: {x: -3, y: 3, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
...@@ -3287,6 +3297,16 @@ Tilemap: ...@@ -3287,6 +3297,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: -4, y: 5, z: 0}
second:
serializedVersion: 2
m_TileIndex: 68
m_TileSpriteIndex: 68
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 5, z: 0} - first: {x: -3, y: 5, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
...@@ -3397,6 +3417,16 @@ Tilemap: ...@@ -3397,6 +3417,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: -4, y: 6, z: 0}
second:
serializedVersion: 2
m_TileIndex: 69
m_TileSpriteIndex: 69
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 6, z: 0} - first: {x: -3, y: 6, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
...@@ -3627,6 +3657,36 @@ Tilemap: ...@@ -3627,6 +3657,36 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 0, y: 8, z: 0}
second:
serializedVersion: 2
m_TileIndex: 68
m_TileSpriteIndex: 68
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 1, y: 8, z: 0}
second:
serializedVersion: 2
m_TileIndex: 66
m_TileSpriteIndex: 66
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 8, z: 0}
second:
serializedVersion: 2
m_TileIndex: 67
m_TileSpriteIndex: 67
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 8, z: 0} - first: {x: 3, y: 8, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
...@@ -3657,6 +3717,16 @@ Tilemap: ...@@ -3657,6 +3717,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 0, y: 9, z: 0}
second:
serializedVersion: 2
m_TileIndex: 69
m_TileSpriteIndex: 69
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 9, z: 0} - first: {x: 3, y: 9, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
...@@ -3798,7 +3868,7 @@ Tilemap: ...@@ -3798,7 +3868,7 @@ Tilemap:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 07175304739116a4f8e6cfd86e993414, type: 2} m_Data: {fileID: 11400000, guid: 07175304739116a4f8e6cfd86e993414, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: ef9eb3c0f6a18d7439d8035ecbeaa216, type: 2} m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 11e46816b761a5748bb73f7e1119afa5, type: 2} m_Data: {fileID: 11400000, guid: 11e46816b761a5748bb73f7e1119afa5, type: 2}
- m_RefCount: 1 - m_RefCount: 1
...@@ -3819,6 +3889,16 @@ Tilemap: ...@@ -3819,6 +3889,16 @@ Tilemap:
m_Data: {fileID: 11400000, guid: bc06d4b443aecd048842537d4276f520, type: 2} m_Data: {fileID: 11400000, guid: bc06d4b443aecd048842537d4276f520, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: a655ee4846392e2419ece79d0c2f3958, type: 2} m_Data: {fileID: 11400000, guid: a655ee4846392e2419ece79d0c2f3958, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b9ae39cac0fc74c49b0fa52a89d540b8, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 99c234a39a8a33647a23934ae06c0e19, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b2eae4a922d13a1449e31d555553eced, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: fd2e1e2a462b94e49bc4f8836a6a6372, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 667c665a14fb8434ca9e4e4a01c6800f, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
...@@ -3929,7 +4009,7 @@ Tilemap: ...@@ -3929,7 +4009,7 @@ Tilemap:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: -4035382832446957438, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_Data: {fileID: -4035382832446957438, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 4020740420307960919, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: -1147168906562122949, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_Data: {fileID: -1147168906562122949, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1 - m_RefCount: 1
...@@ -3950,8 +4030,18 @@ Tilemap: ...@@ -3950,8 +4030,18 @@ Tilemap:
m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 618283605872952514, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_Data: {fileID: 618283605872952514, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 6986815404043503449, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 7808538442560958302, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 8725674123217878092, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 2
m_Data: {fileID: 7609906820474631096, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 2
m_Data: {fileID: 2519681813242796523, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 71 - m_RefCount: 78
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
...@@ -3970,7 +4060,7 @@ Tilemap: ...@@ -3970,7 +4060,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 71 - m_RefCount: 78
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: [] m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2 fileFormatVersion: 2
guid: 1b0bebe128a4e8345a1550a68ad23be1 guid: bdacdfbd3813c462c9501df53f5fe4af
DefaultImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6742524767965565839
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2052134386649845870}
- component: {fileID: 6082533222092643988}
m_Layer: 0
m_Name: Stove
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2052134386649845870
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6742524767965565839}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -41.625496, y: 35.23956, z: 0}
m_LocalScale: {x: 0.03, y: 0.03, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6082533222092643988
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6742524767965565839}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 2045603605
m_SortingLayer: 3
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 2d69e0f0370a1464c9f0da7d8e4f2a63, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 50, y: 50}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4ae30febc4f91474fa9164b85521aaf5 guid: a4179d20809394cfda68d226fc249d0b
DefaultImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
......
...@@ -173,4 +173,4 @@ MonoBehaviour: ...@@ -173,4 +173,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2eed50797895184ab44621a154ad526, type: 3} m_Script: {fileID: 11500000, guid: c2eed50797895184ab44621a154ad526, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nbPoints: 8 nbPoints: 5
This diff is collapsed.
fileFormatVersion: 2 fileFormatVersion: 2
guid: 02c5de57794c3474fb978ab6e3487fb4 guid: 075eeb49ca9e1064ea07781a2deba9ae
DefaultImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5097a5d46361eda43b5a45ce166e49aa guid: 81e39c4f6e44e7345849a14cbef3b3ea
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
This diff is collapsed.
This diff is collapsed.