diff --git a/Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png b/Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png new file mode 100644 index 0000000000..e2c0ce1203 Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png differ diff --git a/Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta b/Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta new file mode 100644 index 0000000000..08614fbf94 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: d8c77e47eed7e6945bcf57545410e8ae +TextureImporter: + fileIDToRecycleName: + 21300000: r_Material_scfx_0001 + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + 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: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: r_Material_scfx_0001 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c842b8f78c8edfb469fa10df3146a524 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 05f40c228887a734aada222e4adb1c01 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Hero/s_cyh_0008_slide.png b/Assets/ManagedResources/Icon/SkillIcon/s_cyh_0008_slide.png similarity index 100% rename from Assets/ManagedResources/Icon/Hero/s_cyh_0008_slide.png rename to Assets/ManagedResources/Icon/SkillIcon/s_cyh_0008_slide.png diff --git a/Assets/ManagedResources/Icon/Hero/s_cyh_0008_slide.png.meta b/Assets/ManagedResources/Icon/SkillIcon/s_cyh_0008_slide.png.meta similarity index 100% rename from Assets/ManagedResources/Icon/Hero/s_cyh_0008_slide.png.meta rename to Assets/ManagedResources/Icon/SkillIcon/s_cyh_0008_slide.png.meta diff --git a/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat b/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat index 5e1e78070e..98e54cb954 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat @@ -74,7 +74,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _IsMask: 0 + - _IsMask: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta new file mode 100644 index 0000000000..25ee432029 --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ffaae1db0483704eae97ecc794d5e28 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: