Merge branch 'master' into tetris

Assets/Prefabs/TetrisMap/fog.prefab

@@ -21,7 +21,7 @@ GameObject:
   - component: {fileID: 4921126351507724}
   - component: {fileID: 212944448011839934}
   m_Layer: 0
-  m_Name: Fog
+  m_Name: fog
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scripts/Characters/Player.cs

@@ -19,7 +19,7 @@ public class Player : MonoBehaviour {
 	// Update is called once per frame
 	void Update () {
         tx = (int)(transform.position.x / 24f);
-        ty = (int)(transform.position.y / 24f);
+        ty = (int)((transform.position.y-0.9f) / 24f);
         if ((ttx != tx || tty != ty) && MapManager.isRoomFalling != true)
         {
             MapManager.currentRoom = MapManager.mapGrid[tx, ty];

Assets/Scripts/Characters/PlayerController.cs

@@ -219,10 +219,10 @@ public class PlayerController : MonoBehaviour
         {
             if (element.name == "platform")
             {
-                element.enabled = false;
+                Physics2D.IgnoreCollision(element, transform.GetComponent<Collider2D>(),true);
                 yield return new WaitForSeconds(0.3f);
                 while(isInRope) yield return new WaitForSeconds(0.1f);
-                element.enabled = true;
+                Physics2D.IgnoreCollision(element, transform.GetComponent<Collider2D>(), false);
                 isDownPlatform = false;
             }
         }