Commit c2c0b75b authored by 16도재형's avatar 16도재형 Committed by 18류지석

추가적인 머지 충돌 해결

parent 5c63927f
...@@ -260,7 +260,7 @@ public class PlayerController : MonoBehaviour ...@@ -260,7 +260,7 @@ public class PlayerController : MonoBehaviour
{ {
Physics2D.IgnoreCollision(platformCollider, transform.GetComponent<Collider2D>(), true); Physics2D.IgnoreCollision(platformCollider, transform.GetComponent<Collider2D>(), true);
yield return new WaitForSeconds(0.3f); yield return new WaitForSeconds(0.3f);
while (isInRope) yield return new WaitForSeconds(0.1f); while (playerState == PlayerState.Rope) yield return new WaitForSeconds(0.1f);
Physics2D.IgnoreCollision(platformCollider, transform.GetComponent<Collider2D>(), false); Physics2D.IgnoreCollision(platformCollider, transform.GetComponent<Collider2D>(), false);
isDownPlatform = false; isDownPlatform = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment