diff --git a/Assets/Ground Physics Material.physicsMaterial2D b/Assets/Ground Physics Material.physicsMaterial2D new file mode 100644 index 0000000..7285b86 --- /dev/null +++ b/Assets/Ground Physics Material.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ground Physics Material + friction: 0.01 + bounciness: 0 diff --git a/Assets/Ground Physics Material.physicsMaterial2D.meta b/Assets/Ground Physics Material.physicsMaterial2D.meta new file mode 100644 index 0000000..37b71bd --- /dev/null +++ b/Assets/Ground Physics Material.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f4cfc102a4fc9c409ffc028af1b6389 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayerContact.cs b/Assets/PlayerContact.cs deleted file mode 100644 index 2be5f21..0000000 --- a/Assets/PlayerContact.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PlayerContact : MonoBehaviour -{ - public Player player; - - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/PlayerContact.cs.meta b/Assets/PlayerContact.cs.meta deleted file mode 100644 index 13a5a3b..0000000 --- a/Assets/PlayerContact.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 47ff2cdf170756a4792387a95db53a5f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index c9906b8..9da733e 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -1574,7 +1574,7 @@ CompositeCollider2D: m_GameObject: {fileID: 1168076122} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 2f4cfc102a4fc9c409ffc028af1b6389, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -4611,7 +4611,7 @@ Rigidbody2D: m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 2f4cfc102a4fc9c409ffc028af1b6389, type: 2} m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -47250,8 +47250,8 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 2 - m_LinearDrag: 0 + m_Mass: 1 + m_LinearDrag: 2 m_AngularDrag: 0.05 m_GravityScale: 1 m_Material: {fileID: 0} @@ -47337,8 +47337,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dec097e595825c54ebc84fbd9a143fae, type: 3} m_Name: m_EditorClassIdentifier: - runSpeed: 10 - jumpSpeed: 35 + runSpeed: 5 + jumpSpeed: 40 runFasterFactor: 1.5 groundErrorThreshold: 1.5 wallErrorThreshold: 1.6 @@ -47474,6 +47474,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1168076123} + - {fileID: 2120494077} m_Father: {fileID: 1008122163} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -47844,7 +47845,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2120494077 Transform: m_ObjectHideFlags: 0 @@ -47876,1897 +47877,7 @@ CompositeCollider2D: m_GeometryType: 0 m_GenerationType: 0 m_EdgeRadius: 0 - m_ColliderPaths: - - m_Collider: {fileID: 2120494080} - m_ColliderPaths: - - - X: 2350000128 - Y: 440000000 - - X: -180000000 - Y: 440000000 - - X: -180000000 - Y: -260000000 - - X: 2350000128 - Y: -260000000 - - - X: -150000000 - Y: -230000000 - - X: -150000000 - Y: -70000000 - - X: 120000000 - Y: -70000000 - - X: 120000000 - Y: -50000000 - - X: 150000000 - Y: -50000000 - - X: 150000000 - Y: -70000000 - - X: 310000000 - Y: -70000000 - - X: 310000000 - Y: -180000000 - - X: -30000000 - Y: -180000000 - - X: -30000000 - Y: -200000000 - - X: 340000000 - Y: -200000000 - - X: 340000000 - Y: -50000000 - - X: 430000000 - Y: -50000000 - - X: 430000000 - Y: -200000000 - - X: 460000000 - Y: -200000000 - - X: 460000000 - Y: 10000000 - - X: 470000000 - Y: 10000000 - - X: 470000000 - Y: 70000000 - - X: 450000000 - Y: 70000000 - - X: 450000000 - Y: 60000000 - - X: 440000000 - Y: 60000000 - - X: 440000000 - Y: 50000000 - - X: 430000000 - Y: 50000000 - - X: 430000000 - Y: 40000000 - - X: 420000000 - Y: 40000000 - - X: 420000000 - Y: 30000000 - - X: 410000000 - Y: 30000000 - - X: 410000000 - Y: 20000000 - - X: 400000000 - Y: 20000000 - - X: 400000000 - Y: 10000000 - - X: 390000000 - Y: 10000000 - - X: 390000000 - Y: 0 - - X: 380000000 - Y: 0 - - X: 380000000 - Y: -10000000 - - X: 370000000 - Y: -10000000 - - X: 370000000 - Y: -20000000 - - X: 300000000 - Y: -20000000 - - X: 300000000 - Y: 10000000 - - X: 330000000 - Y: 10000000 - - X: 330000000 - Y: 30000000 - - X: 280000000 - Y: 30000000 - - X: 280000000 - Y: -40000000 - - X: 180000000 - Y: -40000000 - - X: 180000000 - Y: -20000000 - - X: 90000000 - Y: -20000000 - - X: 90000000 - Y: -40000000 - - X: -150000000 - Y: -40000000 - - X: -150000000 - Y: 410000000 - - X: 2320000000 - Y: 410000000 - - X: 2320000000 - Y: 280000000 - - X: 2300000000 - Y: 280000000 - - X: 2300000000 - Y: 260000000 - - X: 2270000128 - Y: 260000000 - - X: 2270000128 - Y: 240000000 - - X: 2320000000 - Y: 240000000 - - X: 2320000000 - Y: 120000000 - - X: 2300000000 - Y: 120000000 - - X: 2300000000 - Y: 100000000 - - X: 2320000000 - Y: 100000000 - - X: 2320000000 - Y: -90000000 - - X: 2310000128 - Y: -90000000 - - X: 2310000128 - Y: -110000000 - - X: 2320000000 - Y: -110000000 - - X: 2320000000 - Y: -230000000 - - X: 1620000000 - Y: -230000000 - - X: 1620000000 - Y: -120000000 - - X: 1590000000 - Y: -120000000 - - X: 1590000000 - Y: -230000000 - - X: 1530000000 - Y: -230000000 - - X: 1530000000 - Y: -220000000 - - X: 1510000000 - Y: -220000000 - - X: 1510000000 - Y: -230000000 - - X: 1390000000 - Y: -230000000 - - X: 1390000000 - Y: -160000000 - - X: 1350000000 - Y: -160000000 - - X: 1350000000 - Y: -180000000 - - X: 1360000000 - Y: -180000000 - - X: 1360000000 - Y: -230000000 - - X: 400000000 - Y: -230000000 - - X: 400000000 - Y: -190000000 - - X: 380000000 - Y: -190000000 - - X: 380000000 - Y: -150000000 - - X: 360000000 - Y: -150000000 - - X: 360000000 - Y: -230000000 - - X: -60000000 - Y: -230000000 - - X: -60000000 - Y: -150000000 - - X: 280000000 - Y: -150000000 - - X: 280000000 - Y: -130000000 - - X: -140000000 - Y: -130000000 - - X: -140000000 - Y: -150000000 - - X: -80000000 - Y: -150000000 - - X: -80000000 - Y: -230000000 - - - X: 960000000 - Y: 350000000 - - X: 970000000 - Y: 350000000 - - X: 970000000 - Y: 360000000 - - X: 980000000 - Y: 360000000 - - X: 980000000 - Y: 380000000 - - X: 990000000 - Y: 380000000 - - X: 990000000 - Y: 400000000 - - X: 950000000 - Y: 400000000 - - X: 950000000 - Y: 340000000 - - X: 960000000 - Y: 340000000 - - - X: 1620000000 - Y: 300000000 - - X: 1660000000 - Y: 300000000 - - X: 1660000000 - Y: 320000000 - - X: 1620000000 - Y: 320000000 - - X: 1620000000 - Y: 360000000 - - X: 1630000000 - Y: 360000000 - - X: 1630000000 - Y: 370000000 - - X: 1620000000 - Y: 370000000 - - X: 1620000000 - Y: 380000000 - - X: 1590000000 - Y: 380000000 - - X: 1590000000 - Y: 60000000 - - X: 1570000000 - Y: 60000000 - - X: 1570000000 - Y: 40000000 - - X: 1590000000 - Y: 40000000 - - X: 1590000000 - Y: -70000000 - - X: 1620000000 - Y: -70000000 - - - X: 930000000 - Y: 370000000 - - X: 910000000 - Y: 370000000 - - X: 910000000 - Y: 380000000 - - X: 900000000 - Y: 380000000 - - X: 900000000 - Y: 340000000 - - X: 910000000 - Y: 340000000 - - X: 910000000 - Y: 330000000 - - X: 920000000 - Y: 330000000 - - X: 920000000 - Y: 320000000 - - X: 930000000 - Y: 320000000 - - - X: -40000000 - Y: 200000000 - - X: -30000000 - Y: 200000000 - - X: -30000000 - Y: 210000000 - - X: -20000000 - Y: 210000000 - - X: -20000000 - Y: 180000000 - - X: -10000000 - Y: 180000000 - - X: -10000000 - Y: 170000000 - - X: 0 - Y: 170000000 - - X: 0 - Y: 210000000 - - X: 10000000 - Y: 210000000 - - X: 10000000 - Y: 200000000 - - X: 30000000 - Y: 200000000 - - X: 30000000 - Y: 180000000 - - X: 50000000 - Y: 180000000 - - X: 50000000 - Y: 190000000 - - X: 40000000 - Y: 190000000 - - X: 40000000 - Y: 210000000 - - X: 30000000 - Y: 210000000 - - X: 30000000 - Y: 220000000 - - X: 20000000 - Y: 220000000 - - X: 20000000 - Y: 230000000 - - X: 30000000 - Y: 230000000 - - X: 30000000 - Y: 240000000 - - X: 40000000 - Y: 240000000 - - X: 40000000 - Y: 340000000 - - X: 60000000 - Y: 340000000 - - X: 60000000 - Y: 360000000 - - X: 50000000 - Y: 360000000 - - X: 50000000 - Y: 380000000 - - X: -120000000 - Y: 380000000 - - X: -120000000 - Y: 370000000 - - X: 40000000 - Y: 370000000 - - X: 40000000 - Y: 350000000 - - X: -80000000 - Y: 350000000 - - X: -80000000 - Y: 340000000 - - X: -100000000 - Y: 340000000 - - X: -100000000 - Y: 330000000 - - X: -110000000 - Y: 330000000 - - X: -110000000 - Y: 350000000 - - X: -100000000 - Y: 350000000 - - X: -100000000 - Y: 360000000 - - X: -120000000 - Y: 360000000 - - X: -120000000 - Y: 370000000 - - X: -130000000 - Y: 370000000 - - X: -130000000 - Y: 360000000 - - X: -140000000 - Y: 360000000 - - X: -140000000 - Y: 340000000 - - X: -120000000 - Y: 340000000 - - X: -120000000 - Y: 310000000 - - X: -110000000 - Y: 310000000 - - X: -110000000 - Y: 320000000 - - X: -100000000 - Y: 320000000 - - X: -100000000 - Y: 230000000 - - X: -90000000 - Y: 230000000 - - X: -90000000 - Y: 220000000 - - X: -80000000 - Y: 220000000 - - X: -80000000 - Y: 210000000 - - X: -100000000 - Y: 210000000 - - X: -100000000 - Y: 200000000 - - X: -110000000 - Y: 200000000 - - X: -110000000 - Y: 180000000 - - X: -100000000 - Y: 180000000 - - X: -100000000 - Y: 190000000 - - X: -90000000 - Y: 190000000 - - X: -90000000 - Y: 200000000 - - X: -70000000 - Y: 200000000 - - X: -70000000 - Y: 210000000 - - X: -50000000 - Y: 210000000 - - X: -50000000 - Y: 180000000 - - X: -60000000 - Y: 180000000 - - X: -60000000 - Y: 170000000 - - X: -40000000 - Y: 170000000 - - - X: 1360000000 - Y: 370000000 - - X: 1290000000 - Y: 370000000 - - X: 1290000000 - Y: 350000000 - - X: 1360000000 - Y: 350000000 - - - X: 980000000 - Y: 320000000 - - X: 1010000000 - Y: 320000000 - - X: 1010000000 - Y: 350000000 - - X: 1000000000 - Y: 350000000 - - X: 1000000000 - Y: 340000000 - - X: 970000000 - Y: 340000000 - - X: 970000000 - Y: 320000000 - - X: 960000000 - Y: 320000000 - - X: 960000000 - Y: 310000000 - - X: 980000000 - Y: 310000000 - - - X: -70000000 - Y: 220000000 - - X: -70000000 - Y: 230000000 - - X: -80000000 - Y: 230000000 - - X: -80000000 - Y: 240000000 - - X: -90000000 - Y: 240000000 - - X: -90000000 - Y: 330000000 - - X: -70000000 - Y: 330000000 - - X: -70000000 - Y: 340000000 - - X: 30000000 - Y: 340000000 - - X: 30000000 - Y: 250000000 - - X: 20000000 - Y: 250000000 - - X: 20000000 - Y: 240000000 - - X: 10000000 - Y: 240000000 - - X: 10000000 - Y: 230000000 - - X: -40000000 - Y: 230000000 - - X: -40000000 - Y: 220000000 - - - X: 2289999872 - Y: 320000000 - - X: 2280000000 - Y: 320000000 - - X: 2280000000 - Y: 300000000 - - X: 2289999872 - Y: 300000000 - - - X: 2240000000 - Y: 320000000 - - X: 2220000000 - Y: 320000000 - - X: 2220000000 - Y: 310000000 - - X: 2240000000 - Y: 310000000 - - - X: 2209999872 - Y: 320000000 - - X: 2200000000 - Y: 320000000 - - X: 2200000000 - Y: 300000000 - - X: 2209999872 - Y: 300000000 - - - X: 2190000128 - Y: 320000000 - - X: 2180000000 - Y: 320000000 - - X: 2180000000 - Y: 310000000 - - X: 2190000128 - Y: 310000000 - - - X: 2169999872 - Y: 320000000 - - X: 2160000000 - Y: 320000000 - - X: 2160000000 - Y: 300000000 - - X: 2169999872 - Y: 300000000 - - - X: 2150000128 - Y: 320000000 - - X: 2140000000 - Y: 320000000 - - X: 2140000000 - Y: 310000000 - - X: 2150000128 - Y: 310000000 - - - X: 2130000000 - Y: 320000000 - - X: 2120000000 - Y: 320000000 - - X: 2120000000 - Y: 310000000 - - X: 2130000000 - Y: 310000000 - - - X: 2110000000 - Y: 320000000 - - X: 2100000000 - Y: 320000000 - - X: 2100000000 - Y: 310000000 - - X: 2110000000 - Y: 310000000 - - - X: 2090000000 - Y: 320000000 - - X: 2080000000 - Y: 320000000 - - X: 2080000000 - Y: 300000000 - - X: 2090000000 - Y: 300000000 - - - X: 2070000000 - Y: 320000000 - - X: 2060000000 - Y: 320000000 - - X: 2060000000 - Y: 310000000 - - X: 2070000000 - Y: 310000000 - - - X: 2050000000 - Y: 320000000 - - X: 2040000000 - Y: 320000000 - - X: 2040000000 - Y: 300000000 - - X: 2050000000 - Y: 300000000 - - - X: 2030000000 - Y: 320000000 - - X: 2020000000 - Y: 320000000 - - X: 2020000000 - Y: 310000000 - - X: 2030000000 - Y: 310000000 - - - X: 2010000000 - Y: 320000000 - - X: 2000000000 - Y: 320000000 - - X: 2000000000 - Y: 310000000 - - X: 2010000000 - Y: 310000000 - - - X: 1990000000 - Y: 320000000 - - X: 1980000000 - Y: 320000000 - - X: 1980000000 - Y: 310000000 - - X: 1990000000 - Y: 310000000 - - - X: 1970000000 - Y: 320000000 - - X: 1960000000 - Y: 320000000 - - X: 1960000000 - Y: 300000000 - - X: 1970000000 - Y: 300000000 - - - X: 1950000000 - Y: 320000000 - - X: 1940000000 - Y: 320000000 - - X: 1940000000 - Y: 310000000 - - X: 1950000000 - Y: 310000000 - - - X: 1930000000 - Y: 320000000 - - X: 1920000000 - Y: 320000000 - - X: 1920000000 - Y: 300000000 - - X: 1930000000 - Y: 300000000 - - - X: 1910000000 - Y: 320000000 - - X: 1900000000 - Y: 320000000 - - X: 1900000000 - Y: 310000000 - - X: 1910000000 - Y: 310000000 - - - X: 1890000000 - Y: 320000000 - - X: 1880000000 - Y: 320000000 - - X: 1880000000 - Y: 310000000 - - X: 1890000000 - Y: 310000000 - - - X: 1870000000 - Y: 320000000 - - X: 1860000000 - Y: 320000000 - - X: 1860000000 - Y: 310000000 - - X: 1870000000 - Y: 310000000 - - - X: 1850000000 - Y: 320000000 - - X: 1840000000 - Y: 320000000 - - X: 1840000000 - Y: 300000000 - - X: 1850000000 - Y: 300000000 - - - X: 1830000000 - Y: 320000000 - - X: 1820000000 - Y: 320000000 - - X: 1820000000 - Y: 310000000 - - X: 1830000000 - Y: 310000000 - - - X: 1710000000 - Y: 310000000 - - X: 1730000000 - Y: 310000000 - - X: 1730000000 - Y: 320000000 - - X: 1700000000 - Y: 320000000 - - X: 1700000000 - Y: 300000000 - - X: 1710000000 - Y: 300000000 - - - X: 1790000000 - Y: 320000000 - - X: 1780000000 - Y: 320000000 - - X: 1780000000 - Y: 310000000 - - X: 1790000000 - Y: 310000000 - - - X: 1770000000 - Y: 320000000 - - X: 1760000000 - Y: 320000000 - - X: 1760000000 - Y: 300000000 - - X: 1770000000 - Y: 300000000 - - - X: 1750000000 - Y: 320000000 - - X: 1740000000 - Y: 320000000 - - X: 1740000000 - Y: 310000000 - - X: 1750000000 - Y: 310000000 - - - X: 1380000000 - Y: 320000000 - - X: 1270000000 - Y: 320000000 - - X: 1270000000 - Y: 300000000 - - X: 1380000000 - Y: 300000000 - - - X: 1810000000 - Y: 320000000 - - X: 1800000000 - Y: 320000000 - - X: 1800000000 - Y: 300000000 - - X: 1810000000 - Y: 300000000 - - - X: 20000000 - Y: 320000000 - - X: -20000000 - Y: 320000000 - - X: -20000000 - Y: 300000000 - - X: 20000000 - Y: 300000000 - - - X: -40000000 - Y: 320000000 - - X: -80000000 - Y: 320000000 - - X: -80000000 - Y: 300000000 - - X: -40000000 - Y: 300000000 - - - X: 410000000 - Y: 300000000 - - X: 270000000 - Y: 300000000 - - X: 270000000 - Y: 280000000 - - X: 410000000 - Y: 280000000 - - - X: 1010000000 - Y: 90000000 - - X: 1020000000 - Y: 90000000 - - X: 1020000000 - Y: 100000000 - - X: 1030000000 - Y: 100000000 - - X: 1030000000 - Y: 110000000 - - X: 1040000000 - Y: 110000000 - - X: 1040000000 - Y: 120000000 - - X: 1050000000 - Y: 120000000 - - X: 1050000000 - Y: 130000000 - - X: 1060000000 - Y: 130000000 - - X: 1060000000 - Y: 140000000 - - X: 1070000000 - Y: 140000000 - - X: 1070000000 - Y: 150000000 - - X: 1080000000 - Y: 150000000 - - X: 1080000000 - Y: 160000000 - - X: 1090000000 - Y: 160000000 - - X: 1090000000 - Y: 170000000 - - X: 1120000000 - Y: 170000000 - - X: 1120000000 - Y: 180000000 - - X: 1130000000 - Y: 180000000 - - X: 1130000000 - Y: 190000000 - - X: 1140000000 - Y: 190000000 - - X: 1140000000 - Y: 200000000 - - X: 1150000000 - Y: 200000000 - - X: 1150000000 - Y: 210000000 - - X: 1140000000 - Y: 210000000 - - X: 1140000000 - Y: 220000000 - - X: 1130000000 - Y: 220000000 - - X: 1130000000 - Y: 230000000 - - X: 1080000000 - Y: 230000000 - - X: 1080000000 - Y: 240000000 - - X: 1070000000 - Y: 240000000 - - X: 1070000000 - Y: 250000000 - - X: 970000000 - Y: 250000000 - - X: 970000000 - Y: 260000000 - - X: 950000000 - Y: 260000000 - - X: 950000000 - Y: 270000000 - - X: 910000000 - Y: 270000000 - - X: 910000000 - Y: 260000000 - - X: 890000000 - Y: 260000000 - - X: 890000000 - Y: 250000000 - - X: 790000000 - Y: 250000000 - - X: 790000000 - Y: 300000000 - - X: 430000000 - Y: 300000000 - - X: 430000000 - Y: 280000000 - - X: 770000000 - Y: 280000000 - - X: 770000000 - Y: 230000000 - - X: 750000000 - Y: 230000000 - - X: 750000000 - Y: 220000000 - - X: 740000000 - Y: 220000000 - - X: 740000000 - Y: 210000000 - - X: 730000000 - Y: 210000000 - - X: 730000000 - Y: 200000000 - - X: 740000000 - Y: 200000000 - - X: 740000000 - Y: 190000000 - - X: 750000000 - Y: 190000000 - - X: 750000000 - Y: 180000000 - - X: 760000000 - Y: 180000000 - - X: 760000000 - Y: 170000000 - - X: 780000000 - Y: 170000000 - - X: 780000000 - Y: 160000000 - - X: 790000000 - Y: 160000000 - - X: 790000000 - Y: 150000000 - - X: 800000000 - Y: 150000000 - - X: 800000000 - Y: 140000000 - - X: 810000000 - Y: 140000000 - - X: 810000000 - Y: 130000000 - - X: 820000000 - Y: 130000000 - - X: 820000000 - Y: 120000000 - - X: 830000000 - Y: 120000000 - - X: 830000000 - Y: 110000000 - - X: 840000000 - Y: 110000000 - - X: 840000000 - Y: 130000000 - - X: 830000000 - Y: 130000000 - - X: 830000000 - Y: 140000000 - - X: 820000000 - Y: 140000000 - - X: 820000000 - Y: 150000000 - - X: 810000000 - Y: 150000000 - - X: 810000000 - Y: 170000000 - - X: 800000000 - Y: 170000000 - - X: 800000000 - Y: 180000000 - - X: 790000000 - Y: 180000000 - - X: 790000000 - Y: 210000000 - - X: 810000000 - Y: 210000000 - - X: 810000000 - Y: 220000000 - - X: 820000000 - Y: 220000000 - - X: 820000000 - Y: 230000000 - - X: 1060000000 - Y: 230000000 - - X: 1060000000 - Y: 220000000 - - X: 1070000000 - Y: 220000000 - - X: 1070000000 - Y: 210000000 - - X: 1090000000 - Y: 210000000 - - X: 1090000000 - Y: 180000000 - - X: 1080000000 - Y: 180000000 - - X: 1080000000 - Y: 170000000 - - X: 1070000000 - Y: 170000000 - - X: 1070000000 - Y: 160000000 - - X: 1060000000 - Y: 160000000 - - X: 1060000000 - Y: 150000000 - - X: 1050000000 - Y: 150000000 - - X: 1050000000 - Y: 140000000 - - X: 1040000000 - Y: 140000000 - - X: 1040000000 - Y: 130000000 - - X: 1030000000 - Y: 130000000 - - X: 1030000000 - Y: 120000000 - - X: 1020000000 - Y: 120000000 - - X: 1020000000 - Y: 110000000 - - X: 1010000000 - Y: 110000000 - - X: 1010000000 - Y: 100000000 - - X: 990000000 - Y: 100000000 - - X: 990000000 - Y: 90000000 - - X: 860000000 - Y: 90000000 - - X: 860000000 - Y: 70000000 - - X: 1010000000 - Y: 70000000 - - - X: -50000000 - Y: 290000000 - - X: -60000000 - Y: 290000000 - - X: -60000000 - Y: 280000000 - - X: -50000000 - Y: 280000000 - - - X: 0 - Y: 290000000 - - X: -10000000 - Y: 290000000 - - X: -10000000 - Y: 280000000 - - X: 0 - Y: 280000000 - - - X: 1400000000 - Y: 270000000 - - X: 1250000000 - Y: 270000000 - - X: 1250000000 - Y: 250000000 - - X: 1400000000 - Y: 250000000 - - - X: -10000000 - Y: 260000000 - - X: -50000000 - Y: 260000000 - - X: -50000000 - Y: 250000000 - - X: -10000000 - Y: 250000000 - - - X: 2240000000 - Y: 260000000 - - X: 2169999872 - Y: 260000000 - - X: 2169999872 - Y: 240000000 - - X: 2240000000 - Y: 240000000 - - - X: 1430000000 - Y: 220000000 - - X: 1220000000 - Y: 220000000 - - X: 1220000000 - Y: 200000000 - - X: 1430000000 - Y: 200000000 - - - X: 430000000 - Y: 220000000 - - X: 410000000 - Y: 220000000 - - X: 410000000 - Y: 200000000 - - X: 430000000 - Y: 200000000 - - - X: 2050000000 - Y: 220000000 - - X: 2040000000 - Y: 220000000 - - X: 2040000000 - Y: 210000000 - - X: 2050000000 - Y: 210000000 - - - X: 1990000000 - Y: 210000000 - - X: 1990000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 - Y: 160000000 - - X: 2040000000 - Y: 160000000 - - X: 2040000000 - Y: 210000000 - - X: 2030000000 - Y: 210000000 - - X: 2030000000 - Y: 200000000 - - X: 2020000000 - Y: 200000000 - - X: 2020000000 - Y: 220000000 - - X: 2010000000 - Y: 220000000 - - X: 2010000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 - Y: 210000000 - - - X: 1990000000 - Y: 220000000 - - X: 1980000000 - Y: 220000000 - - X: 1980000000 - Y: 210000000 - - X: 1990000000 - Y: 210000000 - - - X: 1920000000 - Y: 220000000 - - X: 1910000000 - Y: 220000000 - - X: 1910000000 - Y: 210000000 - - X: 1920000000 - Y: 210000000 - - - X: 1850000000 - Y: 220000000 - - X: 1850000000 - Y: 200000000 - - X: 1860000000 - Y: 200000000 - - X: 1860000000 - Y: 160000000 - - X: 1900000000 - Y: 160000000 - - X: 1900000000 - Y: 200000000 - - X: 1890000000 - Y: 200000000 - - X: 1890000000 - Y: 220000000 - - X: 1880000000 - Y: 220000000 - - X: 1880000000 - Y: 200000000 - - X: 1860000000 - Y: 200000000 - - X: 1860000000 - Y: 220000000 - - - X: 1910000000 - Y: 210000000 - - X: 1900000000 - Y: 210000000 - - X: 1900000000 - Y: 200000000 - - X: 1910000000 - Y: 200000000 - - - X: 1770000000 - Y: 160000000 - - X: 1780000000 - Y: 160000000 - - X: 1780000000 - Y: 180000000 - - X: 1790000000 - Y: 180000000 - - X: 1790000000 - Y: 190000000 - - X: 1780000000 - Y: 190000000 - - X: 1780000000 - Y: 200000000 - - X: 1770000000 - Y: 200000000 - - X: 1770000000 - Y: 210000000 - - X: 1730000000 - Y: 210000000 - - X: 1730000000 - Y: 150000000 - - X: 1740000000 - Y: 150000000 - - X: 1740000000 - Y: 140000000 - - X: 1770000000 - Y: 140000000 - - - X: 2160000000 - Y: 210000000 - - X: 2130000000 - Y: 210000000 - - X: 2130000000 - Y: 200000000 - - X: 2120000000 - Y: 200000000 - - X: 2120000000 - Y: 190000000 - - X: 2110000000 - Y: 190000000 - - X: 2110000000 - Y: 180000000 - - X: 2120000000 - Y: 180000000 - - X: 2120000000 - Y: 160000000 - - X: 2130000000 - Y: 160000000 - - X: 2130000000 - Y: 150000000 - - X: 2160000000 - Y: 150000000 - - - X: 2140000000 - Y: 170000000 - - X: 2140000000 - Y: 180000000 - - X: 2130000000 - Y: 180000000 - - X: 2130000000 - Y: 190000000 - - X: 2140000000 - Y: 190000000 - - X: 2140000000 - Y: 200000000 - - X: 2150000128 - Y: 200000000 - - X: 2150000128 - Y: 170000000 - - - X: 710000000 - Y: 200000000 - - X: 690000000 - Y: 200000000 - - X: 690000000 - Y: 180000000 - - X: 710000000 - Y: 180000000 - - - X: 1750000000 - Y: 160000000 - - X: 1750000000 - Y: 190000000 - - X: 1740000000 - Y: 190000000 - - X: 1740000000 - Y: 200000000 - - X: 1760000000 - Y: 200000000 - - X: 1760000000 - Y: 190000000 - - X: 1770000000 - Y: 190000000 - - X: 1770000000 - Y: 180000000 - - X: 1760000000 - Y: 180000000 - - X: 1760000000 - Y: 160000000 - - - X: 1960000000 - Y: 190000000 - - X: 1940000000 - Y: 190000000 - - X: 1940000000 - Y: 120000000 - - X: 1960000000 - Y: 120000000 - - - X: 1470000000 - Y: 180000000 - - X: 1450000000 - Y: 180000000 - - X: 1450000000 - Y: 160000000 - - X: 1470000000 - Y: 160000000 - - - X: 730000000 - Y: 150000000 - - X: 710000000 - Y: 150000000 - - X: 710000000 - Y: 130000000 - - X: 730000000 - Y: 130000000 - - - X: 1800000000 - Y: 130000000 - - X: 1810000000 - Y: 130000000 - - X: 1810000000 - Y: 140000000 - - X: 1790000000 - Y: 140000000 - - X: 1790000000 - Y: 120000000 - - X: 1800000000 - Y: 120000000 - - - X: 2110000000 - Y: 140000000 - - X: 2090000000 - Y: 140000000 - - X: 2090000000 - Y: 130000000 - - X: 2080000000 - Y: 130000000 - - X: 2080000000 - Y: 120000000 - - X: 2110000000 - Y: 120000000 - - - X: 520000000 - Y: 140000000 - - X: 480000000 - Y: 140000000 - - X: 480000000 - Y: 120000000 - - X: 520000000 - Y: 120000000 - - - X: 1510000000 - Y: 140000000 - - X: 1490000000 - Y: 140000000 - - X: 1490000000 - Y: 120000000 - - X: 1510000000 - Y: 120000000 - - - X: 450000000 - Y: 120000000 - - X: 370000000 - Y: 120000000 - - X: 370000000 - Y: 100000000 - - X: 450000000 - Y: 100000000 - - - X: 1280000000 - Y: 20000000 - - X: 1300000000 - Y: 20000000 - - X: 1300000000 - Y: 30000000 - - X: 1310000000 - Y: 30000000 - - X: 1310000000 - Y: 40000000 - - X: 1320000000 - Y: 40000000 - - X: 1320000000 - Y: 50000000 - - X: 1330000000 - Y: 50000000 - - X: 1330000000 - Y: 60000000 - - X: 1340000000 - Y: 60000000 - - X: 1340000000 - Y: 70000000 - - X: 1320000000 - Y: 70000000 - - X: 1320000000 - Y: 60000000 - - X: 1310000000 - Y: 60000000 - - X: 1310000000 - Y: 50000000 - - X: 1300000000 - Y: 50000000 - - X: 1300000000 - Y: 40000000 - - X: 1280000000 - Y: 40000000 - - X: 1280000000 - Y: 70000000 - - X: 1300000000 - Y: 70000000 - - X: 1300000000 - Y: 100000000 - - X: 1290000000 - Y: 100000000 - - X: 1290000000 - Y: 80000000 - - X: 1280000000 - Y: 80000000 - - X: 1280000000 - Y: 100000000 - - X: 1270000000 - Y: 100000000 - - X: 1270000000 - Y: 80000000 - - X: 1260000000 - Y: 80000000 - - X: 1260000000 - Y: 100000000 - - X: 1250000000 - Y: 100000000 - - X: 1250000000 - Y: 70000000 - - X: 1270000000 - Y: 70000000 - - X: 1270000000 - Y: 40000000 - - X: 1250000000 - Y: 40000000 - - X: 1250000000 - Y: 50000000 - - X: 1240000000 - Y: 50000000 - - X: 1240000000 - Y: 60000000 - - X: 1230000000 - Y: 60000000 - - X: 1230000000 - Y: 70000000 - - X: 1210000000 - Y: 70000000 - - X: 1210000000 - Y: 60000000 - - X: 1220000000 - Y: 60000000 - - X: 1220000000 - Y: 50000000 - - X: 1230000000 - Y: 50000000 - - X: 1230000000 - Y: 40000000 - - X: 1240000000 - Y: 40000000 - - X: 1240000000 - Y: 30000000 - - X: 1250000000 - Y: 30000000 - - X: 1250000000 - Y: 20000000 - - X: 1270000000 - Y: 20000000 - - X: 1270000000 - Y: 10000000 - - X: 1280000000 - Y: 10000000 - - - X: 1550000000 - Y: 100000000 - - X: 1530000000 - Y: 100000000 - - X: 1530000000 - Y: 80000000 - - X: 1550000000 - Y: 80000000 - - - X: 760000000 - Y: 100000000 - - X: 700000000 - Y: 100000000 - - X: 700000000 - Y: 80000000 - - X: 760000000 - Y: 80000000 - - - X: 2040000000 - Y: 50000000 - - X: 2050000000 - Y: 50000000 - - X: 2050000000 - Y: 60000000 - - X: 2060000000 - Y: 60000000 - - X: 2060000000 - Y: 70000000 - - X: 2070000000 - Y: 70000000 - - X: 2070000000 - Y: 80000000 - - X: 2080000000 - Y: 80000000 - - X: 2080000000 - Y: 90000000 - - X: 1820000000 - Y: 90000000 - - X: 1820000000 - Y: 80000000 - - X: 1830000000 - Y: 80000000 - - X: 1830000000 - Y: 70000000 - - X: 1840000000 - Y: 70000000 - - X: 1840000000 - Y: 60000000 - - X: 1850000000 - Y: 60000000 - - X: 1850000000 - Y: 50000000 - - X: 1860000000 - Y: 50000000 - - X: 1860000000 - Y: 40000000 - - X: 2040000000 - Y: 40000000 - - - X: 2220000000 - Y: 80000000 - - X: 2169999872 - Y: 80000000 - - X: 2169999872 - Y: 50000000 - - X: 2220000000 - Y: 50000000 - - - X: 290000000 - Y: 80000000 - - X: 240000000 - Y: 80000000 - - X: 240000000 - Y: 60000000 - - X: 290000000 - Y: 60000000 - - - X: 380000000 - Y: 70000000 - - X: 330000000 - Y: 70000000 - - X: 330000000 - Y: 50000000 - - X: 380000000 - Y: 50000000 - - - X: 1880000000 - Y: 50000000 - - X: 1880000000 - Y: 70000000 - - X: 2020000000 - Y: 70000000 - - X: 2020000000 - Y: 50000000 - - - X: 1800000000 - Y: 60000000 - - X: 1770000000 - Y: 60000000 - - X: 1770000000 - Y: 40000000 - - X: 1800000000 - Y: 40000000 - - - X: 910000000 - Y: -110000000 - - X: 1030000000 - Y: -110000000 - - X: 1030000000 - Y: -80000000 - - X: 1110000000 - Y: -80000000 - - X: 1110000000 - Y: -40000000 - - X: 1180000000 - Y: -40000000 - - X: 1180000000 - Y: -50000000 - - X: 1220000000 - Y: -50000000 - - X: 1220000000 - Y: -60000000 - - X: 1360000000 - Y: -60000000 - - X: 1360000000 - Y: -130000000 - - X: 1390000000 - Y: -130000000 - - X: 1390000000 - Y: -30000000 - - X: 1160000000 - Y: -30000000 - - X: 1160000000 - Y: -10000000 - - X: 1080000000 - Y: -10000000 - - X: 1080000000 - Y: -50000000 - - X: 1000000000 - Y: -50000000 - - X: 1000000000 - Y: -80000000 - - X: 910000000 - Y: -80000000 - - X: 910000000 - Y: -20000000 - - X: 730000000 - Y: -20000000 - - X: 730000000 - Y: 10000000 - - X: 720000000 - Y: 10000000 - - X: 720000000 - Y: 20000000 - - X: 680000000 - Y: 20000000 - - X: 680000000 - Y: 60000000 - - X: 660000000 - Y: 60000000 - - X: 660000000 - Y: 40000000 - - X: 640000000 - Y: 40000000 - - X: 640000000 - Y: 20000000 - - X: 620000000 - Y: 20000000 - - X: 620000000 - Y: 10000000 - - X: 610000000 - Y: 10000000 - - X: 610000000 - Y: -20000000 - - X: 470000000 - Y: -20000000 - - X: 470000000 - Y: -50000000 - - X: 880000000 - Y: -50000000 - - X: 880000000 - Y: -200000000 - - X: 910000000 - Y: -200000000 - - - X: 840000000 - Y: 50000000 - - X: 760000000 - Y: 50000000 - - X: 760000000 - Y: 30000000 - - X: 840000000 - Y: 30000000 - - - X: 1010000000 - Y: 40000000 - - X: 970000000 - Y: 40000000 - - X: 970000000 - Y: 20000000 - - X: 1010000000 - Y: 20000000 - - - X: 590000000 - Y: 30000000 - - X: 520000000 - Y: 30000000 - - X: 520000000 - Y: 10000000 - - X: 590000000 - Y: 10000000 - - - X: 250000000 - Y: 30000000 - - X: 160000000 - Y: 30000000 - - X: 160000000 - Y: 10000000 - - X: 250000000 - Y: 10000000 - - - X: 2270000128 - Y: 20000000 - - X: 2260000000 - Y: 20000000 - - X: 2260000000 - Y: 10000000 - - X: 2270000128 - Y: 10000000 - - - X: 2160000000 - Y: -40000000 - - X: 2150000128 - Y: -40000000 - - X: 2150000128 - Y: -30000000 - - X: 2080000000 - Y: -30000000 - - X: 2080000000 - Y: 10000000 - - X: 2050000000 - Y: 10000000 - - X: 2050000000 - Y: -30000000 - - X: 2030000000 - Y: -30000000 - - X: 2030000000 - Y: 10000000 - - X: 2010000000 - Y: 10000000 - - X: 2010000000 - Y: -30000000 - - X: 1990000000 - Y: -30000000 - - X: 1990000000 - Y: 10000000 - - X: 1980000000 - Y: 10000000 - - X: 1980000000 - Y: -30000000 - - X: 1960000000 - Y: -30000000 - - X: 1960000000 - Y: 10000000 - - X: 1950000000 - Y: 10000000 - - X: 1950000000 - Y: -30000000 - - X: 1930000000 - Y: -30000000 - - X: 1930000000 - Y: 10000000 - - X: 1910000000 - Y: 10000000 - - X: 1910000000 - Y: -30000000 - - X: 1890000000 - Y: -30000000 - - X: 1890000000 - Y: 10000000 - - X: 1860000000 - Y: 10000000 - - X: 1860000000 - Y: -30000000 - - X: 1770000000 - Y: -30000000 - - X: 1770000000 - Y: -60000000 - - X: 2160000000 - Y: -60000000 - - - X: 1750000000 - Y: 10000000 - - X: 1670000000 - Y: 10000000 - - X: 1670000000 - Y: -20000000 - - X: 1750000000 - Y: -20000000 - - - X: 1660000000 - Y: -40000000 - - X: 1640000000 - Y: -40000000 - - X: 1640000000 - Y: -140000000 - - X: 1660000000 - Y: -140000000 - - - X: 2270000128 - Y: -50000000 - - X: 2260000000 - Y: -50000000 - - X: 2260000000 - Y: -60000000 - - X: 2270000128 - Y: -60000000 - - - X: 1430000000 - Y: -50000000 - - X: 1410000000 - Y: -50000000 - - X: 1410000000 - Y: -70000000 - - X: 1430000000 - Y: -70000000 - - - X: 1160000000 - Y: -80000000 - - X: 1130000000 - Y: -80000000 - - X: 1130000000 - Y: -110000000 - - X: 1160000000 - Y: -110000000 - - - X: 1240000000 - Y: -90000000 - - X: 1180000000 - Y: -90000000 - - X: 1180000000 - Y: -110000000 - - X: 1240000000 - Y: -110000000 - - - X: 1470000000 - Y: -90000000 - - X: 1450000000 - Y: -90000000 - - X: 1450000000 - Y: -110000000 - - X: 1470000000 - Y: -110000000 - - - X: 1550000000 - Y: -90000000 - - X: 1530000000 - Y: -90000000 - - X: 1530000000 - Y: -110000000 - - X: 1550000000 - Y: -110000000 - - - X: 2140000000 - Y: -110000000 - - X: 2230000128 - Y: -110000000 - - X: 2230000128 - Y: -90000000 - - X: 2130000000 - Y: -90000000 - - X: 2130000000 - Y: -100000000 - - X: 2120000000 - Y: -100000000 - - X: 2120000000 - Y: -150000000 - - X: 2090000000 - Y: -150000000 - - X: 2090000000 - Y: -170000000 - - X: 2140000000 - Y: -170000000 - - - X: 1780000000 - Y: -120000000 - - X: 1730000000 - Y: -120000000 - - X: 1730000000 - Y: -140000000 - - X: 1780000000 - Y: -140000000 - - - X: 1140000000 - Y: -130000000 - - X: 1050000000 - Y: -130000000 - - X: 1050000000 - Y: -150000000 - - X: 1140000000 - Y: -150000000 - - - X: 1510000000 - Y: -130000000 - - X: 1490000000 - Y: -130000000 - - X: 1490000000 - Y: -150000000 - - X: 1510000000 - Y: -150000000 - - - X: 1320000000 - Y: -130000000 - - X: 1240000000 - Y: -130000000 - - X: 1240000000 - Y: -150000000 - - X: 1320000000 - Y: -150000000 - - - X: 2270000128 - Y: -140000000 - - X: 2260000000 - Y: -140000000 - - X: 2260000000 - Y: -150000000 - - X: 2270000128 - Y: -150000000 - - - X: 2050000000 - Y: -150000000 - - X: 2010000000 - Y: -150000000 - - X: 2010000000 - Y: -170000000 - - X: 2050000000 - Y: -170000000 - - - X: 1970000000 - Y: -150000000 - - X: 1930000000 - Y: -150000000 - - X: 1930000000 - Y: -170000000 - - X: 1970000000 - Y: -170000000 - - - X: 1790000000 - Y: -190000000 - - X: 1810000000 - Y: -190000000 - - X: 1810000000 - Y: -170000000 - - X: 1890000000 - Y: -170000000 - - X: 1890000000 - Y: -150000000 - - X: 1790000000 - Y: -150000000 - - X: 1790000000 - Y: -170000000 - - X: 1770000000 - Y: -170000000 - - X: 1770000000 - Y: -180000000 - - X: 1750000000 - Y: -180000000 - - X: 1750000000 - Y: -200000000 - - X: 1790000000 - Y: -200000000 - - - X: 1720000000 - Y: -170000000 - - X: 1640000000 - Y: -170000000 - - X: 1640000000 - Y: -200000000 - - X: 1720000000 - Y: -200000000 - - - X: 1550000000 - Y: -170000000 - - X: 1530000000 - Y: -170000000 - - X: 1530000000 - Y: -190000000 - - X: 1550000000 - Y: -190000000 - - - X: 640000000 - Y: -180000000 - - X: 620000000 - Y: -180000000 - - X: 620000000 - Y: -200000000 - - X: 640000000 - Y: -200000000 - - - X: 590000000 - Y: -180000000 - - X: 570000000 - Y: -180000000 - - X: 570000000 - Y: -200000000 - - X: 590000000 - Y: -200000000 - - - X: 540000000 - Y: -180000000 - - X: 520000000 - Y: -180000000 - - X: 520000000 - Y: -200000000 - - X: 540000000 - Y: -200000000 - - - X: 740000000 - Y: -180000000 - - X: 720000000 - Y: -180000000 - - X: 720000000 - Y: -200000000 - - X: 740000000 - Y: -200000000 - - - X: 1110000000 - Y: -180000000 - - X: 1020000000 - Y: -180000000 - - X: 1020000000 - Y: -200000000 - - X: 1110000000 - Y: -200000000 - - - X: 840000000 - Y: -180000000 - - X: 820000000 - Y: -180000000 - - X: 820000000 - Y: -200000000 - - X: 840000000 - Y: -200000000 - - - X: 790000000 - Y: -180000000 - - X: 770000000 - Y: -180000000 - - X: 770000000 - Y: -200000000 - - X: 790000000 - Y: -200000000 - - - X: 690000000 - Y: -180000000 - - X: 670000000 - Y: -180000000 - - X: 670000000 - Y: -200000000 - - X: 690000000 - Y: -200000000 - - - X: 990000000 - Y: -180000000 - - X: 930000000 - Y: -180000000 - - X: 930000000 - Y: -200000000 - - X: 990000000 - Y: -200000000 + m_ColliderPaths: [] m_CompositePaths: m_Paths: - - {x: 234.99998, y: -26} @@ -50743,7 +48854,7 @@ TilemapCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2120494076} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 @@ -50759,7 +48870,7 @@ TilemapRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2120494076} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -50805,7 +48916,7 @@ Tilemap: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2120494076} - m_Enabled: 1 + m_Enabled: 0 m_Tiles: - first: {x: -18, y: -26, z: 0} second: diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index 296afe0..43679a9 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -49,6 +49,7 @@ public class EventControls : MonoBehaviour currentPlayerCollider = playerCollider; currentEnemyCollider = enemyCollider; + enemyCollider.gameObject.GetComponent().enabled = false; player.StartEncounter(); Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); @@ -205,7 +206,10 @@ public class EventControls : MonoBehaviour if (currentEnemyCollider != null) Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); if (!isInBattle) + { + currentEnemyCollider.gameObject.GetComponent().enabled = true; player.EndEncounter(); + } currentPlayerCollider = null; currentEnemyCollider = null;