Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts: # Assets/Resources/Scenes/Level2.unity # Assets/Sprites/PaperClip/PapeStationary.png.meta
This commit is contained in:
commit
d41f170590
BIN
Assets/Sprites/PaperClip/PapeStationary_0.controller
Normal file
BIN
Assets/Sprites/PaperClip/PapeStationary_0.controller
Normal file
Binary file not shown.
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0de7ad3cab00f8b48b33bdf479936433
|
||||
timeCreated: 1454219003
|
||||
licenseType: Free
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Sprites/PaperClip/papeWalking.anim
Normal file
BIN
Assets/Sprites/PaperClip/papeWalking.anim
Normal file
Binary file not shown.
8
Assets/Sprites/PaperClip/papeWalking.anim.meta
Normal file
8
Assets/Sprites/PaperClip/papeWalking.anim.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3f8870061ab9b914d9c0513c4e0a1e9d
|
||||
timeCreated: 1454219002
|
||||
licenseType: Free
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Reference in New Issue
Block a user