Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts: # Assets/Sprites/SpriteAnimations/SpiderController.controller
This commit is contained in:
commit
e7631b5ed5
9
Assets/Resources/Prefabs/Enemy.meta
Normal file
9
Assets/Resources/Prefabs/Enemy.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 01275eb458a35534997899ab69e88ec4
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1454231669
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d44bfd22316c74849a3713f0d5b734a7
|
|
||||||
timeCreated: 1454227406
|
|
||||||
licenseType: Free
|
|
||||||
NativeFormatImporter:
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
Reference in New Issue
Block a user