This commit is contained in:
2026-07-29 14:39:00 +09:00
1189 changed files with 109402 additions and 3284 deletions

Binary file not shown.

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 11
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@@ -28,18 +28,18 @@ TextureImporter:
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,7 +55,7 @@ TextureImporter:
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
@@ -73,7 +73,7 @@ TextureImporter:
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0

Binary file not shown.

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ccec3822d9296c7468aec794007f7c32
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 1837adc38cf370045b28716154e43412
=======
guid: 8def38bc499e92b4f985b6c97e19c954
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 2e96ec11a1748334da66d853d15ee66d
=======
guid: 46b4006d48b64bb488fb1dfecd2d09f3
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 0225eef1af1806d479ddaab6e7080a90
=======
guid: 4395b832618ba3b4ba7e1bc76b5825c4
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 1afa39d80c7cbaf4882ca16170efe2c6
=======
guid: 33850af6c4bc24548909806b783c3b63
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: c5e5e1d01355936468cc5cfb4e1c4d37
=======
guid: b2ce6dea8b907b3448c4a0159ca23826
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 22d09a781b276b74cbf597b7821d6680
=======
guid: 2a717d1bb4a34924491ff85d332590be
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: d70136cf365dd754287af1fac036a61a
=======
guid: b382ddbfff52f4f48976839072aeeba8
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 1f9ccad55473a8a45ac8399d547ff56c
=======
guid: 24fd37be4f7093647ac57772dfccc001
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: e53bb422f66bc2e4f9ca8e5f60656e23
=======
guid: da7810d4302cab140a947bd30da6b09c
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: ff42f2a9d7e504e49994eada1848954a
=======
guid: ef517d88292a3b346b277b9e37b17eca
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: dffcbe54508da074a8c11a5487db909d
=======
guid: 0055e5da05c789e43a03003421fdd746
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: fe1151d3f4e83f14cb2e1eae7d517ddf
=======
guid: 4a3f0de6a758a0c4990efb0c2be97eb4
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 7687168296a02ba4285577087adf137f
=======
guid: 0103c2e4943b05347ad1ca900f1bd52d
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: f8b45e82a5b73e240b01a5a1a2e9f37e
=======
guid: 002fa0af3c966584da250980f61ce038
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: b93bd0ad7f93d9845bafa621da7de554
=======
guid: ea8379ad8b9bf314f9e3d995f60d247c
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: b251592e9a9d4a447a234ee05602e101
=======
guid: eb6f95e00fcc61040888b682c91253ae
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 69c91dbf8c4a40049a55b25451eaf624
=======
guid: ef2bc6db3c514f94d8179beb1f1694a7
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 6cc0d3b48afa6064bbd207bab93870f1
=======
guid: 74263ed10de4fec468e7d5bc95ed08d6
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 24e7124ab7be26c48a58791fc9711ccf
=======
guid: 13d4dc2ebf9d5d843a747c82ea806d66
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 9043a5151de4c1641a0902234c27f6ab
=======
guid: 3055acf1d2b49a048baaeb5885c21922
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 3dfe1cdc948e3c4448a9f164c3faca2e
=======
guid: 73538cc77b6cb4c44b9885adb1e3f4ec
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -55,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 11
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

View File

@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 7c6c1f76b9de79f47aa7a06ac939489a
=======
guid: 947fab023c98f684493c056a7a3c4880
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -11,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -26,7 +22,7 @@ TextureImporter:
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
@@ -39,11 +35,11 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 3
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -58,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -97,8 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
<<<<<<< HEAD
=======
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
@@ -138,7 +132,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
>>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13
spriteSheet:
serializedVersion: 2
sprites: []

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