Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

art_wzw

2018-08-23 d3a9b7cf86de38d1dbd8734109295bb1d3b12d92

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

 Effects/UI/Fb_YeMian/Texture/DiTuo_Bai.png

 Effects/UI/Fb_YeMian/Texture/Materials/XingK_M.mat

@@ -12,7 +12,7 @@
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  m_CustomRenderQueue: 3001
  stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:

 Effects/UI/Fb_YeMian/Texture/Xing_Black.png

 Effects/UI/Fb_YeMian/Texture/Xing_Black.png.meta

@@ -68,7 +68,7 @@
    overridden: 0
  - buildTarget: iPhone
    maxTextureSize: 2048
    textureFormat: 33
    textureFormat: 4
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0

 Effects/UI/Fb_YeMian/Texture/Xing_Black_Mo.png

 Effects/UI/Fb_YeMian/Texture/Xing_Black_Mo.png.meta

@@ -58,6 +58,30 @@
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Standalone
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: iPhone
    maxTextureSize: 256
    textureFormat: 4
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 1
  - buildTarget: Android
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []

 Effects/UI/Fb_YeMian/Texture/Xing_Black_Xian.png

 Effects/UI/Fb_YeMian/Texture/Xing_Black_Xian.png.meta

@@ -58,6 +58,30 @@
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Standalone
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: iPhone
    maxTextureSize: 256
    textureFormat: 33
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 1
  - buildTarget: Android
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []