• 18손재민's avatar
    Merge remote-tracking branch 'origin/item' · 5a99a028
    18손재민 authored
    # Conflicts:
    #	Assets/Scenes/PlayScene.unity
    #	Assets/Scripts/EffectManager.cs
    #	Assets/Scripts/Item/Addons/SmallLens.cs
    #	Assets/Scripts/Item/IPlayerInteraction.cs
    #	Assets/Scripts/Item/InventoryManager.cs
    #	Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
    5a99a028
Name
Last commit
Last update
..
Animations Loading commit data...
Prefabs Loading commit data...
Sprites Loading commit data...
Tiles Loading commit data...
Animations.meta Loading commit data...
Prefabs.meta Loading commit data...
Sprites.meta Loading commit data...
Tiles.meta Loading commit data...