From 2f4e5cfbe6e9984af0c79f942a4cf644bd504723 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 15 十一月 2018 09:49:33 +0800
Subject: [PATCH] Merge branch 'master' into builtinmove
---
Assets/Editor/Tool/ClientPackage.cs | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index 33f0f4b..45baa67 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -99,29 +99,63 @@
if (smallPackages.Count > 0)
{
- FileExtersion.DirectoryCopy(_assetBundlePath, ResourcesPath.Instance.StreamingAssetPath);
-
var files = new List<FileInfo>();
- FileExtersion.GetAllDirectoryFileInfos(ResourcesPath.Instance.StreamingAssetPath, files);
+ var builtInFiles = new List<FileInfo>();
+
+ FileExtersion.GetAllDirectoryFileInfos(_assetBundlePath, files);
foreach (var file in files)
{
var fileName = Path.GetFileName(file.FullName);
- if (fileName.Contains("builtin"))
+
+ if (file.FullName.Contains("builtin"))
{
+ builtInFiles.Add(file);
continue;
}
- if (file.FullName.Contains("config/Contact.txt")
- || file.FullName.Contains("config/HelpInfo.txt")
- || file.FullName.Contains("config/PriorBundle.txt")
- || file.FullName.Contains("config/PriorLanguage.txt"))
+ if (file.FullName.Contains("Contact.txt")
+ || file.FullName.Contains("HelpInfo.txt")
+ || file.FullName.Contains("PriorBundle.txt")
+ || file.FullName.Contains("PriorLanguage.txt"))
{
+ builtInFiles.Add(file);
continue;
}
File.Delete(file.FullName);
}
+ var totalCount = builtInFiles.Count;
+ var completeCount = 0;
+ foreach (var item in builtInFiles)
+ {
+ var directory = Path.GetDirectoryName(item.FullName);
+ if (!Directory.Exists(directory))
+ {
+ Directory.CreateDirectory(directory);
+ }
+
+ var relativePath = FileExtersion.GetFileRelativePath(_assetBundlePath, item.FullName);
+ var to = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, relativePath);
+#if UNITY_ANDROID
+ var extension = Path.GetExtension(item.FullName);
+ if (extension == ".meta")
+ {
+ continue;
+ }
+
+ to = to + ".7z";
+ SevenZipUtility.Compress(item.FullName, to);
+ UnityEditor.EditorUtility.DisplayProgressBar("姝ｅ湪鍘嬬缉璧勬簮", item.Name, (float)completeCount / totalCount);
+#elif UNITY_IOS
+ File.Copy(item.FullName,to,true);
+#endif
+
+ completeCount++;
+ }
+
+ EditorUtility.ClearProgressBar();
+
for (int i = 0; i < smallPackages.Count; i++)
{
#if UNITY_ANDROID
--
Gitblit v1.8.0