L
This commit is contained in:
@@ -1,9 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 21939e6528afcb448a45b59ea7e4a355
|
||||
=======
|
||||
guid: dfaf1935e2abff14da7316045bc12c66
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -43,11 +39,7 @@ TextureImporter:
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
<<<<<<< HEAD
|
||||
wrapW: 1
|
||||
=======
|
||||
wrapW: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
@@ -71,26 +63,16 @@ TextureImporter:
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
<<<<<<< HEAD
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
=======
|
||||
applyGammaDecoding: 1
|
||||
swizzle: 50462976
|
||||
cookieLightType: 2
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -103,11 +85,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -120,11 +98,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 27cabee6dcf250d40b63aa751591f7b6
|
||||
=======
|
||||
guid: 0b40c517a63588746a7668929bfc8ca7
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -43,11 +39,7 @@ TextureImporter:
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
<<<<<<< HEAD
|
||||
wrapW: 1
|
||||
=======
|
||||
wrapW: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
@@ -71,26 +63,16 @@ TextureImporter:
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
<<<<<<< HEAD
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
=======
|
||||
applyGammaDecoding: 1
|
||||
swizzle: 50462976
|
||||
cookieLightType: 2
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -103,11 +85,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -120,11 +98,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: a067d878271915c40a99e3caaa24fab5
|
||||
=======
|
||||
guid: 6658aaa835fd0354c8369158b264a7d7
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -43,11 +39,7 @@ TextureImporter:
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
<<<<<<< HEAD
|
||||
wrapW: 1
|
||||
=======
|
||||
wrapW: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
@@ -71,26 +63,16 @@ TextureImporter:
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
<<<<<<< HEAD
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
=======
|
||||
applyGammaDecoding: 1
|
||||
swizzle: 50462976
|
||||
cookieLightType: 2
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -103,11 +85,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -120,11 +98,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 79db0a17d5be7f44bb0d66cb5748e939
|
||||
=======
|
||||
guid: 168c51d9cab206d42a3c6aabeff98162
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -43,11 +39,7 @@ TextureImporter:
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
<<<<<<< HEAD
|
||||
wrapW: 1
|
||||
=======
|
||||
wrapW: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
@@ -71,26 +63,16 @@ TextureImporter:
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
<<<<<<< HEAD
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
=======
|
||||
applyGammaDecoding: 1
|
||||
swizzle: 50462976
|
||||
cookieLightType: 2
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -103,11 +85,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -120,11 +98,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 6169f026a7dd5de4d98e97294c0052ec
|
||||
=======
|
||||
guid: b4d7d234e66457440bf28b559697e18f
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -43,11 +39,7 @@ TextureImporter:
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
<<<<<<< HEAD
|
||||
wrapW: 1
|
||||
=======
|
||||
wrapW: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
@@ -71,26 +63,16 @@ TextureImporter:
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
<<<<<<< HEAD
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
=======
|
||||
applyGammaDecoding: 1
|
||||
swizzle: 50462976
|
||||
cookieLightType: 2
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -103,11 +85,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
@@ -120,11 +98,7 @@ TextureImporter:
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
<<<<<<< HEAD
|
||||
textureCompression: 1
|
||||
=======
|
||||
textureCompression: 0
|
||||
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
||||
Reference in New Issue
Block a user