Merge remote-tracking branch 'origin/Over' into Syntriax

This commit is contained in:
Syntriax 2022-02-26 14:54:31 +03:00
commit d6c026bd99
53 changed files with 1112 additions and 2301 deletions

View File

@ -222,6 +222,36 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 36
m_TileSpriteIndex: 36
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 4, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 37
m_TileSpriteIndex: 37
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 5, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 38
m_TileSpriteIndex: 38
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: -1, z: 0}
second:
serializedVersion: 2
@ -282,6 +312,36 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: -1, 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: 4, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 34
m_TileSpriteIndex: 34
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 5, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 35
m_TileSpriteIndex: 35
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 0, z: 0}
second:
serializedVersion: 2
@ -342,6 +402,36 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 30
m_TileSpriteIndex: 30
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 4, y: 0, 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: 5, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 32
m_TileSpriteIndex: 32
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 1
@ -404,6 +494,24 @@ Tilemap:
m_Data: {fileID: 11400000, guid: f94b385977d095b4f9751fb45bb0f03f, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 923155d503f72c74a9ccc50776a2efcc, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d768ee24491976b4f99f4bfa08080d4c, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 304ad8c713ab07248bb08680d66839a9, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: de319b54387f2714092e262b16c08ade, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 200829829a00d1d43a4c6db4521fdd1f, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: bc11b2dc26b029046a7e4a3943dff1eb, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 00d5b0518c1662b4fb1c5dc73b4ce342, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ca1f0057136d6114ea16cd12b4231e50, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: dc817f1393ecc354196807ebbb0cee7d, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 9a3370001bf69ec4fa83403788f23e3f, type: 2}
m_TileSpriteArray:
- m_RefCount: 1
m_Data: {fileID: 1246622493, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
@ -465,8 +573,26 @@ Tilemap:
m_Data: {fileID: 1069040459, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 757696416, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 46005945, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1029262186, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1987245647, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1504476469, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1339869766, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1360224111, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -2081441802, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1141969955, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -2081581435, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_TileMatrixArray:
- m_RefCount: 30
- m_RefCount: 39
m_Data:
e00: 1
e01: 0
@ -485,13 +611,13 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 30
- m_RefCount: 39
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: -3, y: -4, z: 0}
m_Size: {x: 6, y: 5, z: 1}
m_Size: {x: 9, y: 5, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@ -605,7 +731,7 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
--- !u!114 &3884229532620799578
--- !u!114 &8376104805762149464
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

View File

@ -147,6 +147,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5040194c42674482aab09aabcee0f9d4, type: 3}
m_Name:
m_EditorClassIdentifier:
small: {fileID: 21300000, guid: f7ced637fc4c4fe49b0bdbb5e84620f2, type: 3}
medium: {fileID: 21300000, guid: a2ac8e5637335234492f2fdcd66d88b7, type: 3}
large: {fileID: 21300000, guid: 7259dd02abf9b1f468cb25549f3cefe5, type: 3}
smallCollapsing: {fileID: 21300000, guid: 5ed18a942f03b98468de3ac94774cc82, type: 3}
mediumCollapsing: {fileID: 21300000, guid: cf3629fcd79103b479a33630ab75637c, type: 3}
largeCollapsing: {fileID: 21300000, guid: 420a05d557a5fe3469ef409abf38ded4, type: 3}
size: 3
--- !u!1 &1978588694510666093
GameObject:
m_ObjectHideFlags: 0

View File

@ -147,6 +147,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5040194c42674482aab09aabcee0f9d4, type: 3}
m_Name:
m_EditorClassIdentifier:
small: {fileID: 21300000, guid: f7ced637fc4c4fe49b0bdbb5e84620f2, type: 3}
medium: {fileID: 21300000, guid: a2ac8e5637335234492f2fdcd66d88b7, type: 3}
large: {fileID: 21300000, guid: 7259dd02abf9b1f468cb25549f3cefe5, type: 3}
smallCollapsing: {fileID: 21300000, guid: 5ed18a942f03b98468de3ac94774cc82, type: 3}
mediumCollapsing: {fileID: 21300000, guid: cf3629fcd79103b479a33630ab75637c, type: 3}
largeCollapsing: {fileID: 21300000, guid: 420a05d557a5fe3469ef409abf38ded4, type: 3}
size: 2
--- !u!1 &2904370523193236437
GameObject:
m_ObjectHideFlags: 0

