update extension sample
parent
67d09d95fa
commit
1ce1a6f0ff
|
@ -6,25 +6,25 @@ using UnityEditor;
|
||||||
|
|
||||||
namespace YooAsset.Editor
|
namespace YooAsset.Editor
|
||||||
{
|
{
|
||||||
public class PatchCompareWindow : EditorWindow
|
public class PackageCompareWindow : EditorWindow
|
||||||
{
|
{
|
||||||
static PatchCompareWindow _thisInstance;
|
static PackageCompareWindow _thisInstance;
|
||||||
|
|
||||||
[MenuItem("YooAsset/补丁包比对工具", false, 302)]
|
[MenuItem("YooAsset/补丁包比对工具", false, 302)]
|
||||||
static void ShowWindow()
|
static void ShowWindow()
|
||||||
{
|
{
|
||||||
if (_thisInstance == null)
|
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.minSize = new Vector2(800, 600);
|
||||||
}
|
}
|
||||||
_thisInstance.Show();
|
_thisInstance.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _patchManifestPath1 = string.Empty;
|
private string _manifestPath1 = string.Empty;
|
||||||
private string _patchManifestPath2 = string.Empty;
|
private string _manifestPath2 = string.Empty;
|
||||||
private readonly List<PatchBundle> _changeList = new List<PatchBundle>();
|
private readonly List<PackageBundle> _changeList = new List<PackageBundle>();
|
||||||
private readonly List<PatchBundle> _newList = new List<PatchBundle>();
|
private readonly List<PackageBundle> _newList = new List<PackageBundle>();
|
||||||
private Vector2 _scrollPos1;
|
private Vector2 _scrollPos1;
|
||||||
private Vector2 _scrollPos2;
|
private Vector2 _scrollPos2;
|
||||||
|
|
||||||
|
@ -37,9 +37,9 @@ namespace YooAsset.Editor
|
||||||
string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
|
string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
|
||||||
if (string.IsNullOrEmpty(resultPath))
|
if (string.IsNullOrEmpty(resultPath))
|
||||||
return;
|
return;
|
||||||
_patchManifestPath1 = resultPath;
|
_manifestPath1 = resultPath;
|
||||||
}
|
}
|
||||||
EditorGUILayout.LabelField(_patchManifestPath1);
|
EditorGUILayout.LabelField(_manifestPath1);
|
||||||
EditorGUILayout.EndHorizontal();
|
EditorGUILayout.EndHorizontal();
|
||||||
|
|
||||||
GUILayout.Space(10);
|
GUILayout.Space(10);
|
||||||
|
@ -49,16 +49,16 @@ namespace YooAsset.Editor
|
||||||
string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
|
string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
|
||||||
if (string.IsNullOrEmpty(resultPath))
|
if (string.IsNullOrEmpty(resultPath))
|
||||||
return;
|
return;
|
||||||
_patchManifestPath2 = resultPath;
|
_manifestPath2 = resultPath;
|
||||||
}
|
}
|
||||||
EditorGUILayout.LabelField(_patchManifestPath2);
|
EditorGUILayout.LabelField(_manifestPath2);
|
||||||
EditorGUILayout.EndHorizontal();
|
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)))
|
if (GUILayout.Button("比对差异", GUILayout.MaxWidth(150)))
|
||||||
{
|
{
|
||||||
ComparePatch(_changeList, _newList);
|
ComparePackage(_changeList, _newList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,32 +99,32 @@ namespace YooAsset.Editor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ComparePatch(List<PatchBundle> changeList, List<PatchBundle> newList)
|
private void ComparePackage(List<PackageBundle> changeList, List<PackageBundle> newList)
|
||||||
{
|
{
|
||||||
changeList.Clear();
|
changeList.Clear();
|
||||||
newList.Clear();
|
newList.Clear();
|
||||||
|
|
||||||
// 加载补丁清单1
|
// 加载补丁清单1
|
||||||
byte[] bytesData1 = FileUtility.ReadAllBytes(_patchManifestPath1);
|
byte[] bytesData1 = FileUtility.ReadAllBytes(_manifestPath1);
|
||||||
PatchManifest patchManifest1 = PatchManifestTools.DeserializeFromBinary(bytesData1);
|
PackageManifest manifest1 = ManifestTools.DeserializeFromBinary(bytesData1);
|
||||||
|
|
||||||
// 加载补丁清单1
|
// 加载补丁清单1
|
||||||
byte[] bytesData2 = FileUtility.ReadAllBytes(_patchManifestPath2);
|
byte[] bytesData2 = FileUtility.ReadAllBytes(_manifestPath2);
|
||||||
PatchManifest patchManifest2 = PatchManifestTools.DeserializeFromBinary(bytesData2);
|
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
|
else
|
||||||
{
|
{
|
||||||
newList.Add(patchBundle2);
|
newList.Add(bundle2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,22 +4,22 @@ using UnityEditor;
|
||||||
|
|
||||||
namespace YooAsset.Editor
|
namespace YooAsset.Editor
|
||||||
{
|
{
|
||||||
public class PatchImportWindow : EditorWindow
|
public class PackageImportWindow : EditorWindow
|
||||||
{
|
{
|
||||||
static PatchImportWindow _thisInstance;
|
static PackageImportWindow _thisInstance;
|
||||||
|
|
||||||
[MenuItem("YooAsset/补丁包导入工具", false, 301)]
|
[MenuItem("YooAsset/补丁包导入工具", false, 301)]
|
||||||
static void ShowWindow()
|
static void ShowWindow()
|
||||||
{
|
{
|
||||||
if (_thisInstance == null)
|
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.minSize = new Vector2(800, 600);
|
||||||
}
|
}
|
||||||
_thisInstance.Show();
|
_thisInstance.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _patchManifestPath = string.Empty;
|
private string _manifestPath = string.Empty;
|
||||||
|
|
||||||
private void OnGUI()
|
private void OnGUI()
|
||||||
{
|
{
|
||||||
|
@ -30,29 +30,29 @@ namespace YooAsset.Editor
|
||||||
string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
|
string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
|
||||||
if (string.IsNullOrEmpty(resultPath))
|
if (string.IsNullOrEmpty(resultPath))
|
||||||
return;
|
return;
|
||||||
_patchManifestPath = resultPath;
|
_manifestPath = resultPath;
|
||||||
}
|
}
|
||||||
EditorGUILayout.LabelField(_patchManifestPath);
|
EditorGUILayout.LabelField(_manifestPath);
|
||||||
EditorGUILayout.EndHorizontal();
|
EditorGUILayout.EndHorizontal();
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(_patchManifestPath) == false)
|
if (string.IsNullOrEmpty(_manifestPath) == false)
|
||||||
{
|
{
|
||||||
if (GUILayout.Button("导入补丁包(全部文件)", GUILayout.MaxWidth(150)))
|
if (GUILayout.Button("导入补丁包(全部文件)", GUILayout.MaxWidth(150)))
|
||||||
{
|
{
|
||||||
AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
|
AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
|
||||||
CopyPatchFiles(_patchManifestPath);
|
CopyPackageFiles(_manifestPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CopyPatchFiles(string patchManifestFilePath)
|
private void CopyPackageFiles(string manifestFilePath)
|
||||||
{
|
{
|
||||||
string manifestFileName = Path.GetFileNameWithoutExtension(patchManifestFilePath);
|
string manifestFileName = Path.GetFileNameWithoutExtension(manifestFilePath);
|
||||||
string outputDirectory = Path.GetDirectoryName(patchManifestFilePath);
|
string outputDirectory = Path.GetDirectoryName(manifestFilePath);
|
||||||
|
|
||||||
// 加载补丁清单
|
// 加载补丁清单
|
||||||
byte[] bytesData = FileUtility.ReadAllBytes(patchManifestFilePath);
|
byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath);
|
||||||
PatchManifest patchManifest = PatchManifestTools.DeserializeFromBinary(bytesData);
|
PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData);
|
||||||
|
|
||||||
// 拷贝核心文件
|
// 拷贝核心文件
|
||||||
{
|
{
|
||||||
|
@ -66,7 +66,7 @@ namespace YooAsset.Editor
|
||||||
EditorTools.CopyFile(sourcePath, destPath, true);
|
EditorTools.CopyFile(sourcePath, destPath, true);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
string fileName = YooAssetSettingsData.GetPackageVersionFileName(patchManifest.PackageName);
|
string fileName = YooAssetSettingsData.GetPackageVersionFileName(manifest.PackageName);
|
||||||
string sourcePath = $"{outputDirectory}/{fileName}";
|
string sourcePath = $"{outputDirectory}/{fileName}";
|
||||||
string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{fileName}";
|
string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{fileName}";
|
||||||
EditorTools.CopyFile(sourcePath, destPath, true);
|
EditorTools.CopyFile(sourcePath, destPath, true);
|
||||||
|
@ -74,11 +74,11 @@ namespace YooAsset.Editor
|
||||||
|
|
||||||
// 拷贝文件列表
|
// 拷贝文件列表
|
||||||
int fileCount = 0;
|
int fileCount = 0;
|
||||||
foreach (var patchBundle in patchManifest.BundleList)
|
foreach (var packageBundle in manifest.BundleList)
|
||||||
{
|
{
|
||||||
fileCount++;
|
fileCount++;
|
||||||
string sourcePath = $"{outputDirectory}/{patchBundle.FileName}";
|
string sourcePath = $"{outputDirectory}/{packageBundle.FileName}";
|
||||||
string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.FileName}";
|
string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{packageBundle.FileName}";
|
||||||
EditorTools.CopyFile(sourcePath, destPath, true);
|
EditorTools.CopyFile(sourcePath, destPath, true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue