atr_ljf
2018-09-05 64d3629ac7670e68e89f1430915b1eec4ce3dc65
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
11个文件已修改
2个文件已添加
70 ■■■■■ 已修改文件
Effects/UI/Z_FaBaoZhiHun/Material/04.mat 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/0016.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/0017.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/005.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/03.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/04.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/05.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/06.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/16.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/17.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/17.png.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/17.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Texture/B_Cw21_08.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/UI/Z_FaBaoZhiHun/Material/04.mat
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 98ff8d662e0fda04db471f0ab7824073, type: 3}
        m_Texture: {fileID: 2800000, guid: d4479a62fac32614492a65d0bc671445, type: 3}
        m_Scale: {x: 4, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
Effects/UI/Z_FaBaoZhiHun/Texture/0016.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/0017.png

Effects/UI/Z_FaBaoZhiHun/Texture/005.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/03.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/04.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/05.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/06.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/16.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/17.png
Effects/UI/Z_FaBaoZhiHun/Texture/17.png.meta
New file
@@ -0,0 +1,68 @@
fileFormatVersion: 2
guid: d4479a62fac32614492a65d0bc671445
timeCreated: 1536112274
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
    aniso: -1
    mipBias: -1
    wrapMode: -1
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
  spritePackingTag:
  userData:
  assetBundleName:
  assetBundleVariant:
Effects/UI/Z_FaBaoZhiHun/Texture/17.tga
Binary files differ
Effects/UI/Z_FaBaoZhiHun/Texture/B_Cw21_08.tga
Binary files differ