From c60fe0c7c65763929a75e46f990587e8fa5d24d2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 22 Jun 2021 20:58:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=8E=89=E5=B8=9D=E7=9A=AE=E8=82=A4=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/Effect_ls_05_huodou_25.mat | 2 +- .../Effect_c_0035/Materials/keji_14_mat.mat | 8 ++++---- .../Texture/Glow/Fx_Glow01.png.meta | 19 +++++++++++++++---- .../Texture/Glow/Fx_Glow02.png.meta | 19 +++++++++++++++---- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/Effect_ls_05_huodou_25.mat b/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/Effect_ls_05_huodou_25.mat index 3355d594af..cfad12b873 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/Effect_ls_05_huodou_25.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/Effect_ls_05_huodou_25.mat @@ -115,4 +115,4 @@ Material: - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 0.83137256, g: 0.6604635, b: 0.6, a: 1} + - _TintColor: {r: 0.6105014, g: 0.6, b: 0.83137256, a: 1} diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/keji_14_mat.mat b/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/keji_14_mat.mat index e0c666611f..ff27e5c85b 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/keji_14_mat.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_0035/Materials/keji_14_mat.mat @@ -8,22 +8,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: keji_14_mat - m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: c396158f7c3958346b75c109223fb5ad, type: 3} + m_Texture: {fileID: 2800000, guid: 02814b2dc67e04144b3f3a0a4417c2bb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - _InvFade: 1 m_Colors: - - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} + - _TintColor: {r: 0, g: 0, b: 0, a: 0.2509804} diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png.meta b/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png.meta index f5c4537883..345b5a7ebf 100644 --- a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png.meta +++ b/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -48,10 +48,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 + alphaUsage: 2 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow02.png.meta b/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow02.png.meta index bb30e303a9..ea2062cb15 100644 --- a/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow02.png.meta +++ b/Assets/ManagedResources/EffectResUI/BaiBaoShangHui/Texture/Glow/Fx_Glow02.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -48,10 +48,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 + alphaUsage: 2 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []