Merge branch 'master' into 'character'
# Conflicts: # Assets/sprite/crate_16.png.meta
Showing
Assets/Prefabs.meta
0 → 100644
File added
File added
File added
Assets/resource/Prefab.meta
0 → 100644
File added
Assets/sprite/Tree_01.png
0 → 100644
567 Bytes
Assets/sprite/Tree_03.png
0 → 100644
552 Bytes
3.3 KB