From f541732952b31404c35981f5470ff39f1625e0b1 Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期一, 18 一月 2021 14:55:50 +0800
Subject: [PATCH] 8697 【主干】分包下载提取原写死的打包逻辑

---
 Assets/Editor/Tool/ClientPackage.cs |   74 +++++++++++++++++++++++++------------
 1 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index f10d2c6..c68a499 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -27,6 +27,17 @@
         get { return LocalSave.GetBool("obfuscatorEnabled", false); }
         set { LocalSave.SetBool("obfuscatorEnabled", value); }
     }
+    public static bool includeConfig
+    {
+        get { return LocalSave.GetBool("client_pg_includeConfig", false); }
+        set { LocalSave.SetBool("client_pg_includeConfig", value); }
+    }
+
+    public static bool includeUI
+    {
+        get { return LocalSave.GetBool("client_pg_includeUI", false); }
+        set { LocalSave.SetBool("client_pg_includeUI", value); }
+    }
 
     public static int AssetPrior
     {
@@ -188,12 +199,7 @@
             foreach (var file in tempFiles)
             {
                 var extersion = Path.GetExtension(file.FullName);
-                var fileName = Path.GetFileName(file.FullName);
-                if (!string.IsNullOrEmpty(extersion))
-                {
-                    fileName = fileName.Replace(extersion, "");
-                }
-
+                var fileName = Path.GetFileNameWithoutExtension(file.FullName);
                 var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Mob, fileName);
                 if (prior > AssetPrior)
                 {
@@ -206,12 +212,7 @@
             foreach (var file in tempFiles)
             {
                 var extersion = Path.GetExtension(file.FullName);
-                var fileName = Path.GetFileName(file.FullName);
-                if (!string.IsNullOrEmpty(extersion))
-                {
-                    fileName = fileName.Replace(extersion, "");
-                }
-
+                var fileName = Path.GetFileNameWithoutExtension(file.FullName);
                 var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Scene, fileName);
                 if (prior > AssetPrior)
                 {
@@ -224,12 +225,7 @@
             foreach (var file in tempFiles)
             {
                 var extersion = Path.GetExtension(file.FullName);
-                var fileName = Path.GetFileName(file.FullName);
-                if (!string.IsNullOrEmpty(extersion))
-                {
-                    fileName = fileName.Replace(extersion, "");
-                }
-
+                var fileName = Path.GetFileNameWithoutExtension(file.FullName);
                 var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Audio, fileName);
                 if (prior > AssetPrior)
                 {
@@ -242,12 +238,7 @@
             foreach (var file in tempFiles)
             {
                 var extersion = Path.GetExtension(file.FullName);
-                var fileName = Path.GetFileName(file.FullName);
-                if (!string.IsNullOrEmpty(extersion))
-                {
-                    fileName = fileName.Replace(extersion, "");
-                }
-
+                var fileName = Path.GetFileNameWithoutExtension(file.FullName);
                 var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Effect, fileName);
                 if (prior > AssetPrior)
                 {
@@ -255,6 +246,32 @@
                 }
             }
 
+            //鍓旈櫎瑙嗛璧勬簮
+            tempFiles.Clear();
+            FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/video"), tempFiles);
+            foreach (var file in tempFiles)
+            {
+                var extersion = Path.GetExtension(file.FullName);
+                var fileName = Path.GetFileNameWithoutExtension(file.FullName);
+                var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Video, fileName);
+                if (prior > AssetPrior)
+                {
+                    excludeFileFullNames.Add(file.FullName);
+                }
+            }
+
+            //鍓旈櫎琛ㄨ祫婧�
+            if (!includeConfig)
+            {
+                tempFiles.Clear();
+                FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/config"), tempFiles);
+                foreach (var file in tempFiles)
+                {
+                    excludeFileFullNames.Add(file.FullName);
+                }
+            }
+
+            //鍓旈櫎UI璧勬簮
             tempFiles.Clear();
             FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/ui/sprite"), tempFiles);
             foreach (var file in tempFiles)
@@ -265,6 +282,15 @@
                     excludeFileFullNames.Add(file.FullName);
                 }
             }
+            if (!includeUI)
+            {
+                tempFiles.Clear();
+                FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/ui"), tempFiles);
+                foreach (var file in tempFiles)
+                {
+                    excludeFileFullNames.Add(file.FullName);
+                }
+            }
 
             for (int i = fromFiles.Count - 1; i >= 0; i--)
             {

--
Gitblit v1.8.0