• 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
..
Door Loading commit data...
Effect Loading commit data...
Enemy Loading commit data...
Item Loading commit data...
LifeStone Loading commit data...
Player Loading commit data...
Portal Loading commit data...
TetrisAlert Loading commit data...
Door.meta Loading commit data...
Effect.meta Loading commit data...
Enemy.meta Loading commit data...
Item.meta Loading commit data...
LifeStone.meta Loading commit data...
Player.meta Loading commit data...
Portal.meta Loading commit data...
TetrisAlert.meta Loading commit data...