Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

River Jiang

2020-10-22 45aacf1c3f93a53c3c885b0034b05c50a28ae2d4

 Assets/00000/package/Materials/Glow_001.mat

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