diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index 5af8786..601f578 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -3428,7 +3428,7 @@ PlatformEffector2D: m_Bits: 4294967295 m_RotationalOffset: 0 m_UseOneWay: 1 - m_UseOneWayGrouping: 0 + m_UseOneWayGrouping: 1 m_SurfaceArc: 180 m_UseSideFriction: 0 m_UseSideBounce: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity index bc41a6c..c4e9af7 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity @@ -4011,7 +4011,7 @@ PlatformEffector2D: m_Bits: 4294967295 m_RotationalOffset: 0 m_UseOneWay: 1 - m_UseOneWayGrouping: 0 + m_UseOneWayGrouping: 1 m_SurfaceArc: 180 m_UseSideFriction: 0 m_UseSideBounce: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index 0a6b046..0bbfa29 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -38250,6 +38250,8 @@ GameObject: - component: {fileID: 1716577442} - component: {fileID: 1716577441} - component: {fileID: 1716577445} + - component: {fileID: 1716577447} + - component: {fileID: 1716577446} m_Layer: 0 m_Name: Oneway m_TagString: OneWay @@ -38283,7 +38285,7 @@ TilemapCollider2D: m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 1 - m_UsedByComposite: 0 + m_UsedByComposite: 1 m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 @@ -38301,7 +38303,7 @@ PlatformEffector2D: m_Bits: 4294967295 m_RotationalOffset: 0 m_UseOneWay: 1 - m_UseOneWayGrouping: 0 + m_UseOneWayGrouping: 1 m_SurfaceArc: 180 m_UseSideFriction: 0 m_UseSideBounce: 0 @@ -38600,6 +38602,135 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 35c500ab519134c20a1a12500b0c969b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!66 &1716577446 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 1716577441} + m_ColliderPaths: + - - X: 20000000 + Y: -130000000 + - X: 10000000 + Y: -130000000 + - X: 10000000 + Y: -140000000 + - X: 20000000 + Y: -140000000 + - - X: -10000000 + Y: -150000000 + - X: -40000000 + Y: -150000000 + - X: -40000000 + Y: -160000000 + - X: -10000000 + Y: -160000000 + - - X: 20000000 + Y: -170000000 + - X: 0 + Y: -170000000 + - X: 0 + Y: -180000000 + - X: 20000000 + Y: -180000000 + - - X: -10000000 + Y: -190000000 + - X: -30000000 + Y: -190000000 + - X: -30000000 + Y: -200000000 + - X: -10000000 + Y: -200000000 + - - X: -50000000 + Y: -210000000 + - X: -70000000 + Y: -210000000 + - X: -70000000 + Y: -220000000 + - X: -50000000 + Y: -220000000 + - - X: -10000000 + Y: -230000000 + - X: -40000000 + Y: -230000000 + - X: -40000000 + Y: -240000000 + - X: -10000000 + Y: -240000000 + - - X: 20000000 + Y: -260000000 + - X: -10000000 + Y: -260000000 + - X: -10000000 + Y: -270000000 + - X: 20000000 + Y: -270000000 + m_CompositePaths: + m_Paths: + - - {x: 1.9999708, y: -14} + - {x: 1.9999708, y: -13} + - {x: 1, y: -13.00003} + - {x: 1.0000293, y: -14} + - - {x: -1.0000293, y: -16} + - {x: -1.0000293, y: -15} + - {x: -4, y: -15.000029} + - {x: -3.999971, y: -16} + - - {x: 1.9999708, y: -18} + - {x: 1.9999708, y: -17} + - {x: 0, y: -17.000029} + - {x: 0.000029300001, y: -18} + - - {x: -1.0000293, y: -20} + - {x: -1.0000293, y: -19} + - {x: -3, y: -19.000029} + - {x: -2.999971, y: -20} + - - {x: -5.000029, y: -22} + - {x: -5.000029, y: -21} + - {x: -7, y: -21.000029} + - {x: -6.9999704, y: -22} + - - {x: -1.0000293, y: -24} + - {x: -1.0000293, y: -23} + - {x: -4, y: -23.000029} + - {x: -3.999971, y: -24} + - - {x: 1.9999708, y: -27} + - {x: 1.9999708, y: -26} + - {x: -1, y: -26.000029} + - {x: -0.99997073, y: -27} + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 +--- !u!50 &1716577447 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &1746136367 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DogLevel/DogTunnel.unity b/MuseumGame/Assets/Scenes/DogLevel/DogTunnel.unity index 4577a5d..ffa9901 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/DogTunnel.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/DogTunnel.unity @@ -5477,6 +5477,7 @@ GameObject: - component: {fileID: 1899158039} - component: {fileID: 1899158038} - component: {fileID: 1899158037} + - component: {fileID: 1899158043} m_Layer: 0 m_Name: OneWay m_TagString: OneWay @@ -5837,7 +5838,7 @@ PlatformEffector2D: m_Bits: 4294967295 m_RotationalOffset: 0 m_UseOneWay: 1 - m_UseOneWayGrouping: 0 + m_UseOneWayGrouping: 1 m_SurfaceArc: 180 m_UseSideFriction: 0 m_UseSideBounce: 0 @@ -6170,6 +6171,18 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!114 &1899158043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35c500ab519134c20a1a12500b0c969b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/DropThroughPlatform.cs b/MuseumGame/Assets/Scripts/DropThroughPlatform.cs index 1209e94..71bad42 100644 --- a/MuseumGame/Assets/Scripts/DropThroughPlatform.cs +++ b/MuseumGame/Assets/Scripts/DropThroughPlatform.cs @@ -21,7 +21,7 @@ public class DropThroughPlatform : MonoBehaviour { if (other.gameObject.tag == "Player" && (Input.GetAxisRaw("Vertical") < 0)){ TogglePlatform(); - Invoke("TogglePlatform", 0.5f); + Invoke("TogglePlatform", .75f); } } public void TogglePlatform() diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 6ca6190..874607a 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 vcSharedLogLevel: value: 0d5e400f0650