Merge branch 'master' of github.com:ETSConjure/PixelSphinx

This commit is contained in:
Jean-Sébastien Gervais 2016-04-09 16:22:05 -04:00
commit 4f76ffdc78
3 changed files with 1090 additions and 1 deletions

View File

@ -602,7 +602,7 @@ Prefab:
- target: {fileID: 11401034, guid: 198e988adacced646a19f757f6237ae1, type: 2}
propertyPath: ExplosionParticle
value:
objectReference: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2}
objectReference: {fileID: 143434, guid: a63c057a7a113a349b55d0ae61d0c936, type: 2}
- target: {fileID: 11401034, guid: 198e988adacced646a19f757f6237ae1, type: 2}
propertyPath: ExplosionTime
value: 10

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0bec1e1c9044b8047ac8d2c7a119b21b
timeCreated: 1460233063
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant: