• 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
..
Goblin Loading commit data...
GoblinArcher Loading commit data...
Jollarcher2 Loading commit data...
Scarecrow Loading commit data...
Spider Loading commit data...
Air.controller Loading commit data...
Air.controller.meta Loading commit data...
Goblin.meta Loading commit data...
GoblinArcher.controller Loading commit data...
GoblinArcher.controller.meta Loading commit data...
GoblinArcher.meta Loading commit data...
GroundMelee.controller Loading commit data...
GroundMelee.controller.meta Loading commit data...
JiJoo.controller Loading commit data...
JiJoo.controller.meta Loading commit data...
JiJooIdle.controller Loading commit data...
JiJooIdle.controller.meta Loading commit data...
Jollarcher2.controller Loading commit data...
Jollarcher2.controller.meta Loading commit data...
Jollarcher2.meta Loading commit data...
Scarecrow.controller Loading commit data...
Scarecrow.controller.meta Loading commit data...
Scarecrow.meta Loading commit data...
Spider.meta Loading commit data...