Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Assets/Game/CSShare

GameClient/Assets/Editor/ArtsRes/ImportArtsRes.cs

@@ -9,69 +9,73 @@ namespace GFGEditor
 {
     public class ImportArtsRes
     {
+        //public static string ResRootDirName = "正式资源";
+        public static string ResRootDirName = "正式资源-demo1";
+        public static string ResRootPath { get { return $"../../../gfg/{ResRootDirName}/"; } }
+
         public static string ragule = @"^[0-9a-zA-Z_]{1,}$";
         public static string Md5FilePath = "Assets/MD5";
 
-        private static string[] FieldGuideIconSrcPaths = new string[] { "../../../gfg/正式资源/图鉴/" };
+        private static string[] FieldGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/" }; } }
         public static string FieldGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/Icon/";
         public static string FieldGuideIconMd5FileSaveName = "FieldGuideIconMd5";
 
 
-        private static string[] MusicSrcPaths = new string[] { "../../../gfg/正式资源/music/" };
+        private static string[] MusicSrcPaths { get { return new string[] { ResRootPath + "music/" }; } }
         public static string MusicTargetPath = $"{ResPathUtil.MUSIC_DIR_PATH}/";
         public static string MusicMd5FileSaveName = "MusicMd5";
 
 
-        private static string[] ItemIconSrcPaths = new string[] { "../../../gfg/正式资源/icon/" };
+        private static string[] ItemIconSrcPaths { get { return new string[] { ResRootPath + "icon/" }; } }
         public static string ItemIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Icon/";
         public static string IconMd5FileSaveName = "IconMd5";
 
 
-        private static string[] DressUpSrcPaths = new string[] { "../../../gfg/正式资源/suit/" };
+        private static string[] DressUpSrcPaths { get { return new string[] { ResRootPath + "suit/" }; } }
         public static string DressUpTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string DressUpMd5FileSaveName = "DressUpMd5";
 
-        private static string[] NpcHeadSrcPaths = new string[] { "../../../gfg/正式资源/npc/对战头像/" };
+        private static string[] NpcHeadSrcPaths { get { return new string[] { ResRootPath + "npc/对战头像/" }; } }
         public static string NpcHeadTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Npc/Head/";
         public static string HeadMd5FileSaveName = "HeadMd5";
 
 
-        private static string[] NpcPicSrcPaths = new string[] { "../../../gfg/正式资源/npc/对战立绘/" };
+        private static string[] NpcPicSrcPaths { get { return new string[] { ResRootPath + "npc/对战立绘/" }; } }
         public static string NpcPicTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Npc/PicF/";
         public static string PicFMd5FileSaveName = "PicFMd5";
 
 
-        private static string[] NpcPicSSrcPaths = new string[] { "../../../gfg/正式资源/npc/对话立绘/" };
+        private static string[] NpcPicSSrcPaths { get { return new string[] { ResRootPath + "npc/对话立绘/" }; } }
         public static string NpcPicSTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Npc/PicS/";
         public static string PicSMd5FileSaveName = "PicSMd5";
 
 
-        private static string[] BgSrcPaths = new string[] { "../../../gfg/正式资源/scene/" };
+        private static string[] BgSrcPaths { get { return new string[] { ResRootPath + "scene/" }; } }
         public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string BgMd5FileSaveName = "BgMd5";
 
 
-        private static string[] CardBgSrcPaths = new string[] { "../../../gfg/正式资源/卡牌/pic/" };
+        private static string[] CardBgSrcPaths { get { return new string[] { ResRootPath + "卡牌/pic/" }; } }
         public static string CardBgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Card/Bg/";
         public static string CardBgMd5FileSaveName = "CardBgMd5";
 
 
-        private static string[] CardIconSrcPaths = new string[] { "../../../gfg/正式资源/卡牌/icon/" };
+        private static string[] CardIconSrcPaths { get { return new string[] { ResRootPath + "卡牌/icon/" }; } }
         public static string CardIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Card/Card/";
         public static string CardMd5FileSaveName = "CardMd5";
 
 
-        public static string[] DressUpAnimationSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.ANIMATION_DIR_PATH}/" };
+        public static string[] DressUpAnimationSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.ANIMATION_DIR_PATH}/" }; } }
         public static string DressUpAnimationTargetPath = $"{ResPathUtil.ANIMATION_DIR_PATH}/";
 
 
-        public static string[] EffectSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.EFFECT_DIR_PATH}/" };
+        public static string[] EffectSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.EFFECT_DIR_PATH}/" }; } }
         public static string EffectTargetPath = $"{ResPathUtil.EFFECT_DIR_PATH}/";
 
-        public static string[] MaterialSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.Material_DIR_PATH}/" };
+        public static string[] MaterialSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Material_DIR_PATH}/" }; } }
         public static string MaterialTargetPath = $"{ResPathUtil.Material_DIR_PATH}/";
 
-        public static string[] TextureSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.Texture_DIR_PATH}/" };
+        public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Texture_DIR_PATH}/" }; } }
         public static string TextureTargetPath = $"{ResPathUtil.Texture_DIR_PATH}/";