Compare commits

..

No commits in common. "a4ac033aebd601e352ae9d28e7c82784b59abf87" and "cdbdbc28c41d8d5187f7d9a0a125d5bbbcc4d6f9" have entirely different histories.

1863 changed files with 6748 additions and 1697373 deletions

Binary file not shown.

View File

@ -1,135 +0,0 @@
fileFormatVersion: 2
guid: 5925ad8cc48e20a40a4d4979432254c8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,135 +0,0 @@
fileFormatVersion: 2
guid: 65be32ab5fd526e47a687a4ab63f64a0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0

View File

@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0

View File

@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0

View File

@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0

View File

@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 976974e4d3018034e87caeb9f51f20f6

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: c865e48369a325f4784ecd8444d1ec51

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: f348a2fb2f8a7fe4e82fb08818415884

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 715add6d7a2eff443bf0aee3cf26e7fc

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 77ec3c4e07a36814fb3169ecef41b50a
labels:
- ball
- bubble
- cartoonfx
- electric
- particles
- toon

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: c41f95c98750b744bb429ee2fc6a1d70
labels:
- cartoonfx

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 46876a2780737ec45a19d62f88e5ce56
timeCreated: 1505140479
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 4adffb0018aeda44e9263f901167af1f
timeCreated: 1505138997
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: 45653d11d228e594498b3d9119285e35
labels:
- cartoonfx

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f95ff734540a0d749be6571b6cb5b37f
labels:
- cartoonfx
- hit
- particles
- text
- toon

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f06e78284f831ae469c74624ab5d513b
labels:
- cartoonfx
- particles
- hit
- toon

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: f991151302bbc8440bc158a1be7d008d
labels:
- cartoonfx

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a40b64bf23366dc42a892af2c6ff6140
labels:
- cartoonfx
- particles
- poof
- smoke
- toon

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 9e4577abe56a95f4a91d29a0473cd30c
timeCreated: 1505142609
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3156817f64ec68948ad6bb26569b9ef5
labels:
- cartoonfx
- particles
- poof
- toon

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 352304b7fbe11f445970df6ae36e6227
labels:
- cartoonfx
- particles
- tornado
- toon

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2a474af3f4c27be4e9bdce39cfe4315d
labels:
- cartoonfx
- particles
- virus
- toon

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 84d86077ce20b3d408f08f7cc5cfb4ea

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 9ef0e39c32aae7b4480fbdb6d2efb0a1

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: bc98890f6028f444eaa7789bde5e2eeb
labels:
- cartoonfx
- particles
- blood
- directional
- toon

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 7e71da46ca428824c9e9e4598154d6d3

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: a97415c6b57076f41a6621a7b51d63a3
timeCreated: 1506674220
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: c21f3643835b3b34e897f4b378531f37

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 4961a16ba01e09547be3e1c9d16d5ad0
timeCreated: 1506673851
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: efc53651f7e42d84d86caee3be88073e

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: aa8d6482d70a23445b4b2a928ed1b845
timeCreated: 1506670975
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 86fef6e72f4589f428dccc24bd05cf0b

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: d4f5579fb5da2f646a0c2bee91bdf6b5
labels:
- cartoonfx
- particles
- symbol
- toon

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: bcaff8fc36e95584bb27cc3cf7c6cb14
labels:
- cartoonfx
- particles
- toon
- symbol

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: daa6cceb1b087d74aad6916dac2805ea
timeCreated: 1505487254
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: fdee0cda8f0d2094fa5ca47abb4ffd95

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: aa3fed151f536ee49b583c6a3ac4a2e1
labels:
- cartoonfx
- particles
- pickup
- symbol
- toon

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 3af6f68141914ca43ba39b2403757bd0
labels:
- cartoonfx
- particles
- pickup
- symbol
- toon

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 1bc4a709f24528b40984e62f32e398a0
labels:
- cartoonfx
- particles
- pickup
- symbol
- toon

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8fc06027b01064e4f885fd8dd2929310
labels:
- cartoonfx
- particles
- pickup
- symbol
- toon

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: e8472d517d4584f41ac28b96b812564f

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 7867af58a6ec48846ae807eb4022fbaa
labels:
- cartoonfx
- particles
- smoke
- toon
- symbol

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: fda99d3a72bd62d44b37eef4da0ac074

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 77c69ec12208c4c4380d15e30b6f8f68
timeCreated: 1507212856
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: 9358d72e9ab0589469b7c81a782cb400
DefaultImporter:
userData:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: 6d8820046d052af4583d35be43c7a959
DefaultImporter:
userData:

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 1ca16f2a31fb6a548ad8954bed1d321f
labels:
- CartoonFX
- Toon
- Particles
- Hit
- Electric
- Ground
NativeFormatImporter:
userData:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: e243632bb3aff9549abdcfcc2ef0c4f0
timeCreated: 1504710934
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: d15fe19a363a70749ba9f690ab060547
DefaultImporter:
userData:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: de07bf378e7247444a0715ad2ff509e3
labels:
- CartoonFX
- Toon
- Particles
- Snow
NativeFormatImporter:
userData:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: 5d25cb644a933ed4bad4bc0b015fa1f6
DefaultImporter:
userData:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 7e48ba6b1b968764490bbc70b66e3fe1
timeCreated: 1504715503
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: b0bc1b6b391734647b9bb142bafc0819
timeCreated: 1504777944
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: f89732ea99785b94c87bbba1e27f75a3
labels:
- CartoonFX
- Toon
- Particles
- Air
- Fire
NativeFormatImporter:
userData:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: c4115076c1461154fbf6745a2054fda4
DefaultImporter:
userData:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 757df604761b8ef42831192c70ee1099
labels:
- CartoonFX
- Toon
- Particles
NativeFormatImporter:
userData:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: ada5d62ffe762ce4fbccc70dcdbc9022
labels:
- CartoonFX
- Toon
- Particles
NativeFormatImporter:
userData:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: 50c9cf1248e2c284b98fd90c552c1a2a
DefaultImporter:
userData:

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 7b56cd9b663f23f429e131a54ec87db0
labels:
- CartoonFX
- Toon
- Particles
- Dark
- Magic
- Aura
NativeFormatImporter:
userData:

View File

@ -1,4 +0,0 @@
fileFormatVersion: 2
guid: 485ad37d4a7ce3d489ccf0e2c5feae58
DefaultImporter:
userData:

View File

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 60bc526f4be1e044ab9e46340b82ffb3
labels:
- CartoonFX
- Toon
- Particles
- Magic
- Aura
NativeFormatImporter:
userData:

View File

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: e3d819d8722fa1f47a3f68574b56dfb3
labels:
- CartoonFX
- Toon
- Particles
- Magic
- Aura
NativeFormatImporter:
userData:

Some files were not shown because too many files have changed in this diff Show More