From 0c8a0661426c48db3baea9c232b6cd988d86cbad Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 29 Jul 2020 11:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E6=94=BB=E5=87=BB=E5=91=BD?= =?UTF-8?q?=E4=B8=AD=E7=89=B9=E6=95=88=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Effects/Textures/H_1298.tga.meta | 56 --------- .../Textures/{H_1298.tga => H_1298_tga.tga} | Bin .../Effects/Textures/H_1298_tga.tga.meta | 110 ++++++++++++++++++ .../{glow_00119.png => glow_00119_png.png} | Bin ...00119.png.meta => glow_00119_png.png.meta} | 55 +++++++-- 5 files changed, 153 insertions(+), 68 deletions(-) delete mode 100644 Assets/ManagedResources/Effects/Textures/H_1298.tga.meta rename Assets/ManagedResources/Effects/Textures/{H_1298.tga => H_1298_tga.tga} (100%) create mode 100644 Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta rename Assets/ManagedResources/PublicArtRes/Textures/{glow_00119.png => glow_00119_png.png} (100%) rename Assets/ManagedResources/PublicArtRes/Textures/{glow_00119.png.meta => glow_00119_png.png.meta} (62%) diff --git a/Assets/ManagedResources/Effects/Textures/H_1298.tga.meta b/Assets/ManagedResources/Effects/Textures/H_1298.tga.meta deleted file mode 100644 index 11531f76a4..0000000000 --- a/Assets/ManagedResources/Effects/Textures/H_1298.tga.meta +++ /dev/null @@ -1,56 +0,0 @@ -fileFormatVersion: 2 -guid: 96c7ea5ce2a2fb748ac03d19fd227d44 -timeCreated: 1561594742 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Effects/Textures/H_1298.tga b/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga similarity index 100% rename from Assets/ManagedResources/Effects/Textures/H_1298.tga rename to Assets/ManagedResources/Effects/Textures/H_1298_tga.tga diff --git a/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta b/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta new file mode 100644 index 0000000000..448f7aafe7 --- /dev/null +++ b/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 96c7ea5ce2a2fb748ac03d19fd227d44 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png b/Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png rename to Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png diff --git a/Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png.meta b/Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png.meta similarity index 62% rename from Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png.meta rename to Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png.meta index 24ccfbe842..84ef07df4b 100644 --- a/Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png.meta +++ b/Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 50c51cbce89995f4a80295be1e2456e1 TextureImporter: fileIDToRecycleName: {} - serializedVersion: 4 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -10,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -18,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -25,10 +30,13 @@ TextureImporter: textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -37,54 +45,77 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: iPhone + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone maxTextureSize: 256 - textureFormat: 33 + resizeAlgorithm: 0 + textureFormat: 65 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone maxTextureSize: 1024 + resizeAlgorithm: 0 textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 - - buildTarget: Android + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android maxTextureSize: 256 - textureFormat: 47 + resizeAlgorithm: 0 + textureFormat: 65 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: e4718ba57a0072b47ba64cd3070c6581 + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: