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 1364 additions and 17961 deletions
fileFormatVersion: 2
guid: 97a340a9fc5ba2740b666b8014d03955
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -33,6 +33,7 @@ Transform:
- {fileID: 7175028150327628597}
- {fileID: 7760992791977896690}
- {fileID: 3388564004559277796}
- {fileID: 8726516713972316486}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -99,6 +100,66 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 9
m_TileSpriteIndex: 9
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 8
m_TileSpriteIndex: 8
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 7
m_TileSpriteIndex: 7
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 6
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 5
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 4
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 0
......@@ -109,18 +170,18 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 88db7256c29d7f34fb8b185c67c724af, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 9ff3c8f56af8fb04dabdd0db2e2111fd, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b7a7c3de726376a4ab7f372e50ca01fc, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 0a984f5c6f703d24caff2ac18f813b76, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 54d2a5df1df6e2f428542273c0d2cb18, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e4da40d923ecb9b418586bd5426eb399, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 64e3b9c0791df284bb1047422dc8686a, type: 2}
m_TileSpriteArray:
......@@ -132,22 +193,22 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -7614346443414394471, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1810263472398167305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3406689312018280875, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3135611070465409670, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -6939985638536199428, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3753064910040944515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 33517161544612487, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- m_RefCount: 1
- m_RefCount: 7
m_Data:
e00: 1
e01: 0
......@@ -166,7 +227,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 1
- m_RefCount: 7
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
......@@ -2731,7 +2792,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 26
m_TileSpriteIndex: 26
m_TileSpriteIndex: 33
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -2801,7 +2862,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 20
m_TileSpriteIndex: 20
m_TileSpriteIndex: 32
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -2821,7 +2882,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 19
m_TileSpriteIndex: 19
m_TileSpriteIndex: 31
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -2831,27 +2892,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 27
m_TileSpriteIndex: 27
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 33
m_TileSpriteIndex: 33
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 32
m_TileSpriteIndex: 32
m_TileSpriteIndex: 30
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -2911,7 +2952,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 25
m_TileSpriteIndex: 25
m_TileSpriteIndex: 29
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -2921,27 +2962,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 17
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 31
m_TileSpriteIndex: 31
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 30
m_TileSpriteIndex: 30
m_TileSpriteIndex: 28
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -3007,26 +3028,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 29
m_TileSpriteIndex: 29
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 28
m_TileSpriteIndex: 28
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 5, y: 4, z: 0}
second:
serializedVersion: 2
......@@ -3521,7 +3522,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 21
m_TileSpriteIndex: 21
m_TileSpriteIndex: 27
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -3625,18 +3626,18 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 109f496b5ff98fb459ab9f8733234219, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 3f8c3a1148f46b942a0792b1934e1cf3, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 88db7256c29d7f34fb8b185c67c724af, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 9ff3c8f56af8fb04dabdd0db2e2111fd, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b7a7c3de726376a4ab7f372e50ca01fc, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 0a984f5c6f703d24caff2ac18f813b76, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 54d2a5df1df6e2f428542273c0d2cb18, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e4da40d923ecb9b418586bd5426eb399, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 667c665a14fb8434ca9e4e4a01c6800f, type: 2}
- m_RefCount: 1
......@@ -3736,38 +3737,38 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -3371896872818193155, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 4072211229523600940, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -6061887058710475081, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -7530748250500542981, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 7
m_Data: {fileID: 8314597423796371094, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 2
m_Data: {fileID: -7142543008162911894, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 2
m_Data: {fileID: 3631006098854972704, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 8216330270177875515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 4479181887894498110, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: -7530748250500542981, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -7614346443414394471, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: -3371896872818193155, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1810263472398167305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3406689312018280875, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: 4479181887894498110, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3135611070465409670, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: 4072211229523600940, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -6939985638536199428, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: -6061887058710475081, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3753064910040944515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: 8216330270177875515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 2519681813242796523, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
......@@ -3831,7 +3832,7 @@ Tilemap:
- m_RefCount: 2
m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- m_RefCount: 84
- m_RefCount: 78
m_Data:
e00: 1
e01: 0
......@@ -3850,7 +3851,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 84
- m_RefCount: 78
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
......@@ -3940,3 +3941,60 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
--- !u!1 &8911140696345978855
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8726516713972316486}
- component: {fileID: 7352476046474401848}
m_Layer: 0
m_Name: CorrectHitbox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8726516713972316486
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8911140696345978855}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.02, y: 2.99, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4898574938548127473}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &7352476046474401848
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8911140696345978855}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.012878537, y: 0.3605951}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.8499739, y: 2.4938934}
m_EdgeRadius: 0
......@@ -153,6 +153,9 @@ MonoBehaviour:
maxNature: 100
currentNature: 0
natureBar: {fileID: 0}
duree: 1000
TimeDamage: 0
period: 0.1
--- !u!95 &6134360248180697739
Animator:
serializedVersion: 3
......
This diff is collapsed.
fileFormatVersion: 2
guid: bf02b84eee26240d383747dfba5353dc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: bdacdfbd3813c462c9501df53f5fe4af
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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.