Assets/Prefabs/Rooms/SpecialRoom · 6b1dd72d7a8946255ca327870eb17dc8923c4ec7 · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/boss' · 7d77c1cd

18손재민 authored Feb 26, 2019

# Conflicts:
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs

7d77c1cd

Name	Last commit	Last update
..
Room Amethyst.prefab		Loading commit data...
Room Amethyst.prefab.meta		Loading commit data...
Room Boss 1-1.prefab		Loading commit data...
Room Boss 1-1.prefab.meta		Loading commit data...
Room Boss 1-2.prefab		Loading commit data...
Room Boss 1-2.prefab.meta		Loading commit data...
Room Boss 1-3.prefab		Loading commit data...
Room Boss 1-3.prefab.meta		Loading commit data...
Room BothSide.prefab		Loading commit data...
Room BothSide.prefab.meta		Loading commit data...
Room Gold.prefab		Loading commit data...
Room Gold.prefab.meta		Loading commit data...
Room Item 1-1.prefab		Loading commit data...
Room Item 1-1.prefab.meta		Loading commit data...
Room Item 1-2.prefab		Loading commit data...
Room Item 1-2.prefab.meta		Loading commit data...
Room Item.prefab		Loading commit data...
Room Item.prefab.meta		Loading commit data...
Room Start 1-1.prefab		Loading commit data...
Room Start 1-1.prefab.meta		Loading commit data...
Room Start 1-2.prefab		Loading commit data...
Room Start 1-2.prefab.meta		Loading commit data...
Room Start.prefab		Loading commit data...
Room Start.prefab.meta		Loading commit data...
Room Tutorial.prefab		Loading commit data...
Room Tutorial.prefab.meta		Loading commit data...