Merge remote-tracking branch 'origin/boss'
# Conflicts: # Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab # Assets/Scripts/Characters/Enemy/Enemy.cs
Showing
Assets/JiJooMove.cs
0 → 100644
Assets/JiJooMove.cs.meta
0 → 100644
9.67 KB
9.72 KB
9.06 KB
9.72 KB
9.06 KB
9.58 KB
6.7 KB
6.74 KB
6.14 KB
6.74 KB
6.18 KB
6.74 KB