• 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
..
Room Tutorial.prefab Loading commit data...
Room Tutorial.prefab.meta Loading commit data...
TetriminoBoss.prefab Loading commit data...
TetriminoBoss.prefab.meta Loading commit data...
TetriminoI.prefab Loading commit data...
TetriminoI.prefab.meta Loading commit data...
TetriminoJ.prefab Loading commit data...
TetriminoJ.prefab.meta Loading commit data...
TetriminoL.prefab Loading commit data...
TetriminoL.prefab.meta Loading commit data...
TetriminoO.prefab Loading commit data...
TetriminoO.prefab.meta Loading commit data...
TetriminoS.prefab Loading commit data...
TetriminoS.prefab.meta Loading commit data...
TetriminoT.prefab Loading commit data...
TetriminoT.prefab.meta Loading commit data...
TetriminoZ.prefab Loading commit data...
TetriminoZ.prefab.meta Loading commit data...