• 18손재민's avatar
    Merge branch 'enemy2' · 84d85ebd
    18손재민 authored
    # Conflicts:
    #	Assets/Prefabs/Characters/Enemy/GoblinArcher.prefab
    #	Assets/Prefabs/Characters/Enemy/Jollarcher2.prefab
    #	Assets/Scripts/Characters/Enemy/Animator State/ArcherTrack.cs
    84d85ebd
Name
Last commit
Last update
..
Characters Loading commit data...
Item Loading commit data...
TetrisMap Loading commit data...
UI Loading commit data...
CameraController.cs Loading commit data...
CameraController.cs.meta Loading commit data...
Characters.meta Loading commit data...
EffectManager.cs Loading commit data...
EffectManager.cs.meta Loading commit data...
EnemyManager.cs Loading commit data...
EnemyManager.cs.meta Loading commit data...
Enumerators.cs Loading commit data...
Enumerators.cs.meta Loading commit data...
GameManager.cs Loading commit data...
GameManager.cs.meta Loading commit data...
HPBar.cs Loading commit data...
HPBar.cs.meta Loading commit data...
Item.meta Loading commit data...
MenuManager.cs Loading commit data...
MenuManager.cs.meta Loading commit data...
Normal.anim Loading commit data...
Normal.anim.meta Loading commit data...
Pointer.cs Loading commit data...
Pointer.cs.meta Loading commit data...
Singleton.cs Loading commit data...
Singleton.cs.meta Loading commit data...
SkillPlay.cs Loading commit data...
SkillPlay.cs.meta Loading commit data...
TetrisMap.meta Loading commit data...
TileManager.cs Loading commit data...
TileManager.cs.meta Loading commit data...
UI.meta Loading commit data...
playerOnSpike.cs Loading commit data...
playerOnSpike.cs.meta Loading commit data...