View File

@ -147,6 +147,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5040194c42674482aab09aabcee0f9d4, type: 3}
m_Name:
m_EditorClassIdentifier:
small: {fileID: 21300000, guid: f7ced637fc4c4fe49b0bdbb5e84620f2, type: 3}
medium: {fileID: 21300000, guid: a2ac8e5637335234492f2fdcd66d88b7, type: 3}
large: {fileID: 21300000, guid: 7259dd02abf9b1f468cb25549f3cefe5, type: 3}
smallCollapsing: {fileID: 21300000, guid: 5ed18a942f03b98468de3ac94774cc82, type: 3}
mediumCollapsing: {fileID: 21300000, guid: cf3629fcd79103b479a33630ab75637c, type: 3}
largeCollapsing: {fileID: 21300000, guid: 420a05d557a5fe3469ef409abf38ded4, type: 3}
size: 1
--- !u!1 &8290467299240869599
GameObject:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -11,8 +11,17 @@ namespace Platforms
private CollisionChecker _collidingTriggerCheck;
public Sprite small;
public Sprite medium;
public Sprite large;
public Sprite smallCollapsing;
public Sprite mediumCollapsing;
public Sprite largeCollapsing;
private bool _onCollision;
[Range(1, 3)] public int size;
private void Awake()
{
_collidingTriggerCheck = GetComponentInChildren<CollisionChecker>();
@ -33,7 +42,19 @@ namespace Platforms
private IEnumerator Collapse()
{
GetComponent<SpriteRenderer>().color = Color.red;
switch (size)
{
case 1:
GetComponent<SpriteRenderer>().sprite = smallCollapsing;
break;
case 2:
GetComponent<SpriteRenderer>().sprite = mediumCollapsing;
break;
case 3:
GetComponent<SpriteRenderer>().sprite = largeCollapsing;
break;
}
yield return new WaitForSeconds(TimeBeforeCollapse);
ChangeState(false);
StartCoroutine(Reset());
@ -44,7 +65,19 @@ namespace Platforms
{
yield return new WaitForSeconds(TimeBeforeReset);
_onCollision = false;
GetComponent<SpriteRenderer>().color = Color.white;
switch (size)
{
case 1:
GetComponent<SpriteRenderer>().sprite = small;
break;
case 2:
GetComponent<SpriteRenderer>().sprite = medium;
break;
case 3:
GetComponent<SpriteRenderer>().sprite = large;
break;
}
ChangeState(true);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 433 B

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 874 B

View File

@ -607,7 +607,7 @@ TextureImporter:
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -733,7 +733,7 @@ TextureImporter:
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -745,6 +745,195 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_30
rect:
serializedVersion: 2
x: 48
y: 32
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 73a230668a1024345af3d02a3869f30c
internalID: 46005945
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_31
rect:
serializedVersion: 2
x: 56
y: 32
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6805501e447f319418e381a91bf9eddc
internalID: -1029262186
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_32
rect:
serializedVersion: 2
x: 64
y: 32
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 58101fd260b208e4cbe85b164b4a6d6d
internalID: 1987245647
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_33
rect:
serializedVersion: 2
x: 48
y: 24
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 312992f431ad21b429458714bf2305c3
internalID: 1504476469
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_34
rect:
serializedVersion: 2
x: 56
y: 24
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 02aabcab3e1cced4cb6ee0ac95290cef
internalID: 1339869766
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_35
rect:
serializedVersion: 2
x: 64
y: 24
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0e30bc1178455c34eb41e6020def7ff1
internalID: -1360224111
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_36
rect:
serializedVersion: 2
x: 48
y: 16
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d1d4fbb7d1e3fb846b7fd71fc4852a55
internalID: -2081441802
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_37
rect:
serializedVersion: 2
x: 56
y: 16
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8e73544038c79f2458e50b91f96b716a
internalID: -1141969955
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Tilemap_38
rect:
serializedVersion: 2
x: 64
y: 16
width: 8
height: 8
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 746c6ba2f5569564bbd4855968e58c28
internalID: -2081581435
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@ -758,6 +947,7 @@ TextureImporter:
nameFileIdTable:
Tilemap_9: -838604924
Tilemap_6: -497804575
Tilemap_36: -2081441802
Tilemap_19: -1969432242
Tilemap_4: 1716665625
Tilemap_7: 2045765049
@ -771,19 +961,27 @@ TextureImporter:
Tilemap_28: 1069040459
Tilemap_2: 1170042279
Tilemap_29: 757696416
Tilemap_31: -1029262186
Tilemap_38: -2081581435
Tilemap_34: 1339869766
Tilemap_16: 1375274642
Tilemap_10: 1543350629
Tilemap_12: -681767045
Tilemap_26: 6603938
Tilemap_30: 46005945
Tilemap_20: 459509855
Tilemap_11: 1422514806
Tilemap_35: -1360224111
Tilemap_27: 275868233
Tilemap_14: -1224082411
Tilemap_37: -1141969955
Tilemap_33: 1504476469
Tilemap_8: 1277175226
Tilemap_0: 1246622493
Tilemap_1: -1914412438
Tilemap_5: 1626390195
Tilemap_13: 2119874482
Tilemap_32: 1987245647
Tilemap_18: 988242451
Tilemap_23: 313125812
spritePackingTag:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_30
m_EditorClassIdentifier:
m_Sprite: {fileID: 46005945, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d768ee24491976b4f99f4bfa08080d4c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_31
m_EditorClassIdentifier:
m_Sprite: {fileID: -1029262186, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 304ad8c713ab07248bb08680d66839a9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_32
m_EditorClassIdentifier:
m_Sprite: {fileID: 1987245647, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: de319b54387f2714092e262b16c08ade
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_33
m_EditorClassIdentifier:
m_Sprite: {fileID: 1504476469, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 200829829a00d1d43a4c6db4521fdd1f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_34
m_EditorClassIdentifier:
m_Sprite: {fileID: 1339869766, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bc11b2dc26b029046a7e4a3943dff1eb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_35
m_EditorClassIdentifier:
m_Sprite: {fileID: -1360224111, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 00d5b0518c1662b4fb1c5dc73b4ce342
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_36
m_EditorClassIdentifier:
m_Sprite: {fileID: -2081441802, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ca1f0057136d6114ea16cd12b4231e50
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_37
m_EditorClassIdentifier:
m_Sprite: {fileID: -1141969955, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dc817f1393ecc354196807ebbb0cee7d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Tilemap_38
m_EditorClassIdentifier:
m_Sprite: {fileID: -2081581435, guid: 70f9149264d244b4dafd9728b074da3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9a3370001bf69ec4fa83403788f23e3f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -12,10 +12,10 @@ EditorUserSettings:
value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561
flags: 0
RecentlyUsedSceneGuid-2:
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
flags: 0
RecentlyUsedSceneGuid-3:
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650

View File

@ -15,7 +15,7 @@ MonoBehaviour:
m_Children:
- {fileID: 3}
- {fileID: 8}
- {fileID: 13}
- {fileID: 14}
m_Position:
serializedVersion: 2
x: 0
@ -25,7 +25,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 2344
controlID: 7262
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -46,8 +46,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 303.2
y: 73.6
x: 1
y: 19
width: 871.60004
height: 493.40002
m_ViewDataDictionary: {fileID: 0}
@ -85,9 +85,9 @@ MonoBehaviour:
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 0
m_VSlider: 1
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@ -142,7 +142,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 2310
controlID: 7234
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -202,7 +202,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: d8c6ffffc0a00000
m_ExpandedIDs: 9ca2ffff92a8ffff6eaaffffcab7fffff2b7ffff98f3ffff9af3ffff0cfbffff66a60000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -293,7 +293,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Resources/Playable
- Assets/Prefabs/Platforms/CollapsingPlatforms
m_Globs: []
m_OriginalText:
m_ViewMode: 0
@ -307,7 +307,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: dc3c0000
m_LastClickedID: 15580
m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e64000030640000326400003464000036640000386400003c640000
m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003464000036640000386400003a6400003c6400006265000074650000786500007c6500008065000084650000886500008c650000227a0000a8a40000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -332,10 +332,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 146.99982}
m_SelectedIDs: c0a00000
scrollPos: {x: 0, y: 116.49963}
m_SelectedIDs: 247fffff
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003264000034640000366400003c64000062650000227a0000
m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e64000030640000326400003464000036640000386400003a6400003c6400006265000074650000786500007c6500008065000084650000886500008c650000227a0000a8a40000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -360,8 +360,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: c0a00000
m_LastClickedInstanceID: 41152
m_SelectedInstanceIDs: 247fffff
m_LastClickedInstanceID: -32988
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000d03c0000
m_RenameOverlay:
@ -405,7 +405,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 9}
- {fileID: 11}
- {fileID: 12}
m_Position:
serializedVersion: 2
x: 303.2
@ -415,7 +415,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 2345
controlID: 7263
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@ -435,12 +435,13 @@ MonoBehaviour:
y: 0
width: 873.60004
height: 514.4
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2}
m_Panes:
- {fileID: 10}
- {fileID: 2}
- {fileID: 11}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &10
@ -498,7 +499,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffset: {x: 0, y: 24.8}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: unity-scene-view-toolbar
@ -542,7 +543,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffset: {x: 0, y: 24.8}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: unity-transform-toolbar
@ -574,7 +575,7 @@ MonoBehaviour:
containerId: overlay-container--right
floating: 0
collapsed: 0
displayed: 1
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
@ -682,17 +683,17 @@ MonoBehaviour:
layout: 4
m_WindowGUID: d69a67902db7f994ca099bec79d22ce1
m_Gizmos: 1
m_OverrideSceneCullingMask: 0
m_SceneIsLit: 0
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
m_2DMode: 1
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -4.55, y: 0.40999997, z: 0}
m_Target: {x: 15.626763, y: 1.9682573, z: -3.2323787}
speed: 2
m_Value: {x: -4.55, y: 0.40999997, z: 0}
m_Value: {x: 15.626763, y: 1.9682573, z: -3.2323787}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -704,7 +705,7 @@ MonoBehaviour:
m_SceneViewState:
m_AlwaysRefresh: 0
showFog: 1
showSkybox: 0
showSkybox: 1
showFlares: 1
showImageEffects: 1
showParticleSystems: 1
@ -743,9 +744,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 0.90691787
m_Target: 13.24111
speed: 2
m_Value: 0.90691787
m_Value: 13.24111
m_Ortho:
m_Target: 1
speed: 2
@ -771,6 +772,41 @@ MonoBehaviour:
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 240, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Tile Palette
m_Image: {fileID: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 303.2
y: 73.6
width: 871.60004
height: 493.40002
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_PreviewResizer:
m_CachedPref: -50
m_ControlHash: 1964396721
m_PrefName: Preview_TilemapBrushInspector
m_Palette: {fileID: 5923046506128307364, guid: f8f8c3704b3a1c6428fcd22de4a1d9e5, type: 3}
m_DrawGridGizmo: 1
m_DrawGizmos: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -789,14 +825,14 @@ MonoBehaviour:
y: 514.4
width: 873.60004
height: 216.39996
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 12}
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 12}
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -824,7 +860,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &13
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -845,12 +881,12 @@ MonoBehaviour:
height: 730.8
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 14}
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &14
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -884,8 +920,8 @@ MonoBehaviour:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: 41152
m_LastVerticalScrollValue: 49.050007
m_LastInspectedObjectInstanceID: -32988
m_LastVerticalScrollValue: 272.8
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: