Merge remote-tracking branch 'origin/boss'
# Conflicts: # Assets/Scenes/PlayScene.unity # Assets/Scripts/Characters/Enemy/Scarecrow.cs # Assets/Scripts/TetrisMap/Rooms/BossRoom/JiJooRoom.cs
Showing
Assets/JiJooDead.cs
0 → 100644
Assets/JiJooDead.cs.meta
0 → 100644
File moved
9.7 KB