Merge branch 'fix/shopUI' into 'staging'
Fix/shop ui See merge request !56
Showing
- Assets/Prefabs/Shop.prefab 1107 additions, 129 deletionsAssets/Prefabs/Shop.prefab
- Assets/Resources/Shop.meta 8 additions, 0 deletionsAssets/Resources/Shop.meta
- Assets/Resources/Shop/Healing Orb.png 3 additions, 0 deletionsAssets/Resources/Shop/Healing Orb.png
- Assets/Resources/Shop/Healing Orb.png.meta 127 additions, 0 deletionsAssets/Resources/Shop/Healing Orb.png.meta
- Assets/Resources/Shop/Wolf.png 3 additions, 0 deletionsAssets/Resources/Shop/Wolf.png
- Assets/Resources/Shop/Wolf.png.meta 127 additions, 0 deletionsAssets/Resources/Shop/Wolf.png.meta
- Assets/Scenes/FinalStage.unity 611 additions, 61 deletionsAssets/Scenes/FinalStage.unity
- Assets/Script/Shop/Shop.cs 11 additions, 1 deletionAssets/Script/Shop/Shop.cs
Please register or sign in to comment