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

client_linchunjie

2018-08-20 a740deaa6c30edf8a281ee68d3ed3cc146af079a

 ProjectSettings/GraphicsSettings.asset

@@ -99,8 +99,8 @@
      enableLPPV: 0
      useDitherMaskForAlphaBlendedShadows: 0
    m_Automatic: 0
  m_LightmapStripping: 0
  m_FogStripping: 0
  m_LightmapStripping: 1
  m_FogStripping: 1
  m_InstancingStripping: 0
  m_LightmapKeepPlain: 1
  m_LightmapKeepDirCombined: 1