Merge branch 'UI'

f7585de5 · 16도재형 · 6a181d66 · 1487224a · f7585de5 · f7585de5
Commit f7585de5 authored Sep 30, 2018 by 16도재형
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 315 additions and 11 deletions

LifeCrystal.prefab Assets/Prefabs/Pickups/LifeCrystal.prefab +314 -10

LifeCrystal.prefab.meta Assets/Prefabs/Pickups/LifeCrystal.prefab.meta +1 -1

No files found.
--- a/Assets/Prefabs/Pickups/LifeCrystal.prefab
+++ b/Assets/Prefabs/Pickups/LifeCrystal.prefab
--- a/Assets/Prefabs/Pickups/LifeCrystal.prefab.meta
+++ b/Assets/Prefabs/Pickups/LifeCrystal.prefab.meta
 fileFormatVersion: 2
-guid: b54c6a2ac300f9b498448d77b24d62fa
+guid: 86dcaa3d062378746bffa7e9c773fa12
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000