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

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -107,10 +107,6 @@ namespace VEngine.Editor.Builds
             var suitCfgs = SuitCfgArray.Instance.dataArray;
             foreach(var suitCfg in suitCfgs)
             {
-                if (suitCfg.isHide <= 0)
-                {
-                    continue;
-                }
                 HideSuitActionRes(suitCfg, hideFilePathList, hideDirPahtList);
             }
             //卡牌资源打包屏蔽
@@ -130,6 +126,7 @@ namespace VEngine.Editor.Builds
             }
             CheckAssets();
             EditorUtility.ClearProgressBar();
+            return;
             FinishBuild();
         }
 
@@ -154,9 +151,33 @@ namespace VEngine.Editor.Builds
             string resPath;
             if(!string.IsNullOrEmpty(suitCfg.aniRes))
             {
-                //立绘
-                //resPath = ResPathUtil.GetDressUpPath(suitCfg.aniRes);
-                //hideFilePathList.Add(resPath);
+                //屏蔽立绘资源，临时代码，下个大版本将删除
+                bool used = false;
+                var luckyboxCfgs = LuckyBoxCfgArray.Instance.dataArray;
+                foreach(var luckyboxCfg in luckyboxCfgs)
+                {
+                    if(luckyboxCfg.isAni <= 0 && luckyboxCfg.suitIdArr != null)
+                    {
+
+                        if (Array.IndexOf(luckyboxCfg.suitIdArr, suitCfg.id) >= 0)
+                        {
+                            used = true;
+                        }
+                    }
+                }
+                if(used)
+                {
+                    Debug.Log($"suit {suitCfg.id} used picture res");
+                }
+                else
+                {
+                    resPath = ResPathUtil.GetDressUpPath(suitCfg.aniRes);
+                    hideFilePathList.Add(resPath);
+                }
+                if (suitCfg.isHide <= 0)
+                {
+                    return;
+                }
                 //动画
                 resPath = ResPathUtil.GetDressUpAnimationDirPath(suitCfg.aniRes);
                 hideDirPahtList.Add(resPath);