• 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
..
Boss Loading commit data...
Goblin Loading commit data...
GoblinArcher Loading commit data...
HPBar Loading commit data...
Jollarcher Loading commit data...
Scarecrow Loading commit data...
Spider Loading commit data...
Boss.meta Loading commit data...
Goblin.meta Loading commit data...
GoblinArcher.meta Loading commit data...
HPBar.meta Loading commit data...
Jollarcher.meta Loading commit data...
Scarecrow.meta Loading commit data...
Spider.meta Loading commit data...