Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both" designImageLayer="1">
   <displayList>
-    <loader id="n43_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+    <loader id="n45_xv4o" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="378,2112"/>

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -78,7 +78,9 @@ namespace GFGEditor
         public static string PhotoGraphBorderTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Photograph/border/";
         public static string PhotoGraphBorderMd5FileSaveName = "PhotoGraphBorderMd5";
 
-
+        private static string[] UIBgSrcPaths { get { return new string[] { ResRootPath + "UI背景/" }; } }
+        public static string UIBgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/BgImg/";
+        public static string UIBgMd5FileSaveName = "UIBgMd5";
 
         private static string[] ActivityShow2SrcPaths { get { return new string[] { ResRootPath + "activity/show2/" }; } }
         public static string ActivityShow2TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show2/";
@@ -145,6 +147,11 @@ namespace GFGEditor
             //拍照边框
             EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
             ImportRes(PhotoGraphBorderPaths, PhotoGraphBorderTargetPath, PhotoGraphBorderMd5FileSaveName);
+
+            //UI背景
+            EditorUtility.DisplayProgressBar("进度", "正在导入UI背景", 1);
+            ImportRes(UIBgSrcPaths, UIBgTargetPath, UIBgMd5FileSaveName);
+
             //清除冗余动画
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);