【m】main加入热更链路

This commit is contained in:
2025-06-19 14:57:58 +08:00
parent 820c663ab8
commit 2a50338341
3 changed files with 15 additions and 30 deletions

View File

@@ -161,7 +161,7 @@ namespace Stary.Evo.Editor
#region HyBridCLRBuild #region HyBridCLRBuild
[BoxGroup("Build", showLabel: false)] [BoxGroup("Build", showLabel: false)]
[HideIf("@ packageName== \"Main\" || buildAssetType!= BuildAssetType.Build")] [HideIf("@ buildAssetType!= BuildAssetType.Build")]
[Title("打包dll(子包仅打一次)", titleAlignment: TitleAlignments.Centered)] [Title("打包dll(子包仅打一次)", titleAlignment: TitleAlignments.Centered)]
[HorizontalGroup("Build/HyBridClrBuildEntity"), HideLabel] [HorizontalGroup("Build/HyBridClrBuildEntity"), HideLabel]
public BuildAssetEntity hyBridClrBuildEntity = public BuildAssetEntity hyBridClrBuildEntity =
@@ -290,7 +290,7 @@ namespace Stary.Evo.Editor
[Title("上传资源", titleAlignment: TitleAlignments.Centered)] [Title("上传资源", titleAlignment: TitleAlignments.Centered)]
[HideLabel] [HideLabel]
[ShowIf( [ShowIf(
"@ BuildAssetDataSetting.environmentType== EnvironmentType.Release&&selectedPackageNames!=\"Main\" && buildAssetType== BuildAssetType.Build")] "@ BuildAssetDataSetting.environmentType== EnvironmentType.Release && buildAssetType== BuildAssetType.Build")]
public BuildAssetEntity onUpdateBuildPipelineEntity; public BuildAssetEntity onUpdateBuildPipelineEntity;
@@ -444,9 +444,6 @@ namespace Stary.Evo.Editor
/// </summary> /// </summary>
private async void GetHostBuildPackageVersion(BuildAssetDataSetting setting) private async void GetHostBuildPackageVersion(BuildAssetDataSetting setting)
{ {
if (selectedPackageNames == "Main")
return;
var resDmainAddRequst = new ResDmainRequst() var resDmainAddRequst = new ResDmainRequst()
{ {
ProductName = Application.identifier, ProductName = Application.identifier,

View File

@@ -15,7 +15,6 @@ namespace Stary.Evo.Editor
{ {
private static AssetBundleCollectorPackage package; private static AssetBundleCollectorPackage package;
private static string packageName; private static string packageName;
public static string DomainRoot public static string DomainRoot
@@ -23,10 +22,6 @@ namespace Stary.Evo.Editor
get { return Application.dataPath + "/Domain"; } get { return Application.dataPath + "/Domain"; }
} }
public static string MainDomainRoot
{
get { return Application.dataPath + "/Main"; }
}
// public static string SpriteRemotedAtlas // public static string SpriteRemotedAtlas
// { // {
@@ -65,7 +60,8 @@ namespace Stary.Evo.Editor
{ {
if (oneKeyBUildEntity.isRaw) if (oneKeyBUildEntity.isRaw)
{ {
CopyDllHotUpdateAssembly(oneKeyBUildEntity.DomainName, $"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes"); CopyDllHotUpdateAssembly(oneKeyBUildEntity.DomainName,
$"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes");
CopyDllStrippedAOTDllOutputRootDir($"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes"); CopyDllStrippedAOTDllOutputRootDir($"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes");
} }
} }
@@ -137,15 +133,10 @@ namespace Stary.Evo.Editor
AssetDatabase.LoadAssetAtPath<DomainConfig>(configPath); AssetDatabase.LoadAssetAtPath<DomainConfig>(configPath);
packageName = domainConfig.domain; packageName = domainConfig.domain;
Mark(); Mark();
if (!oneKeyBUildEntity.DomainName.Equals("Main"))
CreateRes(packageName,
$"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes",
$"{DomainRoot}/{oneKeyBUildEntity.DomainName}/HotUpdate");
else
CreateRes(packageName,
$"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes",
$"{MainDomainRoot}/Script/Runtime/HotUpdate");
CreateRes(packageName,
$"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes",
$"{DomainRoot}/{oneKeyBUildEntity.DomainName}/HotUpdate");
} }
} }
} }
@@ -156,8 +147,8 @@ namespace Stary.Evo.Editor
// //清空主包旧数据 // //清空主包旧数据
AssetBundleCollectorPackage assetBundleCollectorPackage = null; AssetBundleCollectorPackage assetBundleCollectorPackage = null;
//copydll //copydll
if (!BuildAssetWindow.GetBuildPackageName().Equals("Main"))
AddHotfixAddressableDll(); AddHotfixAddressableDll();
//清空用户旧数据 //清空用户旧数据
foreach (var package in AssetBundleCollectorSettingData.Setting.Packages) foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
@@ -179,14 +170,11 @@ namespace Stary.Evo.Editor
AssetDatabase.LoadAssetAtPath<DomainConfig>(configPath); AssetDatabase.LoadAssetAtPath<DomainConfig>(configPath);
packageName = domainConfig.domain; packageName = domainConfig.domain;
Mark(); Mark();
if (!BuildAssetWindow.GetBuildPackageName().Equals("Main"))
CreateRes(packageName, CreateRes(packageName,
$"{DomainRoot}/{BuildAssetWindow.GetBuildPackageName()}/AddressableRes", $"{DomainRoot}/{BuildAssetWindow.GetBuildPackageName()}/AddressableRes",
$"{DomainRoot}/{BuildAssetWindow.GetBuildPackageName()}/HotUpdate"); $"{DomainRoot}/{BuildAssetWindow.GetBuildPackageName()}/HotUpdate");
else
CreateRes(packageName,
$"{DomainRoot}/{BuildAssetWindow.GetBuildPackageName()}/AddressableRes",
$"{MainDomainRoot}/Script/Runtime/HotUpdate");
EditorUtility.DisplayDialog("自动标记", "自动标记成功", "确定"); EditorUtility.DisplayDialog("自动标记", "自动标记成功", "确定");
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "com.staryevo.main", "name": "com.staryevo.main",
"version": "1.2.18", "version": "1.3.0",
"displayName": "00.StaryEvo", "displayName": "00.StaryEvo",
"description": "This is an Framework package(后台服务器版本端口9527)", "description": "This is an Framework package(后台服务器版本端口9527)",
"unity": "2021.3", "unity": "2021.3",