This commit is contained in:
2025-08-21 16:42:16 +08:00
parent 49cc2babe7
commit deb4a1b5fe
9 changed files with 378 additions and 261 deletions

View File

@@ -0,0 +1,215 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using HybridCLR.Editor.Commands;
using Newtonsoft.Json;
using Sirenix.OdinInspector;
using UnityEditor;
using UnityEngine;
using YooAsset.Editor;
namespace Stary.Evo.Editor
{
public static class AutoBuildPackage
{
private static List<OneKeyBuildEntity> GetOneKeyBuildEntities()
{
var creatDomainAll = CreatAssetWindow.GetCreatDomainAll();
List<OneKeyBuildEntity> oneKeyBuildEntities = new List<OneKeyBuildEntity>();
foreach (var domainEntity in creatDomainAll)
{
oneKeyBuildEntities.Add(new OneKeyBuildEntity()
{
DomainName = domainEntity.DomainName, isRaw = true
});
}
return oneKeyBuildEntities;
}
public static void OneClickMark()
{
OneClickMark(GetOneKeyBuildEntities());
}
/// <summary>
/// (一键)标记选择资源
/// </summary>
/// <param name="oneKeyBuildEntities"></param>
public static void OneClickMark(List<OneKeyBuildEntity> oneKeyBuildEntities)
{
#if HotUpdate
//打dll
CompileDllCommand.CompileDllActiveBuildTarget();
//拷贝dll
MarkAdressable.AddHotfixAddressableDllAll(oneKeyBuildEntities);
//标记全部资源
MarkAdressable.AddMarkAll(oneKeyBuildEntities);
#endif
}
public static void OneShaderMark()
{
OneShaderMark(GetOneKeyBuildEntities());
}
/// <summary>
/// (一键)收集shader【材质异常或资源修改】
/// </summary>
/// <param name="oneKeyBuildEntities"></param>
public static void OneShaderMark(List<OneKeyBuildEntity> oneKeyBuildEntities)
{
#if HotUpdate
//标记全部资源
foreach (var oneKeyBUildEntity in oneKeyBuildEntities)
{
if (oneKeyBUildEntity.isRaw)
{
MarkAdressable.CollectSVC(oneKeyBUildEntity.DomainName);
}
}
#endif
}
public static void OneUpdatePackageVersionBuild()
{
OneUpdatePackageVersion(GetOneKeyBuildEntities());
OneClickBuild(GetOneKeyBuildEntities());
}
/// <summary>
/// (一键)获取服务器版本
/// </summary>
/// <param name="oneKeyBuildEntities"></param>
public static async void OneUpdatePackageVersion(List<OneKeyBuildEntity> oneKeyBuildEntities)
{
foreach (var oneKeyBUildEntity in oneKeyBuildEntities)
{
if (oneKeyBUildEntity.isRaw)
{
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(
$"Assets/Domain/{oneKeyBUildEntity.DomainName}/Conf/BuildAssetDataSetting.asset");
if (buildAssetDataSetting != null)
{
//初始化读取资源配置表
HotfixMainResDomain hotfixMainResDomain =
Resources.Load<HotfixMainResDomain>("HotfixMainResDomain");
if (hotfixMainResDomain == null)
{
Debug.LogError($"UnityEvo:读取资源配置表失败【HotfixMainResDomain】...表不存在");
continue;
}
var ip = hotfixMainResDomain.hotfixMainResDomainEntity.ipconfig;
//登录
string loginurl = ip + "/Authentication/login";
await WebRequestSystem.Login(loginurl, hotfixMainResDomain.hotfixMainResDomainEntity.username,
hotfixMainResDomain.hotfixMainResDomainEntity.password);
string url = $"{ip}/ResDomain/GetResDomainByDomain";
var resDmainRequst = new ResDmainRequst()
{
ProductName = Application.identifier,
DomainName = oneKeyBUildEntity.DomainName,
Platform = UnityEditor.EditorUserBuildSettings.activeBuildTarget.ToString(),
};
//获取服务器版本
var resDmainMessageEntity =
await WebRequestSystem.Post(url, JsonConvert.SerializeObject(resDmainRequst));
if (resDmainMessageEntity.code == 200)
{
ResDmainResponse resDmainResponse =
JsonConvert.DeserializeObject<ResDmainResponse>(resDmainMessageEntity.data.ToString());
string[] versions = resDmainResponse.PackageVersion.Split('.');
buildAssetDataSetting.packageVersionX = int.Parse(versions[0]);
buildAssetDataSetting.packageVersionY = int.Parse(versions[1]);
buildAssetDataSetting.packageVersionZ = int.Parse(versions[2]);
buildAssetDataSetting.packageVersionZ++;
EditorUtility.SetDirty(buildAssetDataSetting);
}
else if (resDmainMessageEntity.code == 1011)
{
buildAssetDataSetting.packageVersionX = 1;
buildAssetDataSetting.packageVersionY = 0;
buildAssetDataSetting.packageVersionZ = 0;
EditorUtility.SetDirty(buildAssetDataSetting);
}
}
else
{
Debug.LogError("BuildAssetDataSetting 不存在:" + oneKeyBUildEntity.DomainName);
}
}
}
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}
/// <summary>
/// (一键)打包选择资源
/// </summary>
/// <param name="oneKeyBuildEntities"></param>
public static void OneClickBuild(List<OneKeyBuildEntity> oneKeyBuildEntities)
{
//打包
foreach (var oneKeyBUildEntity in oneKeyBuildEntities)
{
if (oneKeyBUildEntity.isRaw)
{
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(
$"Assets/Domain/{oneKeyBUildEntity.DomainName}/Conf/BuildAssetDataSetting.asset");
if (buildAssetDataSetting != null)
{
buildAssetDataSetting.environmentType = EnvironmentType.Release;
buildAssetDataSetting.SetEnvironmentType();
buildAssetDataSetting.viewer = new BuiltinBuildPipelineViewer(buildAssetDataSetting);
buildAssetDataSetting.viewer.clearBuildCacheToggle = true;
buildAssetDataSetting.viewer.SetBuildCacheToggle();
EditorApplication.delayCall += buildAssetDataSetting.viewer.ExecuteBuild;
}
else
{
Debug.LogError("BuildAssetDataSetting 不存在:" + oneKeyBUildEntity.DomainName);
}
}
}
}
public static void OneUpdatePackage()
{
OneUpdatePackage(GetOneKeyBuildEntities());
}
/// <summary>
/// (一键)上传服务器版本
/// </summary>
/// <param name="oneKeyBuildEntities"></param>
public static async void OneUpdatePackage(List<OneKeyBuildEntity> oneKeyBuildEntities)
{
//打包
foreach (var oneKeyBUildEntity in oneKeyBuildEntities)
{
if (oneKeyBUildEntity.isRaw)
{
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(
$"Assets/Domain/{oneKeyBUildEntity.DomainName}/Conf/BuildAssetDataSetting.asset");
if (buildAssetDataSetting != null)
{
string zipFilePath = BuildAssetWindow.BuildZip(buildAssetDataSetting);
await BuildAssetWindow.UpdateFileDataResDomain(buildAssetDataSetting, zipFilePath);
await Task.Delay(1000);
EditorUtility.ClearProgressBar();
}
else
{
Debug.LogError("BuildAssetDataSetting 不存在:" + oneKeyBUildEntity.DomainName);
}
}
}
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 9acf99b5eebb41dd8ae3b60d66f4db47
timeCreated: 1755762566

View File

@@ -6,6 +6,8 @@ using UnityEditor;
using UnityEditor.Build.Reporting; using UnityEditor.Build.Reporting;
using UnityEngine; using UnityEngine;
namespace Stary.Evo.Editor
{
[Serializable] [Serializable]
public class BuildApkEntity public class BuildApkEntity
{ {
@@ -31,3 +33,4 @@ public class BuildApkEntity
this._onBuildApkUpdateAction?.Invoke(); this._onBuildApkUpdateAction?.Invoke();
} }
} }
}

View File

@@ -1,13 +1,11 @@
using System;
using System.Collections.Generic;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using Sirenix.OdinInspector.Editor; using Sirenix.OdinInspector.Editor;
using Stary.Evo;
using UnityEditor; using UnityEditor;
using UnityEditor.Build.Reporting; using UnityEditor.Build.Reporting;
using UnityEngine; using UnityEngine;
using BuildReport = UnityEditor.Build.Reporting.BuildReport;
namespace Stary.Evo.Editor
{
public class BuildApkWindow : OdinEditorWindow public class BuildApkWindow : OdinEditorWindow
{ {
public static OdinEditorWindow window; public static OdinEditorWindow window;
@@ -118,7 +116,7 @@ public class BuildApkWindow : OdinEditorWindow
}; };
// 执行打包 // 执行打包
BuildReport report = BuildPipeline.BuildPlayer(buildOptions); var report = BuildPipeline.BuildPlayer(buildOptions);
BuildSummary summary = report.summary; BuildSummary summary = report.summary;
if (summary.result == BuildResult.Succeeded) if (summary.result == BuildResult.Succeeded)
@@ -139,3 +137,4 @@ public class BuildApkWindow : OdinEditorWindow
Rokid Rokid
} }
} }
}

View File

@@ -6,7 +6,7 @@ using UnityEditor.Build;
using UnityEditor.Callbacks; using UnityEditor.Callbacks;
using UnityEngine; using UnityEngine;
namespace Stary.Evo namespace Stary.Evo.Editor
{ {
// 实现接口的方式 // 实现接口的方式
public class BuildReport : IPostprocessBuildWithReport, IPreprocessBuildWithReport public class BuildReport : IPostprocessBuildWithReport, IPreprocessBuildWithReport

View File

@@ -34,8 +34,6 @@ namespace Stary.Evo.Editor
[MenuItem("Evo/资源打包工具")] [MenuItem("Evo/资源打包工具")]
static void ShowWindows() static void ShowWindows()
{ {
#if NotUpdate #if NotUpdate
if (EditorUtility.DisplayDialog("提示", "当前为非热更模式,不支持热更打包功能,是否切换热更模式", "是", "否")) if (EditorUtility.DisplayDialog("提示", "当前为非热更模式,不支持热更打包功能,是否切换热更模式", "是", "否"))
{ {
@@ -460,6 +458,8 @@ namespace Stary.Evo.Editor
JsonConvert.SerializeObject(resDmainAddRequst)); JsonConvert.SerializeObject(resDmainAddRequst));
//如果低于服务器版本,更新版本号 //如果低于服务器版本,更新版本号
if (resResultMessage.code != 1011) if (resResultMessage.code != 1011)
{
if (resResultMessage.data != null)
{ {
ResDmainResponse domainResponse = ResDmainResponse domainResponse =
JsonConvert.DeserializeObject<ResDmainResponse>(resResultMessage.data JsonConvert.DeserializeObject<ResDmainResponse>(resResultMessage.data
@@ -471,6 +471,11 @@ namespace Stary.Evo.Editor
setting.GetBuildPackageVersion(true); setting.GetBuildPackageVersion(true);
} }
else else
{
Debug.LogError($"UnityEvo获取服务器版本失败,resResultMessage.data为空");
}
}
else
{ {
EditorUtility.DisplayDialog("提示", EditorUtility.DisplayDialog("提示",
$"{resResultMessage.message},默认1.0.0版本 ", "确定"); $"{resResultMessage.message},默认1.0.0版本 ", "确定");

View File

@@ -54,12 +54,7 @@ namespace Stary.Evo.Editor
public void OneClickMark() public void OneClickMark()
{ {
#if HotUpdate #if HotUpdate
//打dll AutoBuildPackage.OneClickMark(OneKeyBuildEntities);
CompileDllCommand.CompileDllActiveBuildTarget();
//拷贝dll
MarkAdressable.AddHotfixAddressableDllAll(OneKeyBuildEntities);
//标记全部资源
MarkAdressable.AddMarkAll(OneKeyBuildEntities);
EditorUtility.DisplayDialog("提示", $"标记所有资源完成!", "确定"); EditorUtility.DisplayDialog("提示", $"标记所有资源完成!", "确定");
#endif #endif
} }
@@ -68,14 +63,8 @@ namespace Stary.Evo.Editor
public void OneShaderMark() public void OneShaderMark()
{ {
#if HotUpdate #if HotUpdate
//标记全部资源 EditorTools.ClearUnityConsole();
foreach (var oneKeyBUildEntity in OneKeyBuildEntities) AutoBuildPackage.OneShaderMark(OneKeyBuildEntities);
{
if (oneKeyBUildEntity.isRaw)
{
MarkAdressable.CollectSVC(oneKeyBUildEntity.DomainName);
}
}
EditorUtility.DisplayDialog("提示", $"标记所有shader完成", "确定"); EditorUtility.DisplayDialog("提示", $"标记所有shader完成", "确定");
#endif #endif
@@ -86,63 +75,7 @@ namespace Stary.Evo.Editor
{ {
//打包 //打包
EditorTools.ClearUnityConsole(); EditorTools.ClearUnityConsole();
foreach (var oneKeyBUildEntity in OneKeyBuildEntities) AutoBuildPackage.OneUpdatePackageVersion(OneKeyBuildEntities);
{
if (oneKeyBUildEntity.isRaw)
{
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(
$"Assets/Domain/{oneKeyBUildEntity.DomainName}/Conf/BuildAssetDataSetting.asset");
if (buildAssetDataSetting != null)
{
//初始化读取资源配置表
HotfixMainResDomain hotfixMainResDomain =
Resources.Load<HotfixMainResDomain>("HotfixMainResDomain");
if (hotfixMainResDomain == null)
{
Debug.LogError($"UnityEvo:读取资源配置表失败【HotfixMainResDomain】...表不存在");
continue;
}
var ip = hotfixMainResDomain.hotfixMainResDomainEntity.ipconfig;
string url = $"{ip}/ResDomain/GetResDomainByDomain";
var resDmainRequst = new ResDmainRequst()
{
ProductName = Application.identifier,
DomainName = oneKeyBUildEntity.DomainName,
Platform = UnityEditor.EditorUserBuildSettings.activeBuildTarget.ToString(),
};
//获取服务器版本
var resDmainMessageEntity =
await WebRequestSystem.Post(url, JsonConvert.SerializeObject(resDmainRequst));
if (resDmainMessageEntity.code == 200)
{
ResDmainResponse resDmainResponse =
JsonConvert.DeserializeObject<ResDmainResponse>(resDmainMessageEntity.data.ToString());
string[] versions = resDmainResponse.PackageVersion.Split('.');
buildAssetDataSetting.packageVersionX = int.Parse(versions[0]);
buildAssetDataSetting.packageVersionY = int.Parse(versions[1]);
buildAssetDataSetting.packageVersionZ = int.Parse(versions[2]);
buildAssetDataSetting.packageVersionZ++;
EditorUtility.SetDirty(buildAssetDataSetting);
}
else if (resDmainMessageEntity.code == 1011)
{
buildAssetDataSetting.packageVersionX = 1;
buildAssetDataSetting.packageVersionY = 0;
buildAssetDataSetting.packageVersionZ = 0;
EditorUtility.SetDirty(buildAssetDataSetting);
}
}
else
{
Debug.LogError("BuildAssetDataSetting 不存在:" + oneKeyBUildEntity.DomainName);
}
}
}
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
EditorUtility.DisplayDialog("提示", $"获取服务器版本完成", "确定"); EditorUtility.DisplayDialog("提示", $"获取服务器版本完成", "确定");
} }
@@ -152,28 +85,7 @@ namespace Stary.Evo.Editor
//打包 //打包
EditorTools.ClearUnityConsole(); EditorTools.ClearUnityConsole();
foreach (var oneKeyBUildEntity in OneKeyBuildEntities) AutoBuildPackage.OneClickBuild(OneKeyBuildEntities);
{
if (oneKeyBUildEntity.isRaw)
{
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(
$"Assets/Domain/{oneKeyBUildEntity.DomainName}/Conf/BuildAssetDataSetting.asset");
if (buildAssetDataSetting != null)
{
buildAssetDataSetting.environmentType = EnvironmentType.Release;
buildAssetDataSetting.SetEnvironmentType();
buildAssetDataSetting.viewer = new BuiltinBuildPipelineViewer(buildAssetDataSetting);
buildAssetDataSetting.viewer.clearBuildCacheToggle = true;
buildAssetDataSetting.viewer.SetBuildCacheToggle();
EditorApplication.delayCall += buildAssetDataSetting.viewer.ExecuteBuild;
}
else
{
Debug.LogError("BuildAssetDataSetting 不存在:" + oneKeyBUildEntity.DomainName);
}
}
}
EditorUtility.DisplayDialog("提示", $"开始打包资源!", "确定"); EditorUtility.DisplayDialog("提示", $"开始打包资源!", "确定");
} }
@@ -183,27 +95,7 @@ namespace Stary.Evo.Editor
{ {
//打包 //打包
EditorTools.ClearUnityConsole(); EditorTools.ClearUnityConsole();
foreach (var oneKeyBUildEntity in OneKeyBuildEntities) AutoBuildPackage.OneUpdatePackage(OneKeyBuildEntities);
{
if (oneKeyBUildEntity.isRaw)
{
BuildAssetDataSetting buildAssetDataSetting =
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(
$"Assets/Domain/{oneKeyBUildEntity.DomainName}/Conf/BuildAssetDataSetting.asset");
if (buildAssetDataSetting != null)
{
string zipFilePath = BuildAssetWindow.BuildZip(buildAssetDataSetting);
await BuildAssetWindow.UpdateFileDataResDomain(buildAssetDataSetting, zipFilePath);
await Task.Delay(1000);
EditorUtility.ClearProgressBar();
}
else
{
Debug.LogError("BuildAssetDataSetting 不存在:" + oneKeyBUildEntity.DomainName);
}
}
}
EditorUtility.DisplayDialog("提示", $"服务器上传完成", "确定"); EditorUtility.DisplayDialog("提示", $"服务器上传完成", "确定");
} }

View File

@@ -25,7 +25,7 @@ namespace Stary.Evo
try try
{ {
#if UNITY_2021_3_OR_NEWER #if UNITY_2021_3_OR_NEWER
using UnityWebRequest webRequest = UnityWebRequest.Post(url, postData); using UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData);
#else #else
using UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData); using UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData);
#endif #endif
@@ -271,7 +271,7 @@ namespace Stary.Evo
try try
{ {
#if UNITY_2021_3_OR_NEWER #if UNITY_2021_3_OR_NEWER
using (UnityWebRequest webRequest = UnityWebRequest.Post(url, postData)) //第二种写法此行注释 using (UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData)) //第二种写法此行注释
#else #else
using (UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData)) //第二种写法此行注释 using (UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData)) //第二种写法此行注释
#endif #endif

View File

@@ -1,6 +1,6 @@
{ {
"name": "com.staryevo.main", "name": "com.staryevo.main",
"version": "1.3.32", "version": "1.3.33",
"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",