Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -11,8 +11,6 @@ namespace GFGGame
 
         public static void Start()
         {
-            GFGAsset.Load<Shader>(ResPathUtil.GetShaderPath("Effect_distortion_add"));
-            GFGAsset.Load<Shader>(ResPathUtil.GetShaderPath("Effect_distortion_blend"));
             //界面
             ViewManager.Init();
             //日志

GameClient/Assets/Scenes/GameLauncher.unity

@@ -277,7 +277,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170410349}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.4324324, y: -5, z: 0}
+  m_LocalPosition: {x: 2.8125, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

GameClient/ProjectSettings/GraphicsSettings.asset

@@ -60,4 +60,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0