【m】增加web第一版暂存
All checks were successful
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 4s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 4s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 10s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 5s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 3s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 32s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 3s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 4s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 16s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 16s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 3s
Plugin Library CI / publish (10.XNode) (push) Successful in 3s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 3s
All checks were successful
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 4s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 4s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 10s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 5s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 3s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 32s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 3s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 4s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 16s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 16s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 3s
Plugin Library CI / publish (10.XNode) (push) Successful in 3s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 3s
This commit is contained in:
@@ -2,11 +2,8 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
#if HotUpdate
|
||||
using HybridCLR.Editor;
|
||||
using HybridCLR.Editor.Commands;
|
||||
#endif
|
||||
using UnityEditor;
|
||||
using UnityEditor.U2D;
|
||||
using UnityEngine;
|
||||
@@ -18,7 +15,9 @@ namespace Stary.Evo.Editor
|
||||
public class MarkAdressable
|
||||
{
|
||||
private static AssetBundleCollectorPackage package;
|
||||
#if !UNITY_WEBGL
|
||||
private static AssetBundleCollectorPackage packageRawFile;
|
||||
#endif
|
||||
|
||||
|
||||
private static Dictionary<string, string> addressDic = new Dictionary<string, string>();
|
||||
@@ -27,7 +26,9 @@ namespace Stary.Evo.Editor
|
||||
new Dictionary<string, AssetBundleCollectorGroup>();
|
||||
|
||||
private static string _packageName;
|
||||
#if !UNITY_WEBGL
|
||||
private static string[] rawFiles = new[] { "Video" };
|
||||
#endif
|
||||
|
||||
public static string DomainRoot
|
||||
{
|
||||
@@ -56,7 +57,6 @@ namespace Stary.Evo.Editor
|
||||
|
||||
private static void CopyDllHotUpdateAssembly(string domain, string target)
|
||||
{
|
||||
#if HotUpdate
|
||||
//读取打包dll位置
|
||||
string hotUpdateDir =
|
||||
$"{SettingsUtil.HybridCLRSettings.hotUpdateDllCompileOutputRootDir}/{EditorUserBuildSettings.activeBuildTarget}";
|
||||
@@ -89,12 +89,10 @@ namespace Stary.Evo.Editor
|
||||
FileUtility.Copy(hotfixDllPathPdb, hotfixDllPathPdbTarget, true);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
private static void CopyDllStrippedAOTDllOutputRootDir(string target)
|
||||
{
|
||||
#if HotUpdate
|
||||
//读取打包dll位置
|
||||
string hotUpdateDir =
|
||||
$"{SettingsUtil.HybridCLRSettings.strippedAOTDllOutputRootDir}/{EditorUserBuildSettings.activeBuildTarget}";
|
||||
@@ -105,7 +103,6 @@ namespace Stary.Evo.Editor
|
||||
$"{target}/Dll/{EditorUserBuildSettings.activeBuildTarget}/{dll}.bytes";
|
||||
FileUtility.Copy(hotfixDllPath, hotfixDllPathTarget, true);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
public static void AddMarkAll(List<OneKeyBuildEntity> oneKeyBUildEntities)
|
||||
@@ -145,7 +142,9 @@ namespace Stary.Evo.Editor
|
||||
|
||||
public static void AddDomainMark()
|
||||
{
|
||||
#if !UNITY_WEBGL
|
||||
AddHotfixAddressableDll();
|
||||
#endif
|
||||
//清空用户旧数据
|
||||
|
||||
string configPath =
|
||||
@@ -185,7 +184,9 @@ namespace Stary.Evo.Editor
|
||||
|
||||
|
||||
package = CreatePackage(_packageName);
|
||||
#if !UNITY_WEBGL
|
||||
packageRawFile = CreatePackage($"{_packageName}_RawFile");
|
||||
#endif
|
||||
//检测Packages是否存在Group
|
||||
foreach (var info in dirs)
|
||||
{
|
||||
@@ -195,7 +196,7 @@ namespace Stary.Evo.Editor
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
#if !UNITY_WEBGL
|
||||
if (rawFiles.Contains(groupName))
|
||||
{
|
||||
AddGroup(packageRawFile, groupName);
|
||||
@@ -204,7 +205,9 @@ namespace Stary.Evo.Editor
|
||||
{
|
||||
AddGroup(package, groupName);
|
||||
}
|
||||
|
||||
#else
|
||||
AddGroup(package, groupName);
|
||||
#endif
|
||||
AutoMarkRootAddress(info);
|
||||
// if (info.Name != "SpriteAtlas" && info.Name != "Atlas")
|
||||
// AutoMark(info.Name);
|
||||
@@ -457,13 +460,14 @@ namespace Stary.Evo.Editor
|
||||
AssetTags = groupName,
|
||||
};
|
||||
|
||||
#if !UNITY_WEBGL
|
||||
////TODO 暂时不设置
|
||||
//如果是video目录,设置
|
||||
if (rawFiles.Contains(groupName))
|
||||
{
|
||||
collector.PackRuleName = nameof(PackVideoFile);
|
||||
}
|
||||
|
||||
#endif
|
||||
YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(group, collector);
|
||||
Debug.Log("GetAssetAddress:" + GetAssetAddress(file));
|
||||
AddAddressInfo(file, GetAssetAddress(file));
|
||||
|
||||
Reference in New Issue
Block a user