diff --git a/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.prefab b/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.prefab index d69a694..b1f4da0 100644 --- a/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.prefab +++ b/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.prefab @@ -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 diff --git a/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.prefab b/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.prefab index 612e25b..cb88a30 100644 --- a/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.prefab +++ b/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.prefab @@ -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 diff --git a/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.prefab b/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.prefab index 34afec0..fd89ef2 100644 --- a/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.prefab +++ b/Assets/Prefabs/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.prefab @@ -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 diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 525993a..9b7c08f 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -123,6 +123,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &525349098 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalPosition.x + value: 14.336604 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2964559 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781922, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1978588693877781924, guid: 873e915995c692f458d181ba2a722d93, type: 3} + propertyPath: m_Name + value: Collapsing_Platform_Large + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 873e915995c692f458d181ba2a722d93, type: 3} --- !u!1001 &549986612 PrefabInstance: m_ObjectHideFlags: 0 @@ -136,7 +193,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} propertyPath: m_LocalPosition.x @@ -180,11 +237,141 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} +--- !u!1001 &884590263 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalPosition.x + value: -6.26068 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalPosition.y + value: 2.5227995 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410396, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: speed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410396, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: xOffset + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6709420203007410399, guid: e156a7d368002544996415bbd26e4195, type: 3} + propertyPath: m_Name + value: Moving_Platform_Small + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e156a7d368002544996415bbd26e4195, type: 3} --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} m_PrefabInstance: {fileID: 7008207193554258683} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1217403101 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalPosition.x + value: 3.3023443 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalPosition.y + value: 11.746307 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350707, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350708, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: m_Name + value: Moving_Platform_Large + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350711, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: speed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7855840617602350711, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} + propertyPath: xOffset + value: 30 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c4ec2a2c5e627f04c9c647749966358d, type: 3} --- !u!1 &1524344315 GameObject: m_ObjectHideFlags: 0 @@ -292,7 +479,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} propertyPath: m_LocalPosition.x @@ -336,6 +523,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} +--- !u!1001 &1775532378 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalPosition.x + value: -1.5640459 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalPosition.y + value: 2.4662137 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290467297792330262, guid: 960b42e9705db604bb69d624b59e079a, type: 3} + propertyPath: m_Name + value: Collapsing_Platform_Small + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 960b42e9705db604bb69d624b59e079a, type: 3} --- !u!1001 &1978252225 PrefabInstance: m_ObjectHideFlags: 0 @@ -345,7 +589,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3} propertyPath: m_LocalPosition.x @@ -406,7 +650,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3} propertyPath: m_LocalPosition.x @@ -459,11 +703,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 2662163039882375472, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_LocalPosition.x - value: 0.6162348 + value: 12.8962345 objectReference: {fileID: 0} - target: {fileID: 2662163039882375472, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_LocalPosition.y - value: 1.8504585 + value: 9.830459 objectReference: {fileID: 0} - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_RootOrder @@ -519,11 +763,11 @@ PrefabInstance: objectReference: {fileID: 1053905692} - target: {fileID: 2662163040849090937, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_LocalPosition.x - value: 0.6162348 + value: 12.8962345 objectReference: {fileID: 0} - target: {fileID: 2662163040849090937, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_LocalPosition.y - value: 1.8504585 + value: 9.830459 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} @@ -540,15 +784,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.x - value: -5.92 + value: 6.36 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.y - value: -0.14 + value: 7.84 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/Platforms/CollapsingPlatform.cs b/Assets/Scripts/Platforms/CollapsingPlatform.cs index 7a1ae49..7a021cf 100644 --- a/Assets/Scripts/Platforms/CollapsingPlatform.cs +++ b/Assets/Scripts/Platforms/CollapsingPlatform.cs @@ -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(); @@ -33,7 +42,19 @@ namespace Platforms private IEnumerator Collapse() { - GetComponent().color = Color.red; + switch (size) + { + case 1: + GetComponent().sprite = smallCollapsing; + break; + case 2: + GetComponent().sprite = mediumCollapsing; + break; + case 3: + GetComponent().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().color = Color.white; + switch (size) + { + case 1: + GetComponent().sprite = small; + break; + case 2: + GetComponent().sprite = medium; + break; + case 3: + GetComponent().sprite = large; + break; + } + ChangeState(true); } } diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.ase b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.ase index 67738d3..f80f16d 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.ase and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.ase differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.png b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.png index 43f1f6f..a9cda77 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.png and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large.png differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.ase b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.ase index 618def9..1f4eb7e 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.ase and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.ase differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.png b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.png index e5d4c6a..5902653 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.png and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Large_Collapse.png differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.ase b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.ase index 45395d8..726e39f 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.ase and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.ase differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.png b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.png index b20c886..fdd49a4 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.png and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium.png differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.ase b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.ase index 29ad6ba..e776639 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.ase and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.ase differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.png b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.png index 50a0cc7..b543f6a 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.png and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Medium_Collapse.png differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.aseprite b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.aseprite index ac4ba23..34a681d 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.aseprite and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.aseprite differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.png b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.png index 7969962..c772cbc 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.png and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small.png differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.ase b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.ase index 7260734..b6f807c 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.ase and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.ase differ diff --git a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.png b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.png index 2d97f3e..f63b52f 100644 Binary files a/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.png and b/Assets/Sprites/Platforms/CollapsingPlatforms/Collapsing_Platform_Small_Collapse.png differ diff --git a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.ase b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.ase index 67738d3..e3f4576 100644 Binary files a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.ase and b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.ase differ diff --git a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.png b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.png index 43f1f6f..b6e3558 100644 Binary files a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.png and b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Large.png differ diff --git a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.ase b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.ase index 45395d8..611f4cf 100644 Binary files a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.ase and b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.ase differ diff --git a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.png b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.png index b20c886..5d56752 100644 Binary files a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.png and b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Medium.png differ diff --git a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.ase b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.ase index ac4ba23..be6da21 100644 Binary files a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.ase and b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.ase differ diff --git a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.png b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.png index 7969962..7a513b1 100644 Binary files a/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.png and b/Assets/Sprites/Platforms/MovingPlatforms/Moving_Platform_Small.png differ diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index f960b9d..45d6cca 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4503 + 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 @@ -98,18 +98,18 @@ MonoBehaviour: y: 21 width: 871.60004 height: 472.40002 - m_Scale: {x: 0.5580282, y: 0.5580282} - m_Translation: {x: 435.80002, y: 235.75479} + m_Scale: {x: 0.5467593, y: 0.5467593} + m_Translation: {x: 435.80002, y: 236.19998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -780.9641 - y: -422.47827 - width: 1561.9282 - height: 846.5522 + x: -797.06006 + y: -431.99994 + width: 1594.1201 + height: 863.99994 m_MinimalGUI: 1 m_defaultScale: 0.5467593 m_LastWindowPixelSize: {x: 1089.5, y: 616.75} @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 4431 + 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: 92a8ffff6eaaffffcab7fffff2b7ffff98f3ffff9af3ffff0cfbffff66a60000 + m_ExpandedIDs: 9ca2ffff92a8ffff6eaaffffcab7fffff2b7ffff98f3ffff9af3ffff0cfbffff66a60000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -293,7 +293,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - 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: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003264000034640000366400003c640000626500008c650000227a0000a8a40000 + m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003464000036640000386400003a6400003c6400006265000074650000786500007c6500008065000084650000886500008c650000227a0000a8a40000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -332,24 +332,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 132.9956} - m_SelectedIDs: 6a650000 - m_LastClickedID: 25962 - m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003264000034640000366400003c640000626500008c650000227a0000a8a40000 + scrollPos: {x: 0, y: 116.49963} + m_SelectedIDs: 247fffff + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e64000030640000326400003464000036640000386400003a6400003c6400006265000074650000786500007c6500008065000084650000886500008c650000227a0000a8a40000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: SyntriaxDevScene - m_OriginalName: SyntriaxDevScene + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 25962 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 6} m_SearchString: @@ -360,8 +360,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 6a650000 - m_LastClickedInstanceID: 25962 + m_SelectedInstanceIDs: 247fffff + m_LastClickedInstanceID: -32988 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -415,7 +415,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 4504 + controlID: 7263 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -499,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 @@ -543,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 @@ -691,9 +691,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 82.42984, y: 9.690039, z: 0.49226072} + m_Target: {x: 15.626763, y: 1.9682573, z: -3.2323787} speed: 2 - m_Value: {x: 82.42984, y: 9.690039, z: 0.49226072} + m_Value: {x: 15.626763, y: 1.9682573, z: -3.2323787} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -730,9 +730,9 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 2, y: 2} @@ -744,9 +744,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 96.87461 + m_Target: 13.24111 speed: 2 - m_Value: 96.87461 + m_Value: 13.24111 m_Ortho: m_Target: 1 speed: 2 @@ -879,8 +879,8 @@ MonoBehaviour: y: 0 width: 359.19995 height: 730.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -920,8 +920,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 25962 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: -32988 + m_LastVerticalScrollValue: 272.8 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: