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,6 +11,8 @@ 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/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -143,5 +143,9 @@ namespace GFGGame
             if (string.IsNullOrEmpty(res)) return "";
             return $"{TEXTURE_DIR_PATH}/Head/HeadBorder/{res}.{extName}";
         }
+        public static string GetShaderPath(string res)
+        {
+            return $"{Shader_DIR_PATH}/{res}.shader";
+        }
     }
 }

GameClient/Assets/link.xml

@@ -3,4 +3,7 @@
 	<assembly fullname="UnityEngine.SpriteMaskModule">
 		<type fullname="UnityEngine.SpriteMask" preserve="all" />
 	</assembly>
+	<assembly fullname="UnityEngine.CoreModule">
+		<type fullname="UnityEngine.Rendering.SortingGroup" preserve="all" />
+	</assembly>
 </linker>