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 28504 additions and 115933 deletions
......@@ -3067,6 +3067,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
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}
second:
serializedVersion: 2
......@@ -3287,6 +3297,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
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}
second:
serializedVersion: 2
......@@ -3397,6 +3417,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
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}
second:
serializedVersion: 2
......@@ -3627,6 +3657,36 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
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}
second:
serializedVersion: 2
......@@ -3657,6 +3717,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
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}
second:
serializedVersion: 2
......@@ -3798,7 +3868,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 07175304739116a4f8e6cfd86e993414, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ef9eb3c0f6a18d7439d8035ecbeaa216, type: 2}
m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 11e46816b761a5748bb73f7e1119afa5, type: 2}
- m_RefCount: 1
......@@ -3819,6 +3889,16 @@ Tilemap:
m_Data: {fileID: 11400000, guid: bc06d4b443aecd048842537d4276f520, type: 2}
- m_RefCount: 1
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_RefCount: 1
m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
......@@ -3929,7 +4009,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -4035382832446957438, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 4020740420307960919, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1147168906562122949, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
......@@ -3950,8 +4030,18 @@ Tilemap:
m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
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_RefCount: 71
- m_RefCount: 78
m_Data:
e00: 1
e01: 0
......@@ -3970,7 +4060,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 71
- m_RefCount: 78
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
......
......@@ -10,9 +10,10 @@ GameObject:
m_Component:
- component: {fileID: 6996933207471714739}
- component: {fileID: -421924145509232575}
- component: {fileID: 6595684778732623722}
- component: {fileID: 968398465587571092}
- component: {fileID: 7898263680220245293}
- component: {fileID: 7608791072345640635}
- component: {fileID: 5198556420486054290}
m_Layer: 0
m_Name: Shop
m_TagString: Untagged
......@@ -41,7 +42,7 @@ SpriteRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
......@@ -85,20 +86,20 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!60 &6595684778732623722
PolygonCollider2D:
--- !u!61 &968398465587571092
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
m_Enabled: 0
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: 0.28835773, y: -0.94067025}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -108,21 +109,24 @@ PolygonCollider2D:
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.875, y: 2.6875}
- {x: -2.125, y: 2.625}
- {x: -2.5, y: 2.5}
- {x: -2.5, y: -2.6875}
- {x: 2.5, y: -2.6875}
- {x: 2.5, y: 2.5}
- {x: 2.375, y: 2.6875}
- - {x: -1.75, y: -0.125}
- {x: -1.6875, y: -0.1875}
- {x: 1.3125, y: -0.1875}
- {x: 1.3125, y: -0.8125}
- {x: -1.75, y: -0.8125}
--- !u!61 &968398465587571092
serializedVersion: 2
m_Size: {x: 6.1458454, y: 5.318905}
m_EdgeRadius: 0
--- !u!114 &7898263680220245293
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3}
m_Name:
m_EditorClassIdentifier:
sellItem: {fileID: 0}
itemForSale: []
--- !u!61 &7608791072345640635
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -132,10 +136,10 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -2.7520308}
m_Offset: {x: -0.00000047683716, y: -1.9262341}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -146,19 +150,31 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5, y: 2.1973512}
m_Size: {x: 4.7651043, y: 1.8437607}
m_EdgeRadius: 0
--- !u!114 &7898263680220245293
MonoBehaviour:
--- !u!61 &5198556420486054290
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3}
m_Name:
m_EditorClassIdentifier:
sellItem: {fileID: 0}
itemForSale: []
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 1.9183074, y: -0.325713}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 5, y: 6}
newSize: {x: 5, y: 6}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.9284899, y: 1.4400179}
m_EdgeRadius: 0
This diff is collapsed.
fileFormatVersion: 2
guid: 1b0bebe128a4e8345a1550a68ad23be1
DefaultImporter:
guid: bdacdfbd3813c462c9501df53f5fe4af
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
......
This diff is collapsed.
......@@ -173,4 +173,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2eed50797895184ab44621a154ad526, type: 3}
m_Name:
m_EditorClassIdentifier:
nbPoints: 8
nbPoints: 5
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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.