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

client_linchunjie

2018-09-18 88b5fa645a240169bf944cf32571bfa9179928e5

 Assets/Editor/Logo/sgsbl_android/SplashImage.png.meta

@@ -27,7 +27,7 @@
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    filterMode: 1
    filterMode: 0
    aniso: -1
    mipBias: -1
    wrapMode: 1
@@ -44,7 +44,7 @@
  alphaUsage: 0
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 0
  textureType: 8
  textureShape: 1
  maxTextureSizeSet: 0
  compressionQualitySet: 0