From 1ce1a6f0ff0072156378235a8e7aee2fe63b5a18 Mon Sep 17 00:00:00 2001 From: hevinci Date: Sat, 11 Mar 2023 00:08:15 +0800 Subject: [PATCH] update extension sample --- ...mpareWindow.cs => PackageCompareWindow.cs} | 46 +++++++++---------- ...w.cs.meta => PackageCompareWindow.cs.meta} | 0 ...ImportWindow.cs => PackageImportWindow.cs} | 34 +++++++------- ...ow.cs.meta => PackageImportWindow.cs.meta} | 0 4 files changed, 40 insertions(+), 40 deletions(-) rename Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/{PatchCompareWindow.cs => PackageCompareWindow.cs} (63%) rename Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/{PatchCompareWindow.cs.meta => PackageCompareWindow.cs.meta} (100%) rename Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/{PatchImportWindow.cs => PackageImportWindow.cs} (65%) rename Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/{PatchImportWindow.cs.meta => PackageImportWindow.cs.meta} (100%) diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCompareWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs similarity index 63% rename from Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCompareWindow.cs rename to Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs index a56d8e0..2cea177 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCompareWindow.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs @@ -6,25 +6,25 @@ using UnityEditor; namespace YooAsset.Editor { - public class PatchCompareWindow : EditorWindow + public class PackageCompareWindow : EditorWindow { - static PatchCompareWindow _thisInstance; + static PackageCompareWindow _thisInstance; [MenuItem("YooAsset/补丁包比对工具", false, 302)] static void ShowWindow() { if (_thisInstance == null) { - _thisInstance = EditorWindow.GetWindow(typeof(PatchCompareWindow), false, "补丁包比对工具", true) as PatchCompareWindow; + _thisInstance = EditorWindow.GetWindow(typeof(PackageCompareWindow), false, "补丁包比对工具", true) as PackageCompareWindow; _thisInstance.minSize = new Vector2(800, 600); } _thisInstance.Show(); } - private string _patchManifestPath1 = string.Empty; - private string _patchManifestPath2 = string.Empty; - private readonly List _changeList = new List(); - private readonly List _newList = new List(); + private string _manifestPath1 = string.Empty; + private string _manifestPath2 = string.Empty; + private readonly List _changeList = new List(); + private readonly List _newList = new List(); private Vector2 _scrollPos1; private Vector2 _scrollPos2; @@ -37,9 +37,9 @@ namespace YooAsset.Editor string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); if (string.IsNullOrEmpty(resultPath)) return; - _patchManifestPath1 = resultPath; + _manifestPath1 = resultPath; } - EditorGUILayout.LabelField(_patchManifestPath1); + EditorGUILayout.LabelField(_manifestPath1); EditorGUILayout.EndHorizontal(); GUILayout.Space(10); @@ -49,16 +49,16 @@ namespace YooAsset.Editor string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); if (string.IsNullOrEmpty(resultPath)) return; - _patchManifestPath2 = resultPath; + _manifestPath2 = resultPath; } - EditorGUILayout.LabelField(_patchManifestPath2); + EditorGUILayout.LabelField(_manifestPath2); EditorGUILayout.EndHorizontal(); - if (string.IsNullOrEmpty(_patchManifestPath1) == false && string.IsNullOrEmpty(_patchManifestPath2) == false) + if (string.IsNullOrEmpty(_manifestPath1) == false && string.IsNullOrEmpty(_manifestPath2) == false) { if (GUILayout.Button("比对差异", GUILayout.MaxWidth(150))) { - ComparePatch(_changeList, _newList); + ComparePackage(_changeList, _newList); } } @@ -99,32 +99,32 @@ namespace YooAsset.Editor } } - private void ComparePatch(List changeList, List newList) + private void ComparePackage(List changeList, List newList) { changeList.Clear(); newList.Clear(); // 加载补丁清单1 - byte[] bytesData1 = FileUtility.ReadAllBytes(_patchManifestPath1); - PatchManifest patchManifest1 = PatchManifestTools.DeserializeFromBinary(bytesData1); + byte[] bytesData1 = FileUtility.ReadAllBytes(_manifestPath1); + PackageManifest manifest1 = ManifestTools.DeserializeFromBinary(bytesData1); // 加载补丁清单1 - byte[] bytesData2 = FileUtility.ReadAllBytes(_patchManifestPath2); - PatchManifest patchManifest2 = PatchManifestTools.DeserializeFromBinary(bytesData2); + byte[] bytesData2 = FileUtility.ReadAllBytes(_manifestPath2); + PackageManifest manifest2 = ManifestTools.DeserializeFromBinary(bytesData2); // 拷贝文件列表 - foreach (var patchBundle2 in patchManifest2.BundleList) + foreach (var bundle2 in manifest2.BundleList) { - if (patchManifest1.TryGetPatchBundle(patchBundle2.BundleName, out PatchBundle patchBundle1)) + if (manifest1.TryGetPackageBundle(bundle2.BundleName, out PackageBundle bundle1)) { - if (patchBundle2.FileHash != patchBundle1.FileHash) + if (bundle2.FileHash != bundle1.FileHash) { - changeList.Add(patchBundle2); + changeList.Add(bundle2); } } else { - newList.Add(patchBundle2); + newList.Add(bundle2); } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCompareWindow.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCompareWindow.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs similarity index 65% rename from Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs rename to Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs index c1c5007..67ea091 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs @@ -4,22 +4,22 @@ using UnityEditor; namespace YooAsset.Editor { - public class PatchImportWindow : EditorWindow + public class PackageImportWindow : EditorWindow { - static PatchImportWindow _thisInstance; + static PackageImportWindow _thisInstance; [MenuItem("YooAsset/补丁包导入工具", false, 301)] static void ShowWindow() { if (_thisInstance == null) { - _thisInstance = EditorWindow.GetWindow(typeof(PatchImportWindow), false, "补丁包导入工具", true) as PatchImportWindow; + _thisInstance = EditorWindow.GetWindow(typeof(PackageImportWindow), false, "补丁包导入工具", true) as PackageImportWindow; _thisInstance.minSize = new Vector2(800, 600); } _thisInstance.Show(); } - private string _patchManifestPath = string.Empty; + private string _manifestPath = string.Empty; private void OnGUI() { @@ -30,29 +30,29 @@ namespace YooAsset.Editor string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); if (string.IsNullOrEmpty(resultPath)) return; - _patchManifestPath = resultPath; + _manifestPath = resultPath; } - EditorGUILayout.LabelField(_patchManifestPath); + EditorGUILayout.LabelField(_manifestPath); EditorGUILayout.EndHorizontal(); - if (string.IsNullOrEmpty(_patchManifestPath) == false) + if (string.IsNullOrEmpty(_manifestPath) == false) { if (GUILayout.Button("导入补丁包（全部文件）", GUILayout.MaxWidth(150))) { AssetBundleBuilderHelper.ClearStreamingAssetsFolder(); - CopyPatchFiles(_patchManifestPath); + CopyPackageFiles(_manifestPath); } } } - private void CopyPatchFiles(string patchManifestFilePath) + private void CopyPackageFiles(string manifestFilePath) { - string manifestFileName = Path.GetFileNameWithoutExtension(patchManifestFilePath); - string outputDirectory = Path.GetDirectoryName(patchManifestFilePath); + string manifestFileName = Path.GetFileNameWithoutExtension(manifestFilePath); + string outputDirectory = Path.GetDirectoryName(manifestFilePath); // 加载补丁清单 - byte[] bytesData = FileUtility.ReadAllBytes(patchManifestFilePath); - PatchManifest patchManifest = PatchManifestTools.DeserializeFromBinary(bytesData); + byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath); + PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData); // 拷贝核心文件 { @@ -66,7 +66,7 @@ namespace YooAsset.Editor EditorTools.CopyFile(sourcePath, destPath, true); } { - string fileName = YooAssetSettingsData.GetPackageVersionFileName(patchManifest.PackageName); + string fileName = YooAssetSettingsData.GetPackageVersionFileName(manifest.PackageName); string sourcePath = $"{outputDirectory}/{fileName}"; string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{fileName}"; EditorTools.CopyFile(sourcePath, destPath, true); @@ -74,11 +74,11 @@ namespace YooAsset.Editor // 拷贝文件列表 int fileCount = 0; - foreach (var patchBundle in patchManifest.BundleList) + foreach (var packageBundle in manifest.BundleList) { fileCount++; - string sourcePath = $"{outputDirectory}/{patchBundle.FileName}"; - string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.FileName}"; + string sourcePath = $"{outputDirectory}/{packageBundle.FileName}"; + string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{packageBundle.FileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs.meta