Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18손재민's avatar
    Merge branch 'tetris' · 3bf51203
    18손재민 authored 
    # Conflicts:
#	Assets/Data/dropData_exam.csv
#	Assets/Prefabs/Characters/Enemy/Goblin.prefab
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs
#	Assets/Scripts/Characters/Enemy/EnemyAir.cs
#	Assets/Scripts/Characters/Enemy/EnemyGround.cs
#	Assets/Scripts/EnemyManager.cs
    3bf51203
Name
Last commit
 Last update
..
InGameDoor Loading commit data...
NormalRoom Loading commit data...
SpecialRoom Loading commit data...
ClearedFog.prefab Loading commit data...
ClearedFog.prefab.meta Loading commit data...
Ghost.prefab Loading commit data...
Ghost.prefab.meta Loading commit data...
InGameDoor.meta Loading commit data...
NormalRoom.meta Loading commit data...
Room.prefab Loading commit data...
Room.prefab.meta Loading commit data...
SpecialRoom.meta Loading commit data...
enemy spot.prefab Loading commit data...
enemy spot.prefab.meta Loading commit data...
fog.prefab Loading commit data...
fog.prefab.meta Loading commit data...