1
This commit is contained in:
@@ -54,12 +54,7 @@ namespace Stary.Evo.Editor
|
||||
public void OneClickMark()
|
||||
{
|
||||
#if HotUpdate
|
||||
//打dll
|
||||
CompileDllCommand.CompileDllActiveBuildTarget();
|
||||
//拷贝dll
|
||||
MarkAdressable.AddHotfixAddressableDllAll(OneKeyBuildEntities);
|
||||
//标记全部资源
|
||||
MarkAdressable.AddMarkAll(OneKeyBuildEntities);
|
||||
AutoBuildPackage.OneClickMark(OneKeyBuildEntities);
|
||||
EditorUtility.DisplayDialog("提示", $"标记所有资源完成!", "确定");
|
||||
#endif
|
||||
}
|
||||
@@ -68,15 +63,9 @@ namespace Stary.Evo.Editor
|
||||
public void OneShaderMark()
|
||||
{
|
||||
#if HotUpdate
|
||||
//标记全部资源
|
||||
foreach (var oneKeyBUildEntity in OneKeyBuildEntities)
|
||||
{
|
||||
if (oneKeyBUildEntity.isRaw)
|
||||
{
|
||||
MarkAdressable.CollectSVC(oneKeyBUildEntity.DomainName);
|
||||
}
|
||||
}
|
||||
|
||||
EditorTools.ClearUnityConsole();
|
||||
AutoBuildPackage.OneShaderMark(OneKeyBuildEntities);
|
||||
|
||||
EditorUtility.DisplayDialog("提示", $"标记所有shader完成!", "确定");
|
||||
#endif
|
||||
}
|
||||
@@ -86,63 +75,7 @@ namespace Stary.Evo.Editor
|
||||
{
|
||||
//打包
|
||||
EditorTools.ClearUnityConsole();
|
||||
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 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();
|
||||
AutoBuildPackage.OneUpdatePackageVersion(OneKeyBuildEntities);
|
||||
EditorUtility.DisplayDialog("提示", $"获取服务器版本完成", "确定");
|
||||
}
|
||||
|
||||
@@ -151,29 +84,8 @@ namespace Stary.Evo.Editor
|
||||
{
|
||||
//打包
|
||||
EditorTools.ClearUnityConsole();
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
AutoBuildPackage.OneClickBuild(OneKeyBuildEntities);
|
||||
|
||||
EditorUtility.DisplayDialog("提示", $"开始打包资源!", "确定");
|
||||
}
|
||||
@@ -183,27 +95,7 @@ namespace Stary.Evo.Editor
|
||||
{
|
||||
//打包
|
||||
EditorTools.ClearUnityConsole();
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
AutoBuildPackage.OneUpdatePackage(OneKeyBuildEntities);
|
||||
EditorUtility.DisplayDialog("提示", $"服务器上传完成", "确定");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user