• 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
..
Animation Loading commit data...
Data Loading commit data...
Fonts Loading commit data...
Images Loading commit data...
Palettes Loading commit data...
Physics Materials Loading commit data...
Prefabs Loading commit data...
Resources Loading commit data...
Scenes Loading commit data...
Scripts Loading commit data...
Sounds Loading commit data...
Sprites Loading commit data...
Textures Loading commit data...
Animation.meta Loading commit data...
Data.meta Loading commit data...
EffectEnd.cs Loading commit data...
EffectEnd.cs.meta Loading commit data...
ExplosiveMarkExplode.cs Loading commit data...
ExplosiveMarkExplode.cs.meta Loading commit data...
Fonts.meta Loading commit data...
Images.meta Loading commit data...
JiJooMove.cs Loading commit data...
JiJooMove.cs.meta Loading commit data...
Palettes.meta Loading commit data...
Physics Materials.meta Loading commit data...
Prefabs.meta Loading commit data...
Resources.meta Loading commit data...
Scenes.meta Loading commit data...
Scripts.meta Loading commit data...
Sounds.meta Loading commit data...
Sprites.meta Loading commit data...
Textures.meta Loading commit data...