root/plugin-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
张铮
2025-10-24 11:50:03 +08:00
parent cdd5eafa64
commit 655dfcf974
4 changed files with 124 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
Assets/00.StaryEvo/Editor/ArtBuild/BuildArtAssetWindow.cs
View File

@@ -11,10 +11,6 @@ using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Threading.Tasks;
#if HotUpdate
using HybridCLR.Editor;
using HybridCLR.Editor.Commands;
#endif
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Sirenix.OdinInspector;
@@ -26,22 +22,21 @@ using YooAsset.Editor;
namespace Stary.Evo.Editor
{
public class BuildAssetWindow : OdinEditorWindow
public class BuildArtAssetWindow : OdinEditorWindow
{
public static OdinEditorWindow window;
private HotfixMainResDomain hotfixMainResDomain;
[MenuItem("Evo/Art资源打包工具")]
[MenuItem("Evo/Art/Art资源打包工具")]
static void ShowWindows()
{
if (CreatAssetWindow.GetCreatDomainAll().Count <= 0)
{
EditorUtility.DisplayDialog("提示", "不存在Domain元素，无法打开此面板，请先创建Domain元素", "确定");
EditorUtility.DisplayDialog("提示", "不存在Art元素，无法打开此面板，请先创建Art元素", "确定");
return;
}
window = (BuildAssetWindow)EditorWindow.GetWindow(typeof(BuildAssetWindow));
window = (BuildArtAssetWindow)EditorWindow.GetWindow(typeof(BuildArtAssetWindow));
window.Show();
}
@@ -64,7 +59,7 @@ namespace Stary.Evo.Editor
else
{
ip = hotfixMainResDomain.hotfixMainResDomainEntity.ipconfig;
EditorPrefs.SetString("ip",ip);
EditorPrefs.SetString("ip", ip);
userName = hotfixMainResDomain.hotfixMainResDomainEntity.username;
password = hotfixMainResDomain.hotfixMainResDomainEntity.password;
}
@@ -79,11 +74,20 @@ namespace Stary.Evo.Editor
if (isValidateToken)
{
buildAssetType = BuildAssetType.Build;
return;
}
else
{
buildAssetType = BuildAssetType.Login;
}
buildAssetType = BuildAssetType.Login;
//初始化打包管线
_buildPipelineViewer = new ScriptableBuildPipelineViewer(packageName,
EBuildPipeline.ScriptableBuildPipeline.ToString(), packageVersion);
_buildPipelineViewer.clearBuildCacheToggle = true;
_buildPipelineViewer.useAssetDependencyDBToggle = false;
_buildPipelineViewer.SetBuildCacheToggle();
_buildPipelineViewer.SetUseAssetDependencyDB();
}
public static void RemoveBuildAssetWindow()
@@ -129,7 +133,7 @@ namespace Stary.Evo.Editor
hotfixMainResDomain.hotfixMainResDomainEntity.ipconfig = ip;
hotfixMainResDomain.hotfixMainResDomainEntity.username = userName;
hotfixMainResDomain.hotfixMainResDomainEntity.password = password;
EditorPrefs.SetString("ip",ip);
EditorPrefs.SetString("ip", ip);
EditorUtility.SetDirty(hotfixMainResDomain);
AssetDatabase.SaveAssets();
}
@@ -150,8 +154,8 @@ namespace Stary.Evo.Editor
protected void OnSelectionChange()
{
EditorUtility.SetDirty(BuildAssetDataSetting);
AssetDatabase.SaveAssets();
// EditorUtility.SetDirty(BuildAssetDataSetting);
// AssetDatabase.SaveAssets();
//AssetDatabase.Refresh();
}
@@ -170,44 +174,25 @@ namespace Stary.Evo.Editor
[HorizontalGroup("Build/BuildPipeline"), HideLabel]
public string buildTarget;
public static string packageName;
private static string packageName;
#region HyBridCLRBuild
[BoxGroup("Build", showLabel: false)]
[HideIf("@ buildAssetType!= BuildAssetType.Build")]
[Title("打包dll(子包仅打一次)", titleAlignment: TitleAlignments.Centered)]
[HorizontalGroup("Build/HyBridClrBuildEntity"), HideLabel]
public BuildAssetEntity hyBridClrBuildEntity =
new BuildAssetEntity("HyBridCLRBuild", "DllBuildTarget", () =>
{
#if HotUpdate
//PrebuildCommand.GenerateAll();
CompileDllCommand.CompileDllActiveBuildTarget();
#endif
});
#endregion
#region MarkAsset
[BoxGroup("Build", showLabel: false)]
[Title("版本号", titleAlignment: TitleAlignments.Centered)]
[HorizontalGroup("Build/PackageVersion"), HideLabel]
[ShowIf("@ buildAssetType== BuildAssetType.Build")]
[Title("标记资源", titleAlignment: TitleAlignments.Centered)]
[HorizontalGroup("Build/HyBridClrBuildEntity"), HideLabel]
public BuildAssetEntity markAssetEntity =
new BuildAssetEntity("MarkAsset", "MarkAsset", MarkAdressable.AddMark);
[OnValueChanged("OnPackageValueChanged")]
public string packageVersion;
private AbstractBuildPipelineViewer _buildPipelineViewer;
#endregion
#region BuildAsset
[BoxGroup("Build", showLabel: false)]
[ShowIf("@ buildAssetType== BuildAssetType.Build")]
[InlineEditor(InlineEditorObjectFieldModes.CompletelyHidden)]
[HideLabel]
public BuildAssetDataSetting BuildAssetDataSetting;
public void OnPackageValueChanged()
{
_buildPipelineViewer.SetBuildPackageData(packageName, EBuildPipeline.ScriptableBuildPipeline.ToString(),
packageVersion);
}
/// <summary>
/// 检测当前所有包裹
@@ -216,61 +201,20 @@ namespace Stary.Evo.Editor
private List<string> GetBuildPackageNames()
{
List<string> result = new List<string>();
foreach (var name in CreatAssetWindow.GetCreatDomainAllName())
foreach (var name in CreatArtAssetWindow.GetCreatDomainAllName())
{
result.Add(name);
}
if (selectedPackageNames.IsNullOrEmpty())
{
// string buildPackageName = DataSetting.packageName;
// if (result.Exists(p => p == buildPackageName))
// {
// selectedPackageNames = buildPackageName;
// }
// else
// {
selectedPackageNames = result[0];
//}
}
SetBuildPackageNames();
return result;
}
/// <summary>
/// 设置当前包裹
/// </summary>
/// <returns></returns>
private void SetBuildPackageNames()
{
//PlayerPrefs.SetString("BuildPackageNames", selectedPackageNames);
// DataSetting.packageName = selectedPackageNames;
// DataSetting = Resources.Load<BuildAssetDataSetting>("BuildAssetDataSetting");
string buildAssetDataSettingPath =
$"Assets/Domain/{selectedPackageNames}/Conf/BuildAssetDataSetting.asset";
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(buildAssetDataSettingPath);
if (buildAssetDataSetting != null)
{
BuildAssetDataSetting = buildAssetDataSetting;
Init();
}
else
{
Debug.LogError($"UnityEvo:BuildAssetDataSetting 不存在，请检查路径{buildAssetDataSettingPath}");
}
if (selectedPackageNames != packageName)
{
GetHostBuildPackageVersion(buildAssetDataSetting);
}
packageName = selectedPackageNames;
}
/// <summary>
/// 获取当前包裹
/// </summary>
@@ -280,6 +224,22 @@ namespace Stary.Evo.Editor
return packageName;
}
/// <summary>
/// 设置当前包裹
/// </summary>
/// <returns></returns>
private void SetBuildPackageNames()
{
if (selectedPackageNames != packageName)
{
GetHostBuildPackageVersion();
Init();
}
packageName = selectedPackageNames;
OnPackageValueChanged();
}
#endregion
#region Update
@@ -291,10 +251,9 @@ namespace Stary.Evo.Editor
public BuildAssetEntity onBuildPipelineEntity;
[BoxGroup("Build", showLabel: false)]
[ShowIf("@ buildAssetType== BuildAssetType.Build")]
[Title("上传资源", titleAlignment: TitleAlignments.Centered)]
[HideLabel]
[ShowIf(
"@ BuildAssetDataSetting.environmentType== EnvironmentType.Release && buildAssetType== BuildAssetType.Build")]
public BuildAssetEntity onUpdateBuildPipelineEntity;
@@ -303,7 +262,7 @@ namespace Stary.Evo.Editor
if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{selectedPackageNames}]！", "Yes", "No"))
{
EditorTools.ClearUnityConsole();
EditorApplication.delayCall += BuildAssetDataSetting.viewer.ExecuteBuild;
MarkAdressable.AddArtMark(() => { EditorApplication.delayCall += _buildPipelineViewer.ExecuteBuild; });
}
else
{
@@ -316,8 +275,8 @@ namespace Stary.Evo.Editor
if (EditorUtility.DisplayDialog("提示", $"开始上传至服务器[{selectedPackageNames}]！", "Yes", "No"))
{
// 新增：打包为zip的逻辑
string zipFilePath = BuildZip(BuildAssetDataSetting);
await UpdateFileDataResDomain(BuildAssetDataSetting, zipFilePath);
string zipFilePath = BuildZip();
await UpdateFileDataResDomain(zipFilePath);
await Task.Delay(1000);
EditorUtility.ClearProgressBar();
}
@@ -330,21 +289,21 @@ namespace Stary.Evo.Editor
}
public static string BuildZip(BuildAssetDataSetting setting)
public string BuildZip()
{
EditorUtility.DisplayProgressBar("提示", $"开始上传{setting.packageName}(打包zip)", 0.0f);
EditorUtility.DisplayProgressBar("提示", $"开始上传{packageName}(打包zip)", 0.0f);
// 新增：打包为zip的逻辑
string zipFileName =
$"{setting.packageName}_{setting.packageVersion}.zip";
$"{packageName}_{packageVersion}.zip";
//原yooAsset目录
var outputPackageDirectory =
$"{AssetBundleBuilderHelper.GetDefaultBuildOutputRoot()}/{EditorUserBuildSettings.activeBuildTarget}/{setting.packageName}";
$"{AssetBundleBuilderHelper.GetDefaultBuildOutputRoot()}/{EditorUserBuildSettings.activeBuildTarget}/{packageName}";
//拷贝目录
string outFilePath = $"{outputPackageDirectory}/{setting.packageVersion}";
string outFilePath = $"{outputPackageDirectory}/{packageVersion}";
var copyPackageDirectory =
$"{Application.streamingAssetsPath}/{YooAssetSettingsData.GetDefaultYooFolderName()}/{setting.packageName}";
$"{Application.streamingAssetsPath}/{YooAssetSettingsData.GetDefaultYooFolderName()}/{packageName}";
//拷贝BuildinCatalog文件
CreateBuildinCatalogFile("BuildinCatalog.json", copyPackageDirectory, outFilePath);
CreateBuildinCatalogFile("BuildinCatalog.bytes", copyPackageDirectory, outFilePath);
@@ -382,7 +341,7 @@ namespace Stary.Evo.Editor
}
Debug.Log($"成功打包为zip：{zipFilePath}");
EditorUtility.DisplayProgressBar("提示", $"开始上传{setting.packageName}(打包zip)", 0.25f);
EditorUtility.DisplayProgressBar("提示", $"开始上传{packageName}(打包zip)", 0.25f);
return zipFilePath;
}
catch (Exception ex)
@@ -398,7 +357,7 @@ namespace Stary.Evo.Editor
// 假设 BuildinCatalog 文件名为 BuildinCatalog.json
string sourcePath = Path.Combine(copyPackageDirectory, fileName); // 源文件路径
string destinationPath = Path.Combine(outFilePath, fileName); // 目标文件路径
string destinationPath = Path.Combine(outFilePath, fileName); // 目标文件路径
// 如果目标文件已存在，则覆盖
if (File.Exists(destinationPath))
@@ -408,10 +367,9 @@ namespace Stary.Evo.Editor
// 执行拷贝操作
File.Copy(sourcePath, destinationPath);
}
public static async Task UpdateFileDataResDomain(BuildAssetDataSetting setting, string zipFilePath)
public async Task UpdateFileDataResDomain(string zipFilePath)
{
//初始化读取资源配置表
HotfixMainResDomain hotfixMainResDomain = Resources.Load<HotfixMainResDomain>("HotfixMainResDomain");
@@ -423,7 +381,7 @@ namespace Stary.Evo.Editor
var ip = hotfixMainResDomain.hotfixMainResDomainEntity.ipconfig;
var messageEntity = await WebRequestSystem.PostFile(ip + "/FileLoad/UpLoadFile", new[] { zipFilePath });
EditorUtility.DisplayProgressBar("提示", $"开始上传{setting.packageName}(上传zip文件)", 0.5f);
EditorUtility.DisplayProgressBar("提示", $"开始上传{packageName}(上传zip文件)", 0.5f);
if (messageEntity.code == 200)
{
List<ResultMessageEntity> resultMessageEntities =
@@ -438,9 +396,9 @@ namespace Stary.Evo.Editor
ResDmainAddRequst resDmainAddRequst = new ResDmainAddRequst()
{
ProductName = Application.identifier,
DomainName = setting.packageName,
DomainName = packageName,
Platform = EditorUserBuildSettings.activeBuildTarget.ToString(),
PackageVersion = setting.packageVersion,
PackageVersion = packageVersion,
DocumentFileId = fileId
};
var resResultMessage = await WebRequestSystem.Post(ip + "/ResDomain/AddResDomain",
@@ -451,18 +409,31 @@ namespace Stary.Evo.Editor
ResDmainVersionResponse dmainVersionResponse =
JsonConvert.DeserializeObject<ResDmainVersionResponse>(resResultMessage.data
.ToString());
string[] versions = dmainVersionResponse.PackageVersion.Split('.');
setting.packageVersionX = int.Parse(versions[0]);
setting.packageVersionY = int.Parse(versions[1]);
setting.packageVersionZ = int.Parse(versions[2]);
EditorUtility.DisplayDialog("提示",
$"{resResultMessage.message + $"\n{resResultMessage.data.ToString()}"}", "确定");
}
setting.GetBuildPackageVersion(true);
bool isEndWithDigit =
System.Text.RegularExpressions.Regex.IsMatch(dmainVersionResponse.PackageVersion,
@"\d$");
if (isEndWithDigit)
{
// 提取版本号结尾的数字部分
string versionEndDigits = System.Text.RegularExpressions.Regex
.Match(dmainVersionResponse.PackageVersion, @"(\d+)$").Groups[1].Value;
int versionEndDigit = int.Parse(versionEndDigits) + 1;
// 或者移除版本号结尾的数字
string versionWithoutEndDigits =
System.Text.RegularExpressions.Regex.Replace(dmainVersionResponse.PackageVersion,
@"\d+$", "");
packageVersion = versionWithoutEndDigits + versionEndDigit;
}
EditorUtility.DisplayDialog("提示",
$"{resResultMessage.message + $"\n{resResultMessage.data.ToString()},已更新为{packageVersion}，请重新打包上传"}",
"确定");
}
}
EditorUtility.DisplayProgressBar("提示", $"开始上传{setting.packageName}(更新数据库)", 1f);
EditorUtility.DisplayProgressBar("提示", $"开始上传{packageName}(更新数据库)", 1f);
}
}
else
@@ -478,7 +449,7 @@ namespace Stary.Evo.Editor
/// <summary>
/// 获取服务器上版本号
/// </summary>
private async void GetHostBuildPackageVersion(BuildAssetDataSetting setting)
private async void GetHostBuildPackageVersion()
{
var resDmainAddRequst = new ResDmainRequst()
{
@@ -496,11 +467,7 @@ namespace Stary.Evo.Editor
ResDmainResponse domainResponse =
JsonConvert.DeserializeObject<ResDmainResponse>(resResultMessage.data
.ToString());
string[] versions = domainResponse.PackageVersion.Split('.');
setting.packageVersionX = int.Parse(versions[0]);
setting.packageVersionY = int.Parse(versions[1]);
setting.packageVersionZ = int.Parse(versions[2]);
setting.GetBuildPackageVersion(true);
packageVersion = domainResponse.PackageVersion;
}
else
{
@@ -510,11 +477,8 @@ namespace Stary.Evo.Editor
else
{
EditorUtility.DisplayDialog("提示",
$"{resResultMessage.message},默认1.0.0版本 ", "确定");
setting.packageVersionX = 1;
setting.packageVersionY = 0;
setting.packageVersionZ = 0;
setting.GetBuildPackageVersion(false);
$"{resResultMessage.message},默认test_1.0版本 ", "确定");
packageVersion = "test_1.0";
}
}
@@ -525,9 +489,9 @@ namespace Stary.Evo.Editor
//Update
buildTarget = EditorUserBuildSettings.activeBuildTarget.ToString();
onBuildPipelineEntity =
new BuildAssetEntity("打包", $"打包资源包【版本：{BuildAssetDataSetting.packageVersion}】", OnBuildPipeline);
new BuildAssetEntity("打包", $"打包资源包【版本：{packageVersion}】", OnBuildPipeline);
onUpdateBuildPipelineEntity =
new BuildAssetEntity("更新", $"更新至服务器【版本：{BuildAssetDataSetting.packageVersion}】",
new BuildAssetEntity("更新", $"更新至服务器【版本：{packageVersion}】",
OnUpdateBuildPipeline);
}
@@ -540,41 +504,13 @@ namespace Stary.Evo.Editor
base.DrawEditor(index);
}
GUILayout.EndScrollView();
BuildServerPath();
UpdateBuildPipelineButtonName();
}
public void UpdateBuildPipelineButtonName()
{
onBuildPipelineEntity.SetButtonName($"打包资源包【版本：{BuildAssetDataSetting.packageVersion}】");
onUpdateBuildPipelineEntity.SetButtonName($"更新至服务器【版本：{BuildAssetDataSetting.packageVersion}】");
onBuildPipelineEntity.SetButtonName($"打包资源包【版本：{packageVersion}】");
onUpdateBuildPipelineEntity.SetButtonName($"更新至服务器【版本：{packageVersion}】");
}
/// <summary>
/// 生成服务器路径
/// </summary>
private void BuildServerPath()
{
// if (!_isCheckDriveExist)
// {
// return;
// }
//
// updateServerPath =
// $"Z:/{Application.productName}/{BuildAssetDataSetting.packageName}/{EditorUserBuildSettings.activeBuildTarget}/{BuildAssetDataSetting.packageVersion}";
// if (!Directory.Exists(updateServerPath))
// Directory.CreateDirectory(updateServerPath);
//更新Button文字
onBuildPipelineEntity.SetButtonName($"打包资源包【版本：{BuildAssetDataSetting.packageVersion}】");
onUpdateBuildPipelineEntity.SetButtonName($"更新至服务器【版本：{BuildAssetDataSetting.packageVersion}】");
}
}
public enum BuildAssetType
{
Login,
Build,
}
}