Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-27 3aaec4cb899faec0d6d3b70b81e9c2aad18346e8

 ProjectSettings/ProjectSettings.asset

@@ -663,7 +663,7 @@
  webGLThreadsSupport: 0
  webGLDecompressionFallback: 0
  scriptingDefineSymbols:
    1: MOREMOUNTAINS_NICEVIBRATIONS
    1: MOREMOUNTAINS_NICEVIBRATIONS;TDGA_CUSTOM
    7: MOREMOUNTAINS_NICEVIBRATIONS;TDGA_CUSTOM
  platformArchitecture: {}
  scriptingBackend: {}