バグ修正
Merge remote-tracking branch 'origin/ikeno' into ikeno

Conflicts:
	Assets/Map.cs
しゅうせいしたよ