Merge remote-tracking branch 'remotes/origin/master' into GFG

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -137,7 +137,7 @@ MonoBehaviour:
         UserData: 
     - GroupName: res
       GroupDesc: 
-      AssetTags: dynamic
+      AssetTags: preload
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Res

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using System.IO;
 using System;
 using System.Collections.Generic;
+using ET;
 using GFGGame;
 
 namespace GFGEditor
@@ -11,8 +12,8 @@ namespace GFGEditor
     {
         public static string ResRootDirName = "正式资源";
         public static string ResRootDirNameDressUp = "正式资源";
-        public static string ResRootPath { get { return $"../../../gfg/{ResRootDirName}/"; } }
-        public static string ResRootPathDressUp { get { return $"../../../gfg/{ResRootDirNameDressUp}/"; } }
+        public static string ResRootPath { get { return $"../../{ResRootDirName}/"; } }
+        public static string ResRootPathDressUp { get { return $"../../{ResRootDirNameDressUp}/"; } }
 
         public static string ragule = @"^[0-9a-zA-Z_.]{1,}$";
         public static string Md5FilePath = $"{ResPathUtil.RES_ROOT_DIR_PATH}/MD5";