From 84045b13c6249a12f08fad510bcabc1e293bfa75 Mon Sep 17 00:00:00 2001 From: hevinci Date: Tue, 27 Sep 2022 21:26:00 +0800 Subject: [PATCH] Update samples --- .../GameScript/Runtime/GameScene1.cs | 3 - .../PatchUpdater/FsmNode/FsmUpdateManifest.cs | 2 +- .../FsmNode/FsmUpdateStaticVersion.cs | 6 +- .../Runtime/PatchUpdater/PatchUpdater.cs | 2 +- .../Scripts/Editor/PatchCombineWindow.cs | 186 ------------------ .../Scripts/Editor/PatchImportWindow.cs | 10 +- 6 files changed, 8 insertions(+), 201 deletions(-) delete mode 100644 Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs index dd434d1..a577fcb 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs +++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs @@ -45,9 +45,6 @@ public class GameScene1 : MonoBehaviour void InitWindow() { - var resVersion = CanvasRoot.transform.Find("res_version/label").GetComponent(); - resVersion.text = $"资源版本 : {YooAssets.GetResourceVersion()}"; - var playMode = CanvasRoot.transform.Find("play_mode/label").GetComponent(); if (BootScene.GamePlayMode == YooAssets.EPlayMode.EditorSimulateMode) playMode.text = "编辑器下模拟模式"; diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateManifest.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateManifest.cs index ec3caac..f49f3c3 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateManifest.cs +++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateManifest.cs @@ -24,7 +24,7 @@ public class FsmUpdateManifest : IFsmNode yield return new WaitForSecondsRealtime(0.5f); // 更新补丁清单 - var operation = YooAssets.UpdateManifestAsync(PatchUpdater.ResourceVersion, 30); + var operation = YooAssets.UpdateManifestAsync("DefaultPackage", PatchUpdater.PackageCRC, 30); yield return operation; if(operation.Status == EOperationStatus.Succeed) diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateStaticVersion.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateStaticVersion.cs index 0aba994..38e7576 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateStaticVersion.cs +++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmUpdateStaticVersion.cs @@ -24,13 +24,13 @@ internal class FsmUpdateStaticVersion : IFsmNode yield return new WaitForSecondsRealtime(0.5f); // 更新资源版本号 - var operation = YooAssets.UpdateStaticVersionAsync(30); + var operation = YooAssets.UpdateStaticVersionAsync("DefaultPackage", 30); yield return operation; if (operation.Status == EOperationStatus.Succeed) { - Debug.Log($"Found static version : {operation.ResourceVersion}"); - PatchUpdater.ResourceVersion = operation.ResourceVersion; + Debug.Log($"Found static version : {operation.PackageCRC}"); + PatchUpdater.PackageCRC = operation.PackageCRC; FsmManager.Transition(nameof(FsmUpdateManifest)); } else diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/PatchUpdater.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/PatchUpdater.cs index 8b328d5..5def842 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/PatchUpdater.cs +++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/PatchUpdater.cs @@ -16,7 +16,7 @@ public static class PatchUpdater /// /// 资源版本 /// - public static int ResourceVersion { set; get; } + public static string PackageCRC { set; get; } /// /// 开启初始化流程 diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs deleted file mode 100644 index ac75419..0000000 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs +++ /dev/null @@ -1,186 +0,0 @@ -using System.IO; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using UnityEditor; - -namespace YooAsset.Editor -{ - public class PatchCombineWindow : EditorWindow - { - private class DependInfo - { - public string MainBundleName; - public string[] DependBundleNames; - } - - static PatchCombineWindow _thisInstance; - - [MenuItem("YooAsset/补丁包合并工具", false, 303)] - static void ShowWindow() - { - if (_thisInstance == null) - { - _thisInstance = EditorWindow.GetWindow(typeof(PatchCombineWindow), false, "补丁包合并工具", true) as PatchCombineWindow; - _thisInstance.minSize = new Vector2(800, 600); - } - _thisInstance.Show(); - } - - private string _patchManifestPath1 = string.Empty; - private string _patchManifestPath2 = string.Empty; - private string _patchManifestSaveFolder = string.Empty; - private readonly Dictionary _dependInfos = new Dictionary(1000); - - private void OnGUI() - { - GUILayout.Space(10); - if (GUILayout.Button("选择保存目录", GUILayout.MaxWidth(150))) - { - string resultPath = EditorUtility.OpenFolderPanel("Find", "Assets/", "PatchManifest"); - if (string.IsNullOrEmpty(resultPath)) - return; - _patchManifestSaveFolder = resultPath; - } - EditorGUILayout.TextField("合并清单保存目录", _patchManifestSaveFolder); - - GUILayout.Space(10); - EditorGUILayout.BeginHorizontal(); - if (GUILayout.Button("选择补丁包（主）", GUILayout.MaxWidth(150))) - { - string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); - if (string.IsNullOrEmpty(resultPath)) - return; - _patchManifestPath1 = resultPath; - } - EditorGUILayout.LabelField(_patchManifestPath1); - EditorGUILayout.EndHorizontal(); - - GUILayout.Space(10); - EditorGUILayout.BeginHorizontal(); - if (GUILayout.Button("选择补丁包（副）", GUILayout.MaxWidth(150))) - { - string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); - if (string.IsNullOrEmpty(resultPath)) - return; - _patchManifestPath2 = resultPath; - } - EditorGUILayout.LabelField(_patchManifestPath2); - EditorGUILayout.EndHorizontal(); - - if (string.IsNullOrEmpty(_patchManifestPath1) == false && string.IsNullOrEmpty(_patchManifestPath2) == false) - { - GUILayout.Space(10); - if (GUILayout.Button("合并清单", GUILayout.MaxWidth(150))) - { - CombinePatch(); - } - } - } - private void CombinePatch() - { - // 加载补丁清单1 - string jsonData1 = FileUtility.ReadFile(_patchManifestPath1); - PatchManifest patchManifest1 = PatchManifest.Deserialize(jsonData1); - - // 加载补丁清单1 - string jsonData2 = FileUtility.ReadFile(_patchManifestPath2); - PatchManifest patchManifest2 = PatchManifest.Deserialize(jsonData2); - - // 检测AssetPath是否冲突 - List assetPathList1 = patchManifest1.AssetList.Select(t => t.AssetPath).ToList(); - List assetPathList2 = patchManifest2.AssetList.Select(t => t.AssetPath).ToList(); - List conflictAssetPathList = assetPathList1.Intersect(assetPathList2).ToList(); - if (conflictAssetPathList.Count > 0) - { - foreach (var confictAssetPath in conflictAssetPathList) - { - Debug.LogWarning($"资源路径冲突: {confictAssetPath}"); - } - throw new System.Exception("资源路径冲突！请查看警告信息！"); - } - - // 检测BundleName是否冲突 - List bundleNameList1 = patchManifest1.BundleList.Select(t => t.BundleName).ToList(); - List bundleNameList2 = patchManifest2.BundleList.Select(t => t.BundleName).ToList(); - List conflictBundleNameList = bundleNameList1.Intersect(bundleNameList2).ToList(); - if (conflictBundleNameList.Count > 0) - { - foreach (var confictBundleName in conflictBundleNameList) - { - Debug.LogWarning($"资源包名冲突: {confictBundleName}"); - } - throw new System.Exception("资源包名冲突！请查看警告信息！"); - } - - // 记录副资源清单的依赖关系 - _dependInfos.Clear(); - foreach (var patchAsset in patchManifest2.AssetList) - { - string assetPath = patchAsset.AssetPath; - var mainBundle = patchManifest2.GetMainPatchBundle(assetPath); - var dependBundles = patchManifest2.GetAllDependencies(assetPath); - DependInfo dependInfo = new DependInfo(); - dependInfo.MainBundleName = mainBundle.BundleName; - dependInfo.DependBundleNames = dependBundles.Select(t => t.BundleName).ToArray(); - _dependInfos.Add(patchAsset, dependInfo); - } - - // 副资源清单填充到主资源清单 - patchManifest1.AssetList.AddRange(patchManifest2.AssetList); - patchManifest1.BundleList.AddRange(patchManifest2.BundleList); - - // 更新填充资源的依赖关系 - foreach (var patchAsset in _dependInfos.Keys) - { - patchAsset.BundleID = GetBundleID(patchManifest1, patchAsset); - patchAsset.DependIDs = GetDependIDs(patchManifest1, patchAsset); - } - - // 创建合并后的清单文件 - string fileSavePath = $"{_patchManifestSaveFolder}/{YooAssetSettingsData.GetPatchManifestFileName(patchManifest1.ResourceVersion)}"; - PatchManifest.Serialize(fileSavePath, patchManifest1); - - // 创建补丁清单哈希文件 - string manifestHashFilePath = $"{_patchManifestSaveFolder}/{YooAssetSettingsData.GetPatchManifestHashFileName(patchManifest1.ResourceVersion)}"; - string manifestHash = HashUtility.FileMD5(fileSavePath); - FileUtility.CreateFile(manifestHashFilePath, manifestHash); - - Debug.Log("资源清单合并完成！"); - } - - private int GetBundleID(PatchManifest mainManifest, PatchAsset patchAsset) - { - if (_dependInfos.TryGetValue(patchAsset, out DependInfo dependInfo)) - { - int index = mainManifest.BundleList.FindIndex(item => item.BundleName.Equals(dependInfo.MainBundleName)); - if (index < 0) - throw new System.Exception("Should never get here !"); - return index; - } - else - { - throw new System.Exception("Should never get here !"); - } - } - private int[] GetDependIDs(PatchManifest mainManifest, PatchAsset patchAsset) - { - if (_dependInfos.TryGetValue(patchAsset, out DependInfo dependInfo)) - { - List results = new List(); - foreach (var dependBundleName in dependInfo.DependBundleNames) - { - int index = mainManifest.BundleList.FindIndex(item => item.BundleName.Equals(dependBundleName)); - if (index < 0) - throw new System.Exception("Should never get here !"); - results.Add(index); - } - return results.ToArray(); - } - else - { - throw new System.Exception("Should never get here !"); - } - } - } -} \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs index 9a7299e..312de9c 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchImportWindow.cs @@ -66,13 +66,9 @@ namespace YooAsset.Editor EditorTools.CopyFile(sourcePath, destPath, true); } { - string sourcePath = $"{outputDirectory}/{manifestFileName}.hash"; - string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{manifestFileName}.hash"; - EditorTools.CopyFile(sourcePath, destPath, true); - } - { - string sourcePath = $"{outputDirectory}/{YooAssetSettings.VersionFileName}"; - string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettings.VersionFileName}"; + string fileName = YooAssetSettingsData.GetStaticVersionFileName(patchManifest.PackageName); + string sourcePath = $"{outputDirectory}/{fileName}"; + string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{fileName}"; EditorTools.CopyFile(sourcePath, destPath, true); }