TEngine 6

UnityProject/Packages/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs

@@ -205,6 +205,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -243,7 +247,7 @@ namespace Cysharp.Threading.Tasks
 
                 if (progress != null && handle.IsValid())
                 {
-                    progress.Report(handle.PercentComplete);
+                    progress.Report(handle.GetDownloadStatus().Percent);
                 }
 
                 return true;
@@ -404,7 +408,13 @@ namespace Cysharp.Threading.Tasks
                 finally
                 {
                     if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
                         TryReturn();
+                    }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -448,7 +458,7 @@ namespace Cysharp.Threading.Tasks
 
                 if (progress != null && handle.IsValid())
                 {
-                    progress.Report(handle.PercentComplete);
+                    progress.Report(handle.GetDownloadStatus().Percent);
                 }
 
                 return true;

UnityProject/Packages/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef

@@ -16,7 +16,12 @@
             "name": "com.unity.textmeshpro",
             "expression": "",
             "define": "UNITASK_TEXTMESHPRO_SUPPORT"
+        },
+        {
+            "name": "com.unity.ugui",
+            "expression": "2.0.0",
+            "define": "UNITASK_TEXTMESHPRO_SUPPORT"
         }
     ],
     "noEngineReferences": false
-}
+}

UnityProject/Packages/UniTask/Runtime/UniTask.Delay.cs

@@ -259,6 +259,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -366,6 +370,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -475,6 +483,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -604,6 +616,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -750,6 +766,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -878,6 +898,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -1004,6 +1028,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 

UnityProject/Packages/UniTask/Runtime/UniTask.Factory.cs

@@ -184,6 +184,78 @@ namespace Cysharp.Threading.Tasks
             return () => asyncAction(state).Forget();
         }
 
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T arg) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T> UnityAction<T>(Func<T, UniTaskVoid> asyncAction)
+        {
+            return (arg) => asyncAction(arg).Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T0 arg0, T1 arg1) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T0, T1> UnityAction<T0, T1>(Func<T0, T1, UniTaskVoid> asyncAction)
+        {
+            return (arg0, arg1) => asyncAction(arg0, arg1).Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T0 arg0, T1 arg1, T2 arg2) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T0, T1, T2> UnityAction<T0, T1, T2>(Func<T0, T1, T2, UniTaskVoid> asyncAction)
+        {
+            return (arg0, arg1, arg2) => asyncAction(arg0, arg1, arg2).Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T0 arg0, T1 arg1, T2 arg2, T3 arg3) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T0, T1, T2, T3> UnityAction<T0, T1, T2, T3>(Func<T0, T1, T2, T3, UniTaskVoid> asyncAction)
+        {
+            return (arg0, arg1, arg2, arg3) => asyncAction(arg0, arg1, arg2, arg3).Forget();
+        }
+
+        // <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T arg, CancellationToken cancellationToken) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T> UnityAction<T>(Func<T, CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
+        {
+            return (arg) => asyncAction(arg, cancellationToken).Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T0 arg0, T1 arg1, CancellationToken cancellationToken) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T0, T1> UnityAction<T0, T1>(Func<T0, T1, CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
+        {
+            return (arg0, arg1) => asyncAction(arg0, arg1, cancellationToken).Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T0 arg0, T1 arg1, T2 arg2, CancellationToken cancellationToken) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T0, T1, T2> UnityAction<T0, T1, T2>(Func<T0, T1, T2, CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
+        {
+            return (arg0, arg1, arg2) => asyncAction(arg0, arg1, arg2, cancellationToken).Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For example: onClick.AddListener(UniTask.UnityAction(async (T0 arg0, T1 arg1, T2 arg2, T3 arg3, CancellationToken cancellationToken) => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction<T0, T1, T2, T3> UnityAction<T0, T1, T2, T3>(Func<T0, T1, T2, T3, CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
+        {
+            return (arg0, arg1, arg2, arg3) => asyncAction(arg0, arg1, arg2, arg3, cancellationToken).Forget();
+        }
+
 #endif
 
         /// <summary>
@@ -202,6 +274,22 @@ namespace Cysharp.Threading.Tasks
             return new UniTask<T>(new DeferPromise<T>(factory), 0);
         }
 
+        /// <summary>
+        /// Defer the task creation just before call await.
+        /// </summary>
+        public static UniTask Defer<TState>(TState state, Func<TState, UniTask> factory)
+        {
+            return new UniTask(new DeferPromiseWithState<TState>(state, factory), 0);
+        }
+
+        /// <summary>
+        /// Defer the task creation just before call await.
+        /// </summary>
+        public static UniTask<TResult> Defer<TState, TResult>(TState state, Func<TState, UniTask<TResult>> factory)
+        {
+            return new UniTask<TResult>(new DeferPromiseWithState<TState, TResult>(state, factory), 0);
+        }
+
         /// <summary>
         /// Never complete.
         /// </summary>
@@ -465,6 +553,93 @@ namespace Cysharp.Threading.Tasks
             }
         }
 
+        sealed class DeferPromiseWithState<TState> : IUniTaskSource
+        {
+            Func<TState, UniTask> factory;
+            TState argument;
+            UniTask task;
+            UniTask.Awaiter awaiter;
+
+            public DeferPromiseWithState(TState argument, Func<TState, UniTask> factory)
+            {
+                this.argument = argument;
+                this.factory = factory;
+            }
+
+            public void GetResult(short token)
+            {
+                awaiter.GetResult();
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                var f = Interlocked.Exchange(ref factory, null);
+                if (f != null)
+                {
+                    task = f(argument);
+                    awaiter = task.GetAwaiter();
+                }
+
+                return task.Status;
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                awaiter.SourceOnCompleted(continuation, state);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return task.Status;
+            }
+        }
+
+        sealed class DeferPromiseWithState<TState, TResult> : IUniTaskSource<TResult>
+        {
+            Func<TState, UniTask<TResult>> factory;
+            TState argument;
+            UniTask<TResult> task;
+            UniTask<TResult>.Awaiter awaiter;
+
+            public DeferPromiseWithState(TState argument, Func<TState, UniTask<TResult>> factory)
+            {
+                this.argument = argument;
+                this.factory = factory;
+            }
+
+            public TResult GetResult(short token)
+            {
+                return awaiter.GetResult();
+            }
+
+            void IUniTaskSource.GetResult(short token)
+            {
+                awaiter.GetResult();
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                var f = Interlocked.Exchange(ref factory, null);
+                if (f != null)
+                {
+                    task = f(argument);
+                    awaiter = task.GetAwaiter();
+                }
+
+                return task.Status;
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                awaiter.SourceOnCompleted(continuation, state);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return task.Status;
+            }
+        }
+
         sealed class NeverPromise<T> : IUniTaskSource<T>
         {
             static readonly Action<object> cancellationCallback = CancellationCallback;

UnityProject/Packages/UniTask/Runtime/UniTask.WaitUntil.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Tracing;
 using System.Threading;
 using Cysharp.Threading.Tasks.Internal;
 
@@ -14,11 +15,21 @@ namespace Cysharp.Threading.Tasks
             return new UniTask(WaitUntilPromise.Create(predicate, timing, cancellationToken, cancelImmediately, out var token), token);
         }
 
+        public static UniTask WaitUntil<T>(T state, Func<T, bool> predicate, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
+        {
+            return new UniTask(WaitUntilPromise<T>.Create(state, predicate, timing, cancellationToken, cancelImmediately, out var token), token);
+        }
+
         public static UniTask WaitWhile(Func<bool> predicate, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
         {
             return new UniTask(WaitWhilePromise.Create(predicate, timing, cancellationToken, cancelImmediately, out var token), token);
         }
 
+        public static UniTask WaitWhile<T>(T state, Func<T, bool> predicate, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
+        {
+            return new UniTask(WaitWhilePromise<T>.Create(state, predicate, timing, cancellationToken, cancelImmediately, out var token), token);
+        }
+
         public static UniTask WaitUntilCanceled(CancellationToken cancellationToken, PlayerLoopTiming timing = PlayerLoopTiming.Update, bool completeImmediately = false)
         {
             return new UniTask(WaitUntilCanceledPromise.Create(cancellationToken, timing, completeImmediately, out var token), token);
@@ -102,6 +113,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -157,6 +172,135 @@ namespace Cysharp.Threading.Tasks
             }
         }
 
+        sealed class WaitUntilPromise<T> : IUniTaskSource, IPlayerLoopItem, ITaskPoolNode<WaitUntilPromise<T>>
+        {
+            static TaskPool<WaitUntilPromise<T>> pool;
+            WaitUntilPromise<T> nextNode;
+            public ref WaitUntilPromise<T> NextNode => ref nextNode;
+
+            static WaitUntilPromise()
+            {
+                TaskPool.RegisterSizeGetter(typeof(WaitUntilPromise<T>), () => pool.Size);
+            }
+
+            Func<T, bool> predicate;
+            T argument;
+            CancellationToken cancellationToken;
+            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
+
+            UniTaskCompletionSourceCore<object> core;
+
+            WaitUntilPromise()
+            {
+            }
+
+            public static IUniTaskSource Create(T argument, Func<T, bool> predicate, PlayerLoopTiming timing, CancellationToken cancellationToken, bool cancelImmediately, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                if (!pool.TryPop(out var result))
+                {
+                    result = new WaitUntilPromise<T>();
+                }
+
+                result.predicate = predicate;
+                result.argument = argument;
+                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
+
+                if (cancelImmediately && cancellationToken.CanBeCanceled)
+                {
+                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
+                    {
+                        var promise = (WaitUntilPromise<T>)state;
+                        promise.core.TrySetCanceled(promise.cancellationToken);
+                    }, result);
+                }
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);
+
+                token = result.core.Version;
+                return result;
+            }
+
+            public void GetResult(short token)
+            {
+                try
+                {
+                    core.GetResult(token);
+                }
+                finally
+                {
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
+                }
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public bool MoveNext()
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                    return false;
+                }
+
+                try
+                {
+                    if (!predicate(argument))
+                    {
+                        return true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    core.TrySetException(ex);
+                    return false;
+                }
+
+                core.TrySetResult(null);
+                return false;
+            }
+
+            bool TryReturn()
+            {
+                TaskTracker.RemoveTracking(this);
+                core.Reset();
+                predicate = default;
+                argument = default;
+                cancellationToken = default;
+                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
+                return pool.TryPush(this);
+            }
+        }
+
         sealed class WaitWhilePromise : IUniTaskSource, IPlayerLoopItem, ITaskPoolNode<WaitWhilePromise>
         {
             static TaskPool<WaitWhilePromise> pool;
@@ -193,7 +337,8 @@ namespace Cysharp.Threading.Tasks
 
                 result.predicate = predicate;
                 result.cancellationToken = cancellationToken;
-                
+                result.cancelImmediately = cancelImmediately;
+
                 if (cancelImmediately && cancellationToken.CanBeCanceled)
                 {
                     result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
@@ -223,6 +368,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -278,6 +427,135 @@ namespace Cysharp.Threading.Tasks
             }
         }
 
+        sealed class WaitWhilePromise<T> : IUniTaskSource, IPlayerLoopItem, ITaskPoolNode<WaitWhilePromise<T>>
+        {
+            static TaskPool<WaitWhilePromise<T>> pool;
+            WaitWhilePromise<T> nextNode;
+            public ref WaitWhilePromise<T> NextNode => ref nextNode;
+
+            static WaitWhilePromise()
+            {
+                TaskPool.RegisterSizeGetter(typeof(WaitWhilePromise<T>), () => pool.Size);
+            }
+
+            Func<T, bool> predicate;
+            T argument;
+            CancellationToken cancellationToken;
+            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
+
+            UniTaskCompletionSourceCore<object> core;
+
+            WaitWhilePromise()
+            {
+            }
+
+            public static IUniTaskSource Create(T argument, Func<T, bool> predicate, PlayerLoopTiming timing, CancellationToken cancellationToken, bool cancelImmediately, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                if (!pool.TryPop(out var result))
+                {
+                    result = new WaitWhilePromise<T>();
+                }
+
+                result.predicate = predicate;
+                result.argument = argument;
+                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
+
+                if (cancelImmediately && cancellationToken.CanBeCanceled)
+                {
+                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
+                    {
+                        var promise = (WaitWhilePromise<T>)state;
+                        promise.core.TrySetCanceled(promise.cancellationToken);
+                    }, result);
+                }
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);
+
+                token = result.core.Version;
+                return result;
+            }
+
+            public void GetResult(short token)
+            {
+                try
+                {
+                    core.GetResult(token);
+                }
+                finally
+                {
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
+                }
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public bool MoveNext()
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                    return false;
+                }
+
+                try
+                {
+                    if (predicate(argument))
+                    {
+                        return true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    core.TrySetException(ex);
+                    return false;
+                }
+
+                core.TrySetResult(null);
+                return false;
+            }
+
+            bool TryReturn()
+            {
+                TaskTracker.RemoveTracking(this);
+                core.Reset();
+                predicate = default;
+                argument = default;
+                cancellationToken = default;
+                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
+                return pool.TryPush(this);
+            }
+        }
+
         sealed class WaitUntilCanceledPromise : IUniTaskSource, IPlayerLoopItem, ITaskPoolNode<WaitUntilCanceledPromise>
         {
             static TaskPool<WaitUntilCanceledPromise> pool;
@@ -343,6 +621,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -429,7 +711,7 @@ namespace Cysharp.Threading.Tasks
                 result.equalityComparer = equalityComparer ?? UnityEqualityComparer.GetDefault<U>();
                 result.cancellationToken = cancellationToken;
                 result.cancelImmediately = cancelImmediately;
-                
+
                 if (cancelImmediately && cancellationToken.CanBeCanceled)
                 {
                     result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
@@ -459,6 +741,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -568,7 +854,7 @@ namespace Cysharp.Threading.Tasks
                 result.equalityComparer = equalityComparer ?? UnityEqualityComparer.GetDefault<U>();
                 result.cancellationToken = cancellationToken;
                 result.cancelImmediately = cancelImmediately;
-                
+
                 if (cancelImmediately && cancellationToken.CanBeCanceled)
                 {
                     result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
@@ -598,6 +884,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 

UnityProject/Packages/UniTask/Runtime/UniTask.WhenEach.cs

@@ -0,0 +1,183 @@
+using Cysharp.Threading.Tasks.Internal;
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+using System.Threading;
+
+namespace Cysharp.Threading.Tasks
+{
+    public partial struct UniTask
+    {
+        public static IUniTaskAsyncEnumerable<WhenEachResult<T>> WhenEach<T>(IEnumerable<UniTask<T>> tasks)
+        {
+            return new WhenEachEnumerable<T>(tasks);
+        }
+
+        public static IUniTaskAsyncEnumerable<WhenEachResult<T>> WhenEach<T>(params UniTask<T>[] tasks)
+        {
+            return new WhenEachEnumerable<T>(tasks);
+        }
+    }
+
+    public readonly struct WhenEachResult<T>
+    {
+        public T Result { get; }
+        public Exception Exception { get; }
+
+        //[MemberNotNullWhen(false, nameof(Exception))]
+        public bool IsCompletedSuccessfully => Exception == null;
+
+        //[MemberNotNullWhen(true, nameof(Exception))]
+        public bool IsFaulted => Exception != null;
+
+        public WhenEachResult(T result)
+        {
+            this.Result = result;
+            this.Exception = null;
+        }
+
+        public WhenEachResult(Exception exception)
+        {
+            if (exception == null) throw new ArgumentNullException(nameof(exception));
+            this.Result = default;
+            this.Exception = exception;
+        }
+
+        public void TryThrow()
+        {
+            if (IsFaulted)
+            {
+                ExceptionDispatchInfo.Capture(Exception).Throw();
+            }
+        }
+
+        public T GetResult()
+        {
+            if (IsFaulted)
+            {
+                ExceptionDispatchInfo.Capture(Exception).Throw();
+            }
+            return Result;
+        }
+
+        public override string ToString()
+        {
+            if (IsCompletedSuccessfully)
+            {
+                return Result?.ToString() ?? "";
+            }
+            else
+            {
+                return $"Exception{{{Exception.Message}}}";
+            }
+        }
+    }
+
+    internal enum WhenEachState : byte
+    {
+        NotRunning,
+        Running,
+        Completed
+    }
+
+    internal sealed class WhenEachEnumerable<T> : IUniTaskAsyncEnumerable<WhenEachResult<T>>
+    {
+        IEnumerable<UniTask<T>> source;
+
+        public WhenEachEnumerable(IEnumerable<UniTask<T>> source)
+        {
+            this.source = source;
+        }
+
+        public IUniTaskAsyncEnumerator<WhenEachResult<T>> GetAsyncEnumerator(CancellationToken cancellationToken = default)
+        {
+            return new Enumerator(source, cancellationToken);
+        }
+
+        sealed class Enumerator : IUniTaskAsyncEnumerator<WhenEachResult<T>>
+        {
+            readonly IEnumerable<UniTask<T>> source;
+            CancellationToken cancellationToken;
+
+            Channel<WhenEachResult<T>> channel;
+            IUniTaskAsyncEnumerator<WhenEachResult<T>> channelEnumerator;
+            int completeCount;
+            WhenEachState state;
+
+            public Enumerator(IEnumerable<UniTask<T>> source, CancellationToken cancellationToken)
+            {
+                this.source = source;
+                this.cancellationToken = cancellationToken;
+            }
+
+            public WhenEachResult<T> Current => channelEnumerator.Current;
+
+            public UniTask<bool> MoveNextAsync()
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                if (state == WhenEachState.NotRunning)
+                {
+                    state = WhenEachState.Running;
+                    channel = Channel.CreateSingleConsumerUnbounded<WhenEachResult<T>>();
+                    channelEnumerator = channel.Reader.ReadAllAsync().GetAsyncEnumerator(cancellationToken);
+
+                    if (source is UniTask<T>[] array)
+                    {
+                        ConsumeAll(this, array, array.Length);
+                    }
+                    else
+                    {
+                        using (var rentArray = ArrayPoolUtil.Materialize(source))
+                        {
+                            ConsumeAll(this, rentArray.Array, rentArray.Length);
+                        }
+                    }
+                }
+
+                return channelEnumerator.MoveNextAsync();
+            }
+
+            static void ConsumeAll(Enumerator self, UniTask<T>[] array, int length)
+            {
+                for (int i = 0; i < length; i++)
+                {
+                    RunWhenEachTask(self, array[i], length).Forget();
+                }
+            }
+
+            static async UniTaskVoid RunWhenEachTask(Enumerator self, UniTask<T> task, int length)
+            {
+                try
+                {
+                    var result = await task;
+                    self.channel.Writer.TryWrite(new WhenEachResult<T>(result));
+                }
+                catch (Exception ex)
+                {
+                    self.channel.Writer.TryWrite(new WhenEachResult<T>(ex));
+                }
+
+                if (Interlocked.Increment(ref self.completeCount) == length)
+                {
+                    self.state = WhenEachState.Completed;
+                    self.channel.Writer.TryComplete();
+                }
+            }
+
+            public async UniTask DisposeAsync()
+            {
+                if (channelEnumerator != null)
+                {
+                    await channelEnumerator.DisposeAsync();
+                }
+
+                if (state != WhenEachState.Completed)
+                {
+                    state = WhenEachState.Completed;
+                    channel.Writer.TryComplete(new OperationCanceledException());
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/UniTask/Runtime/UniTask.WhenEach.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0c3f4136cf7142346ae33e8a82cbdb27
+guid: 7cac24fdda5112047a1cd3dd66b542c4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

UnityProject/Packages/UniTask/Runtime/UniTaskExtensions.cs

@@ -201,6 +201,7 @@ namespace Cysharp.Threading.Tasks
 
             if (cancellationToken.IsCancellationRequested)
             {
+                task.Forget();
                 return UniTask.FromCanceled(cancellationToken);
             }
 
@@ -224,6 +225,7 @@ namespace Cysharp.Threading.Tasks
 
             if (cancellationToken.IsCancellationRequested)
             {
+                task.Forget();
                 return UniTask.FromCanceled<T>(cancellationToken);
             }
 

UnityProject/Packages/UniTask/Runtime/UnityAsyncExtensions.AssetBundleRequestAllAssets.cs

@@ -162,6 +162,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 

UnityProject/Packages/UniTask/Runtime/UnityAsyncExtensions.AsyncGPUReadback.cs

@@ -97,6 +97,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 

UnityProject/Packages/UniTask/Runtime/UnityAsyncExtensions.AsyncInstantiate.cs

@@ -0,0 +1,386 @@
+// AsyncInstantiateOperation was added since Unity 2022.3.20 / 2023.3.0b7
+#if UNITY_2022_3 && !(UNITY_2022_3_0 || UNITY_2022_3_1 || UNITY_2022_3_2 || UNITY_2022_3_3 || UNITY_2022_3_4 || UNITY_2022_3_5 || UNITY_2022_3_6 || UNITY_2022_3_7 || UNITY_2022_3_8 || UNITY_2022_3_9 || UNITY_2022_3_10 || UNITY_2022_3_11 || UNITY_2022_3_12 || UNITY_2022_3_13 || UNITY_2022_3_14 || UNITY_2022_3_15 || UNITY_2022_3_16 || UNITY_2022_3_17 || UNITY_2022_3_18 || UNITY_2022_3_19)
+#define UNITY_2022_SUPPORT
+#endif
+
+#if UNITY_2022_SUPPORT || UNITY_2023_3_OR_NEWER
+
+using Cysharp.Threading.Tasks.Internal;
+using System;
+using System.Threading;
+using UnityEngine;
+
+namespace Cysharp.Threading.Tasks
+{
+    public static class AsyncInstantiateOperationExtensions
+    {
+        // AsyncInstantiateOperation<T> has GetAwaiter so no need to impl
+        // public static UniTask<T[]>.Awaiter GetAwaiter<T>(this AsyncInstantiateOperation<T> operation) where T : Object
+
+        public static UniTask<UnityEngine.Object[]> WithCancellation<T>(this AsyncInstantiateOperation asyncOperation, CancellationToken cancellationToken)
+        {
+            return ToUniTask(asyncOperation, cancellationToken: cancellationToken);
+        }
+
+        public static UniTask<UnityEngine.Object[]> WithCancellation<T>(this AsyncInstantiateOperation asyncOperation, CancellationToken cancellationToken, bool cancelImmediately)
+        {
+            return ToUniTask(asyncOperation, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately);
+        }
+
+        public static UniTask<UnityEngine.Object[]> ToUniTask(this AsyncInstantiateOperation asyncOperation, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
+        {
+            Error.ThrowArgumentNullException(asyncOperation, nameof(asyncOperation));
+            if (cancellationToken.IsCancellationRequested) return UniTask.FromCanceled<UnityEngine.Object[]>(cancellationToken);
+            if (asyncOperation.isDone) return UniTask.FromResult(asyncOperation.Result);
+            return new UniTask<UnityEngine.Object[]>(AsyncInstantiateOperationConfiguredSource.Create(asyncOperation, timing, progress, cancellationToken, cancelImmediately, out var token), token);
+        }
+
+        public static UniTask<T[]> WithCancellation<T>(this AsyncInstantiateOperation<T> asyncOperation, CancellationToken cancellationToken)
+            where T : UnityEngine.Object
+        {
+            return ToUniTask(asyncOperation, cancellationToken: cancellationToken);
+        }
+
+        public static UniTask<T[]> WithCancellation<T>(this AsyncInstantiateOperation<T> asyncOperation, CancellationToken cancellationToken, bool cancelImmediately)
+            where T : UnityEngine.Object
+        {
+            return ToUniTask(asyncOperation, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately);
+        }
+
+        public static UniTask<T[]> ToUniTask<T>(this AsyncInstantiateOperation<T> asyncOperation, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
+            where T : UnityEngine.Object
+        {
+            Error.ThrowArgumentNullException(asyncOperation, nameof(asyncOperation));
+            if (cancellationToken.IsCancellationRequested) return UniTask.FromCanceled<T[]>(cancellationToken);
+            if (asyncOperation.isDone) return UniTask.FromResult(asyncOperation.Result);
+            return new UniTask<T[]>(AsyncInstantiateOperationConfiguredSource<T>.Create(asyncOperation, timing, progress, cancellationToken, cancelImmediately, out var token), token);
+        }
+
+        sealed class AsyncInstantiateOperationConfiguredSource : IUniTaskSource<UnityEngine.Object[]>, IPlayerLoopItem, ITaskPoolNode<AsyncInstantiateOperationConfiguredSource>
+        {
+            static TaskPool<AsyncInstantiateOperationConfiguredSource> pool;
+            AsyncInstantiateOperationConfiguredSource nextNode;
+            public ref AsyncInstantiateOperationConfiguredSource NextNode => ref nextNode;
+
+            static AsyncInstantiateOperationConfiguredSource()
+            {
+                TaskPool.RegisterSizeGetter(typeof(AsyncInstantiateOperationConfiguredSource), () => pool.Size);
+            }
+
+            AsyncInstantiateOperation asyncOperation;
+            IProgress<float> progress;
+            CancellationToken cancellationToken;
+            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
+            bool completed;
+
+            UniTaskCompletionSourceCore<UnityEngine.Object[]> core;
+
+            Action<AsyncOperation> continuationAction;
+
+            AsyncInstantiateOperationConfiguredSource()
+            {
+                continuationAction = Continuation;
+            }
+
+            public static IUniTaskSource<UnityEngine.Object[]> Create(AsyncInstantiateOperation asyncOperation, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource<UnityEngine.Object[]>.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                if (!pool.TryPop(out var result))
+                {
+                    result = new AsyncInstantiateOperationConfiguredSource();
+                }
+
+                result.asyncOperation = asyncOperation;
+                result.progress = progress;
+                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
+                result.completed = false;
+
+                asyncOperation.completed += result.continuationAction;
+
+                if (cancelImmediately && cancellationToken.CanBeCanceled)
+                {
+                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
+                    {
+                        var source = (AsyncInstantiateOperationConfiguredSource)state;
+                        source.core.TrySetCanceled(source.cancellationToken);
+                    }, result);
+                }
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);
+
+                token = result.core.Version;
+                return result;
+            }
+
+            public UnityEngine.Object[] GetResult(short token)
+            {
+                try
+                {
+                    return core.GetResult(token);
+                }
+                finally
+                {
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
+                }
+            }
+
+            void IUniTaskSource.GetResult(short token)
+            {
+                GetResult(token);
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public bool MoveNext()
+            {
+                // Already completed
+                if (completed || asyncOperation == null)
+                {
+                    return false;
+                }
+
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                    return false;
+                }
+
+                if (progress != null)
+                {
+                    progress.Report(asyncOperation.progress);
+                }
+
+                if (asyncOperation.isDone)
+                {
+                    core.TrySetResult(asyncOperation.Result);
+                    return false;
+                }
+
+                return true;
+            }
+
+            bool TryReturn()
+            {
+                TaskTracker.RemoveTracking(this);
+                core.Reset();
+                asyncOperation.completed -= continuationAction;
+                asyncOperation = default;
+                progress = default;
+                cancellationToken = default;
+                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
+                return pool.TryPush(this);
+            }
+
+            void Continuation(AsyncOperation _)
+            {
+                if (completed)
+                {
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                }
+                else
+                {
+                    core.TrySetResult(asyncOperation.Result);
+                }
+            }
+        }
+
+        sealed class AsyncInstantiateOperationConfiguredSource<T> : IUniTaskSource<T[]>, IPlayerLoopItem, ITaskPoolNode<AsyncInstantiateOperationConfiguredSource<T>>
+            where T : UnityEngine.Object
+        {
+            static TaskPool<AsyncInstantiateOperationConfiguredSource<T>> pool;
+            AsyncInstantiateOperationConfiguredSource<T> nextNode;
+            public ref AsyncInstantiateOperationConfiguredSource<T> NextNode => ref nextNode;
+
+            static AsyncInstantiateOperationConfiguredSource()
+            {
+                TaskPool.RegisterSizeGetter(typeof(AsyncInstantiateOperationConfiguredSource<T>), () => pool.Size);
+            }
+
+            AsyncInstantiateOperation<T> asyncOperation;
+            IProgress<float> progress;
+            CancellationToken cancellationToken;
+            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
+            bool completed;
+
+            UniTaskCompletionSourceCore<T[]> core;
+
+            Action<AsyncOperation> continuationAction;
+
+            AsyncInstantiateOperationConfiguredSource()
+            {
+                continuationAction = Continuation;
+            }
+
+            public static IUniTaskSource<T[]> Create(AsyncInstantiateOperation<T> asyncOperation, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource<T[]>.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                if (!pool.TryPop(out var result))
+                {
+                    result = new AsyncInstantiateOperationConfiguredSource<T>();
+                }
+
+                result.asyncOperation = asyncOperation;
+                result.progress = progress;
+                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
+                result.completed = false;
+
+                asyncOperation.completed += result.continuationAction;
+
+                if (cancelImmediately && cancellationToken.CanBeCanceled)
+                {
+                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
+                    {
+                        var source = (AsyncInstantiateOperationConfiguredSource<T>)state;
+                        source.core.TrySetCanceled(source.cancellationToken);
+                    }, result);
+                }
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);
+
+                token = result.core.Version;
+                return result;
+            }
+
+            public T[] GetResult(short token)
+            {
+                try
+                {
+                    return core.GetResult(token);
+                }
+                finally
+                {
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
+                }
+            }
+
+            void IUniTaskSource.GetResult(short token)
+            {
+                GetResult(token);
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public bool MoveNext()
+            {
+                // Already completed
+                if (completed || asyncOperation == null)
+                {
+                    return false;
+                }
+
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                    return false;
+                }
+
+                if (progress != null)
+                {
+                    progress.Report(asyncOperation.progress);
+                }
+
+                if (asyncOperation.isDone)
+                {
+                    core.TrySetResult(asyncOperation.Result);
+                    return false;
+                }
+
+                return true;
+            }
+
+            bool TryReturn()
+            {
+                TaskTracker.RemoveTracking(this);
+                core.Reset();
+                asyncOperation.completed -= continuationAction;
+                asyncOperation = default;
+                progress = default;
+                cancellationToken = default;
+                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
+                return pool.TryPush(this);
+            }
+
+            void Continuation(AsyncOperation _)
+            {
+                if (completed)
+                {
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                }
+                else
+                {
+                    core.TrySetResult(asyncOperation.Result);
+                }
+            }
+        }
+    }
+}
+
+#endif

UnityProject/Packages/UniTask/Runtime/UnityAsyncExtensions.AsyncInstantiate.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0b6f2523a865e454d8fa3f48a2852d5a
+guid: 8321f4244edfdcd4798b4fcc92a736c9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

UnityProject/Packages/UniTask/Runtime/UnityAsyncExtensions.cs

@@ -158,6 +158,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -384,6 +388,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -615,6 +623,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -847,6 +859,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 
@@ -1095,6 +1111,10 @@ namespace Cysharp.Threading.Tasks
                     {
                         TryReturn();
                     }
+                    else
+                    {
+                        TaskTracker.RemoveTracking(this);
+                    }
                 }
             }
 

UnityProject/Packages/UniTask/Runtime/UnityAsyncExtensions.uGUI.cs

@@ -339,7 +339,7 @@ namespace Cysharp.Threading.Tasks
 
         void InvokeCore(string item1, int item2, int item3)
         {
-            innerEvent.Invoke(item1, item2, item3);
+            Invoke((item1, item2, item3));
         }
 
         public void Dispose()
@@ -855,4 +855,4 @@ namespace Cysharp.Threading.Tasks
     }
 }
 
-#endif
+#endif

UnityProject/Packages/UniTask/package.json

@@ -2,7 +2,7 @@
     "name": "com.cysharp.unitask",
     "displayName": "UniTask",
     "author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
-    "version": "2.5.4",
+    "version": "2.5.10",
     "unity": "2018.4",
     "description": "Provides an efficient async/await integration to Unity.",
     "keywords": [ "async/await", "async", "Task", "UniTask" ],

UnityProject/Packages/YooAsset/CHANGELOG.md

@@ -2,6 +2,685 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.3-preview] - 2025-03-06
+
+### Improvements
+
+- 新增了异步操作任务调试器，AssetBundleDebugger窗口-->OperationView视图模式
+- 编辑器下模拟构建默认启用依赖关系数据库，可以大幅增加编辑器下开始游戏时间。
+- 单元测试用例增加加密解密测试用例。
+
+### Fixed
+
+- (#492) 修复了发布的MAC平台应用，在启动的时候提示权限无法获取的问题。
+
+## [2.3.2-preview] - 2025-02-27
+
+### Fixed
+
+- (2.3.1) 修复小游戏平台下载器不生效的问题。
+- (#480) 修复了Unity工程打包导出时的报错。
+
+### Added
+
+- 下载器新增参数：recursiveDownload
+
+  ```csharp
+  /// <summary>
+  /// 创建资源下载器，用于下载指定的资源依赖的资源包文件
+  /// </summary>
+  /// <param name="recursiveDownload">下载资源对象所属资源包内所有资源对象依赖的资源包
+  public ResourceDownloaderOperation CreateBundleDownloader()
+  ```
+
+- 新增CustomPlayMode模式
+
+  ```csharp
+  /// <summary>
+  /// 自定义运行模式的初始化参数
+  /// </summary>
+  public class CustomPlayModeParameters : InitializeParameters
+  {
+      /// <summary>
+      /// 文件系统初始化参数列表
+      /// 注意：列表最后一个元素作为主文件系统！
+      /// </summary>
+      public List<FileSystemParameters> FileSystemParameterList;
+  }
+  ```
+
+## [2.3.1-preview] - 2025-02-25
+
+**资源加载依赖计算方式还原为了1.5x版本的模式，只加载资源对象实际依赖的资源包，不再以资源对象所在资源包的依赖关系为加载标准**。
+
+### Improvements
+
+- 优化OperationSystem的更新机制，异步加载的耗时降低了50%。
+- 优化了Debugger窗口的显示页面，BundleView页面增加资源包的引用列表。
+- 优化了Reporter窗口的显示页面。
+
+### Fixed
+
+- 修复了怀旧依赖模式下，TAG传染不正确的问题。
+
+## [2.3.0-preview] - 2025-02-19
+
+### Improvements
+
+资源收集窗口列表元素支持手动上下拖拽排序！
+
+资源扫描窗口列表元素支持手动上下拖拽排序！
+
+### Added
+
+- 新增了UIElements扩展类ReorderableListView
+
+- 新增初始化方法
+
+  ```csharp
+  public class YooAssets
+  {
+      /// <summary>
+      /// 设置异步系统参数，快速启动模式的开关
+      /// 注意：该模式默认开启
+      /// </summary>
+      public static void SetOperationSystemQuickStartMode(bool state)
+  }
+  ```
+
+- 新增打包构建参数
+
+  ```csharp
+  public class BuildParameters
+  {
+      /// <summary>
+      /// 旧版依赖模式
+      /// 说明：兼容YooAssets1.5.x版本
+      /// </summary>
+      public bool LegacyDependency = false;    
+  }
+  ```
+
+### Fixed
+
+- (#472) 修复了Unity6平台，TableView视图无法显示问题。
+- 修复了微信小游戏和抖音小游戏未正确使用插件的卸载方法。
+
+## [2.2.12] - 2025-02-14
+
+### Improvements
+
+- WebGL网页平台支持文件加密。
+- 微信小游戏平台支持文件加密。
+- 抖音小游戏平台支持文件加密。
+
+### Fixed
+
+- (#466) 修复了微信小游戏文件系统查询机制不生效！
+- (#341) 修复了微信小游戏的下载进度异常问题。
+- (#471) 修复了Unity2019,Unity2020平台上，TableView视图无法显示的问题。
+
+### Added
+
+- 新增了ResourcePackage.UnloadAllAssetsAsync(UnloadAllAssetsOptions options)方法
+
+  ```csharp
+  public sealed class UnloadAllAssetsOptions
+  {
+      /// <summary>
+      /// 释放所有资源句柄，防止卸载过程中触发完成回调！
+      /// </summary>
+      public bool ReleaseAllHandles = true;
+       
+      /// <summary>
+      /// 卸载过程中锁定加载操作，防止新的任务请求！
+      /// </summary>
+      public bool LockLoadOperation = true;
+  }
+  ```
+
+## [2.2.11] - 2025-02-10
+
+### Improvements
+
+- AssetArtScanner配置和生成报告的容错性检测。
+
+### Fixed
+
+- (#465) 修复了特殊情况下，没有配置资源包文件后缀名构建失败的问题。
+- (#468) 修复了安卓平台二次启动加载原生文件或加密文件失败的问题。
+
+## [2.2.10] - 2025-02-08
+
+### Improvements
+
+- 新增了可扩展的AssetArtScanner资源扫描工具，详细请见官方说明文档。
+- 优化了AssetBundleReporter页面。
+- 优化了AssetBundleDebugger页面。
+- 优化了微信小游戏文件系统的缓存查询机制。
+- 优化了抖音小游戏文件系统的缓存查询机制。
+
+### Fixed
+
+- (#447) 修复了Unity2019平台代码编译错误问题。
+- (#456) 修复了在Package未激活有效清单之前，无法销毁的问题。
+- (#452) 修复了内置文件系统类NeedPack方法总是返回TRUE的问题。
+- (#424) 适配了Unity6000版本替换了过时方法。
+
+### Added
+
+- 新增了SBP构建管线构建参数：BuiltinShadersBundleName
+
+- 新增了SBP构建管线构建参数：MonoScriptsBundleName
+
+- 新增了全局构建管线构建参数：SingleReferencedPackAlone
+
+  ```csharp
+  /// <summary>
+  /// 对单独引用的共享资源进行独立打包
+  /// 说明：关闭该选项单独引用的共享资源将会构建到引用它的资源包内！
+  /// </summary>
+  public bool SingleReferencedPackAlone = true;
+  ```
+
+- 新增了内置文件系统初始化参数：COPY_BUILDIN_PACKAGE_MANIFEST
+
+  ```csharp
+  // 内置文件系统初始化的时候，自动拷贝内置清单到沙盒目录。
+  var systemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters();
+  systemParameters.AddParameter(FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST, true);
+  ```
+
+## [2.2.9] - 2025-01-14
+
+### Fixed
+
+- (#438) 修复了纯血鸿蒙加载本地文件失败的问题。
+- (#445) 修复了小游戏扩展文件系统脚本编译错误。
+
+### Changed
+
+- EditorSimulateModeHelper.SimulateBuild()方法变更
+
+  ```csharp
+  public static PackageInvokeBuildResult SimulateBuild(string packageName);
+  ```
+
+## [2.2.8-preview] - 2025-01-03
+
+新增了单元测试用例。
+
+### Improvements
+
+- EditorSimulateModeHelper.SimulateBuild()方法提供指定自定义构建类
+
+  ```csharp
+  public class EditorSimulateBuildParam
+  {
+      /// <summary>
+      /// 模拟构建类所属程序集名称
+      /// </summary>
+      public string InvokeAssmeblyName = "YooAsset.Editor";
+  
+      /// <summary>
+      /// 模拟构建执行的类名全称       
+      /// 注意：类名必须包含命名空间！  
+      /// </summary>    
+      public string InvokeClassFullName = "YooAsset.Editor.AssetBundleSimulateBuilder";
+  
+      /// <summary>     
+      /// 模拟构建执行的方法名称    
+      /// 注意：执行方法必须满足 BindingFlags.Public | BindingFlags.Static      
+      /// </summary>       
+      public string InvokeMethodName = "SimulateBuild";
+  }
+  ```
+
+- 文件清理方式新增清理缓存清单。
+
+  ```csharp
+  /// <summary>
+  /// 文件清理方式
+  /// </summary>
+  public enum EFileClearMode
+  {
+      /// <summary>
+      /// 清理所有清单
+      /// </summary>
+      ClearAllManifestFiles,
+  
+      /// <summary>
+      /// 清理未在使用的清单 
+      /// </summary> 
+      ClearUnusedManifestFiles,    
+  }
+  ```
+
+### Fixed
+
+- (#426) 修复了鸿蒙next平台加载内置文件路径报错的问题。
+- (#428) 修复了鸿蒙next平台加载内置文件路径报错的问题。
+- (#434) 修复了2.2版本 catalog文件对Json格式原生文件不记录的问题。
+- (#435) 修复了WebGL平台调用MD5算法触发异常的问题。
+
+### Added
+
+- 新增了视频打包规则。
+
+  ```csharp
+  /// <summary>
+  /// 打包视频文件
+  /// </summary>
+  [DisplayName("打包视频文件")]
+  public class PackVideoFile : IPackRule
+  ```
+
+### Changed
+
+- 重命名FileSystemParameters.RootDirectory字段为PackageRoot
+- 重命名ResourcePackage.ClearCacheBundleFilesAsync()方法为ClearCacheFilesAsync()
+
+## [2.2.7-preview] - 2024-12-30
+
+### Improvements
+
+- 重构了下载器的委托方法。
+
+- YooAssetSettings配置文件新增Package Manifest Prefix参数。
+
+  ```csharp
+  /// <summary>
+  /// 资源清单前缀名称（默认为空)
+  /// </summary>
+  public string PackageManifestPrefix = string.Empty;
+  ```
+
+### Fixed
+
+- (#422) 修复了同步加载场景的NotImplementedException异常报错。
+- (#418) 修复了web远程文件系统初始化不正确的问题
+- (#392) 修复了引擎版本代码兼容相关的警告。
+- (#332) 修复了当用户的设备中有特殊字符时，URL路径无法被正确识别的问题。
+
+### Added
+
+- 新增代码字段：AsyncOperationBase.PackageName
+
+### Changed
+
+- 重命名DownloaderOperation.OnDownloadOver()方法为DownloaderFinish()
+- 重命名DownloaderOperation.OnDownloadProgress()方法为DownloadUpdate()
+- 重命名DownloaderOperation.OnDownloadError()方法为DownloadError()
+- 重命名DownloaderOperation.OnStartDownloadFile()方法为DownloadFileBegin()
+
+## [2.2.6-preview] - 2024-12-27
+
+### Improvements
+
+- 增强了对Steam平台DLC拓展包的支持。
+
+  ```csharp
+  // 新增参数关闭Catalog目录查询内置文件的功能
+  var fileSystemParams = CreateDefaultBuildinFileSystemParameters();
+  fileSystemParams .AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true);
+  ```
+
+- 资源句柄基类提供了统一的Release方法。
+
+  ```csharp
+  public abstract class HandleBase : IEnumerator, IDisposable
+  {
+      /// <summary>
+      /// 释放资源句柄
+      /// </summary>
+      public void Release();
+  
+      /// <summary>
+      /// 释放资源句柄
+      /// </summary>
+      public void Dispose();
+  }
+  ```
+
+- 优化了场景卸载逻辑。
+
+  ```csharp
+  //框架内不在区分主场景和附加场景。
+  //场景卸载后自动释放资源句柄。
+  ```
+
+### Fixed
+
+- 修复了Unity2020版本提示的脚本编译错误。
+- (#417) 修复了DefaultWebServerFileSystem文件系统内Catalog未起效的问题。
+
+### Added
+
+- 新增示例文件 GetCacheBundleSizeOperation.cs
+
+  可以获取指定Package的缓存资源总大小。
+
+### Removed
+
+- 移除了SceneHandle.IsMainScene()方法。
+
+## [2.2.5-preview] - 2024-12-25
+
+依赖的ScriptableBuildPipeline (SBP) 插件库版本切换为1.21.25版本！
+
+重构了ResourceManager相关的核心代码，方便借助文件系统扩展和支持更复杂的需求！
+
+### Editor
+
+- 新增了编辑器模拟构建管线 EditorSimulateBuildPipeline
+- 移除了EBuildMode枚举类型，构建界面有变动。
+- IActiveRule分组激活接口新增GroupData类。
+
+### Improvements
+
+- 增加抖音小游戏文件系统，见扩展示例代码。
+
+- 微信小游戏文件系统支持删除无用缓存文件和全部缓存文件。
+
+- 资源构建管线现在默认剔除了Gizmos和编辑器资源。
+
+- 优化了资源构建管线里资源收集速度。
+
+  资源收集速度提升100倍！
+
+  ```csharp
+  class BuildParameters
+  {
+      /// <summary>
+      /// 使用资源依赖缓存数据库
+      /// 说明：开启此项可以极大提高资源收集速度
+      /// </summary>
+      public bool UseAssetDependencyDB = false;
+  }
+  ```
+
+- WebPlayMode支持跨域加载。
+
+  ```csharp
+  // 创建默认的WebServer文件系统参数
+  public static FileSystemParameters CreateDefaultWebServerFileSystemParameters(bool disableUnityWebCache = false)
+  
+  // 创建默认的WebRemote文件系统参数（支持跨域加载）
+  public static FileSystemParameters CreateDefaultWebRemoteFileSystemParameters(IRemoteServices remoteServices, bool disableUnityWebCache = false)
+  ```
+
+- 编辑器模拟文件系统新增初始化参数：支持异步模拟加载帧数。
+
+  ```csharp
+  /// <summary>
+  /// 异步模拟加载最小帧数
+  /// </summary>
+  FileSystemParametersDefine.ASYNC_SIMULATE_MIN_FRAME
+  
+  /// <summary>
+  /// 异步模拟加载最大帧数
+  /// </summary>
+  FileSystemParametersDefine.ASYNC_SIMULATE_MAX_FRAME
+  ```
+
+- 缓存文件系统新增初始化参数：支持设置下载器最大并发连接数和单帧最大请求数
+
+  ```csharp
+  var fileSystremParams = FileSystemParameters.CreateDefaultCacheFileSystemParameters();
+  fileSystremParams .AddParameter(FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY, 99);
+  fileSystremParams .AddParameter(FileSystemParametersDefine.DOWNLOAD_MAX_REQUEST_PER_FRAME, 10);
+  ```
+
+### Fixed
+
+- (#349) 修复了在加载清单的时候，即使本地存在缓存文件还会去远端下载。
+- (#361) 修复了协程里等待的asset handle被release，会无限等待并输出警告信息。
+- (#359) 修复了SubAssetsHandle.GetSubAssetObject会获取到同名的主资源。
+- (#387) 修复了加密后文件哈希冲突的时候没有抛出异常错误。
+- (#404) 修复了Unity2022.3.8版本提示编译错误：Cannot resolve symbol 'AsyncInstantiateOperation' 
+
+### Added
+
+- 新增示例文件 CopyBuildinManifestOperation.cs
+
+- 新增示例文件 LoadGameObjectOperation.cs
+
+- 新增了获取配置清单详情的方法
+
+  ```csharp
+  class ResourcePackage
+  {
+     public PackageDetails GetPackageDetails() 
+  }
+  ```
+
+- 新增了获取所有资源信息的方法
+
+  ```csharp
+  class ResourcePackage
+  {
+      public AssetInfo[] GetAllAssetInfos() 
+  }
+  ```
+
+- 新增了清理缓存文件的通用方法
+
+  ```csharp
+  /// <summary>
+  /// 文件清理方式
+  /// </summary>
+  public enum EFileClearMode
+  {
+      /// <summary>
+      /// 清理所有文件
+      /// </summary>
+      ClearAllBundleFiles = 1,
+      /// <summary>
+      /// 清理未在使用的文件
+      /// </summary>
+      ClearUnusedBundleFiles = 2,
+      /// <summary>   
+      /// 清理指定标签的文件   
+      /// 说明：需要指定参数，可选：string, string[], List<string>   
+      /// </summary>   
+      ClearBundleFilesByTags = 3,
+  }
+  class ResourcePackage
+  {
+      /// <summary>
+      /// 清理缓存文件
+      /// </summary>
+      /// <param name="clearMode">清理方式</param>
+      /// <param name="clearParam">执行参数</param>
+      public ClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(EFileClearMode clearMode, object clearParam = null)
+  }
+  ```
+
+### Changed
+
+- 修改了EditorSimulateModeHelper.SimulateBuild()方法
+
+- 重命名ResourcePackage.GetAssetsInfoByTags()方法为GetAssetInfosByTags()
+
+- 实例化对象方法增加激活参数。
+
+  ```csharp
+  public InstantiateOperation InstantiateAsync(bool actived = true)
+  ```
+
+- 清单文件的版本提升到2.2.5版本
+
+  ```csharp
+  /// <summary>
+  /// 资源包裹的备注信息
+  /// </summary>
+  public string PackageNote;
+  ```
+  
+
+### Removed
+
+- 移除了HostPlayModeParameters.DeliveryFileSystemParameters字段
+- 移除了ResourcePackage.ClearAllBundleFilesAsync()方法
+- 移除了ResourcePackage.ClearUnusedBundleFilesAsync()方法
+- 移除了FileSystemParameters.CreateDefaultBuildinRawFileSystemParameters()方法
+- 移除了FileSystemParameters.CreateDefaultCacheRawFileSystemParameters()方法
+- 移除了枚举类型：EDefaultBuildPipeline
+- 移除了配置参数：YooAssetSettings.ManifestFileName
+
+## [2.2.4-preview] - 2024-08-15
+
+### Fixed
+
+- 修复了HostPlayMode初始化卡死的问题。
+
+## [2.2.3-preview] - 2024-08-13
+
+### Fixed
+
+- (#311) 修复了断点续传下载器极小概率报错 : “416 Range Not Satisfiable”
+
+### Improvements
+
+- 原生文件构建管线支持原生文件加密。
+
+- HostPlayMode模式下内置文件系统初始化参数可以为空。
+
+- 场景加载增加了LocalPhysicsMode参数来控制物理运行模式。
+
+- 默认的内置文件系统和缓存文件系统增加解密方法。
+
+  ```csharp
+  /// <summary>
+  /// 创建默认的内置文件系统参数
+  /// </summary>
+  /// <param name="decryptionServices">加密文件解密服务类</param>
+  /// <param name="verifyLevel">缓存文件的校验等级</param>
+  /// <param name="rootDirectory">内置文件的根路径</param>
+  public static FileSystemParameters CreateDefaultBuildinFileSystemParameters(IDecryptionServices decryptionServices, EFileVerifyLevel verifyLevel, string rootDirectory);
+  
+  /// <summary>
+  /// 创建默认的缓存文件系统参数
+  /// </summary>
+  /// <param name="remoteServices">远端资源地址查询服务类</param>
+  /// <param name="decryptionServices">加密文件解密服务类</param>
+  /// <param name="verifyLevel">缓存文件的校验等级</param>
+  /// <param name="rootDirectory">文件系统的根目录</param>
+  public static FileSystemParameters CreateDefaultCacheFileSystemParameters(IRemoteServices remoteServices, IDecryptionServices decryptionServices, EFileVerifyLevel verifyLevel, string rootDirectory);
+  ```
+
+## [2.2.2-preview] - 2024-07-31
+
+### Fixed
+
+- (#321) 修复了在Unity2022里编辑器下离线模式运行失败的问题。
+- (#325) 修复了在Unity2019里编译报错问题。
+
+## [2.2.1-preview] - 2024-07-10
+
+统一了所有PlayMode的初始化逻辑，EditorSimulateMode和OfflinePlayMode初始化不再主动加载资源清单！
+
+### Added
+
+- 新增了IFileSystem.ReadFileData方法，支持原生文件自定义获取文本和二进制数据。
+
+### Improvements
+
+- 优化了DefaultWebFileSystem和DefaultBuildFileSystem文件系统的内部初始化逻辑。
+
+## [2.2.0-preview] - 2024-07-07
+
+重构了运行时代码，新增了文件系统接口（IFileSystem）方便开发者扩展特殊需求。
+
+新增微信小游戏文件系统示例代码，详细见Extension Sample/Runtime/WechatFileSystem
+
+### Added
+
+- 新增了ResourcePackage.DestroyAsync方法
+
+- 新增了FileSystemParameters类帮助初始化文件系统
+
+  内置了编辑器文件系统参数，内置文件系统参数，缓存文件系统参数，Web文件系统参数。
+
+  ```csharp
+  public class FileSystemParameters
+  {
+      /// <summary>
+      /// 文件系统类
+      /// </summary>
+      public string FileSystemClass { private set; get; }
+      
+      /// <summary>
+      /// 文件系统的根目录
+      /// </summary>
+      public string RootDirectory { private set; get; }   
+      
+      /// <summary>
+      /// 添加自定义参数
+      /// </summary>
+      public void AddParameter(string name, object value)    
+  }
+  ```
+
+### Changed
+
+- 重构了InitializeParameters初始化参数
+- 重命名YooAssets.DestroyPackage方法为RemovePackage
+- 重命名ResourcePackage.UpdatePackageVersionAsync方法为RequestPackageVersionAsync
+- 重命名ResourcePackage.UnloadUnusedAssets方法为UnloadUnusedAssetsAsync
+- 重命名ResourcePackage.ForceUnloadAllAssets方法为UnloadAllAssetsAsync
+- 重命名ResourcePackage.ClearUnusedCacheFilesAsync方法为ClearUnusedBundleFilesAsync
+- 重命名ResourcePackage.ClearAllCacheFilesAsync方法为ClearAllBundleFilesAsync
+
+### Removed
+
+- 移除了YooAssets.Destroy方法
+- 移除了YooAssets.SetDownloadSystemClearFileResponseCode方法
+- 移除了YooAssets.SetCacheSystemDisableCacheOnWebGL方法
+- 移除了ResourcePackage.GetPackageBuildinRootDirectory方法
+- 移除了ResourcePackage.GetPackageSandboxRootDirectory方法
+- 移除了ResourcePackage.ClearPackageSandbox方法
+- 移除了IBuildinQueryServices接口
+- 移除了IDeliveryLoadServices接口
+- 移除了IDeliveryQueryServices接口
+
+
+## [2.1.2] - 2024-05-16
+
+SBP库依赖版本升级至2.1.3
+
+### Fixed
+
+- (#236) 修复了资源配置界面AutoCollectShader复选框没有刷新的问题。
+- (#244) 修复了导入器在安卓平台导入本地下载的资源失败的问题。
+- (#268) 修复了挂起场景未解除状态前无法卸载的问题。
+- (#269) 优化场景挂起流程，支持中途取消挂起操作。
+- (#276) 修复了HostPlayMode模式下，如果内置清单是最新版本，每次运行都会触发拷贝行为。
+- (#289) 修复了Unity2019版本脚本IWebRequester编译报错。
+- (#295) 解决了在安卓移动平台，华为和三星真机上有极小概率加载资源包失败 : Unable to open archive file
+
+### Added
+
+- 新增GetAllCacheFileInfosOperation()获取缓存文件信息的方法。
+
+- 新增LoadSceneSync()同步加载场景的方法。
+
+- 新增IIgnoreRule接口，资源收集流程可以自定义。
+
+- 新增IWechatQueryServices接口，用于微信平台本地文件查询。
+
+  后续将会通过虚拟文件系统来支持！
+
+### Changed
+
+- 调整了UnloadSceneOperation代码里场景的卸载顺序。
+
+### Improvements
+
+- 优化了资源清单的解析过程。
+- 移除资源包名里的空格字符。
+- 支持华为鸿蒙系统。
+
 ## [2.1.1] - 2024-01-17
 
 ### Fixed

UnityProject/Packages/YooAsset/Editor/AssetArtReporter.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 07a483743a0f68e4cb55a38570d1b7cd
+guid: bdbb4647038dcc842802f546c2fedc83
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

@@ -0,0 +1,624 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    public class AssetArtReporterWindow : EditorWindow
+    {
+        [MenuItem("YooAsset/AssetArt Reporter", false, 302)]
+        public static AssetArtReporterWindow OpenWindow()
+        {
+            AssetArtReporterWindow window = GetWindow<AssetArtReporterWindow>("AssetArt Reporter", true, WindowsDefine.DockedWindowTypes);
+            window.minSize = new Vector2(800, 600);
+            return window;
+        }
+
+        private class ElementTableData : DefaultTableData
+        {
+            public ReportElement Element;
+        }
+        private class PassesBtnCell : ITableCell, IComparable
+        {
+            public object CellValue { set; get; }
+            public string SearchTag { private set; get; }
+            public ReportElement Element
+            {
+                get
+                {
+                    return (ReportElement)CellValue;
+                }
+            }
+
+            public PassesBtnCell(string searchTag, ReportElement element)
+            {
+                SearchTag = searchTag;
+                CellValue = element;
+            }
+            public object GetDisplayObject()
+            {
+                return string.Empty;
+            }
+            public int CompareTo(object other)
+            {
+                if (other is PassesBtnCell cell)
+                {
+                    return this.Element.Passes.CompareTo(cell.Element.Passes);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+        private class WhiteListBtnCell : ITableCell, IComparable
+        {
+            public object CellValue { set; get; }
+            public string SearchTag { private set; get; }
+            public ReportElement Element
+            {
+                get
+                {
+                    return (ReportElement)CellValue;
+                }
+            }
+
+            public WhiteListBtnCell(string searchTag, ReportElement element)
+            {
+                SearchTag = searchTag;
+                CellValue = element;
+            }
+            public object GetDisplayObject()
+            {
+                return string.Empty;
+            }
+            public int CompareTo(object other)
+            {
+                if (other is WhiteListBtnCell cell)
+                {
+                    return this.Element.IsWhiteList.CompareTo(cell.Element.IsWhiteList);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+
+        private ToolbarSearchField _searchField;
+        private Button _showHiddenBtn;
+        private Button _whiteListVisibleBtn;
+        private Button _passesVisibleBtn;
+        private Label _titleLabel;
+        private Label _descLabel;
+        private TableViewer _elementTableView;
+
+        private ScanReportCombiner _reportCombiner;
+        private string _lastestOpenFolder;
+        private List<ITableData> _sourceDatas;
+        private bool _elementVisibleState = true;
+        private bool _whiteListVisibleState = true;
+        private bool _passesVisibleState = true;
+
+        public void CreateGUI()
+        {
+            try
+            {
+                VisualElement root = this.rootVisualElement;
+
+                // 加载布局文件
+                var visualAsset = UxmlLoader.LoadWindowUXML<AssetArtReporterWindow>();
+                if (visualAsset == null)
+                    return;
+
+                visualAsset.CloneTree(root);
+
+                // 导入按钮
+                var importSingleBtn = root.Q<Button>("SingleImportButton");
+                importSingleBtn.clicked += ImportSingleBtn_clicked;
+                var importMultiBtn = root.Q<Button>("MultiImportButton");
+                importMultiBtn.clicked += ImportMultiBtn_clicked;
+
+                // 修复按钮
+                var fixAllBtn = root.Q<Button>("FixAllButton");
+                fixAllBtn.clicked += FixAllBtn_clicked;
+                var fixSelectBtn = root.Q<Button>("FixSelectButton");
+                fixSelectBtn.clicked += FixSelectBtn_clicked;
+
+                // 可见性按钮
+                _showHiddenBtn = root.Q<Button>("ShowHiddenButton");
+                _showHiddenBtn.clicked += ShowHiddenBtn_clicked;
+                _whiteListVisibleBtn = root.Q<Button>("WhiteListVisibleButton");
+                _whiteListVisibleBtn.clicked += WhiteListVisibleBtn_clicked;
+                _passesVisibleBtn = root.Q<Button>("PassesVisibleButton");
+                _passesVisibleBtn.clicked += PassesVsibleBtn_clicked;
+
+                // 文件导出按钮
+                var exportFilesBtn = root.Q<Button>("ExportFilesButton");
+                exportFilesBtn.clicked += ExportFilesBtn_clicked;
+
+                // 搜索过滤
+                _searchField = root.Q<ToolbarSearchField>("SearchField");
+                _searchField.RegisterValueChangedCallback(OnSearchKeyWordChange);
+
+                // 标题和备注
+                _titleLabel = root.Q<Label>("ReportTitle");
+                _descLabel = root.Q<Label>("ReportDesc");
+
+                // 列表相关
+                _elementTableView = root.Q<TableViewer>("TopTableView");
+                _elementTableView.ClickTableDataEvent = OnClickTableViewItem;
+
+                _lastestOpenFolder = EditorTools.GetProjectPath();
+            }
+            catch (System.Exception e)
+            {
+                Debug.LogError(e.ToString());
+            }
+        }
+        public void OnDestroy()
+        {
+            if (_reportCombiner != null)
+                _reportCombiner.SaveChange();
+        }
+
+        /// <summary>
+        /// 导入单个报告文件
+        /// </summary>
+        public void ImportSingleReprotFile(string filePath)
+        {
+            // 记录本次打开目录
+            _lastestOpenFolder = Path.GetDirectoryName(filePath);
+            _reportCombiner = new ScanReportCombiner();
+
+            try
+            {
+                var scanReport = ScanReportConfig.ImportJsonConfig(filePath);
+                _reportCombiner.Combine(scanReport);
+
+                // 刷新页面
+                RefreshToolbar();
+                FillTableView();
+                RebuildView();
+            }
+            catch (System.Exception e)
+            {
+                _reportCombiner = null;
+                _titleLabel.text = "导入报告失败！";
+                _descLabel.text = e.Message;
+                UnityEngine.Debug.LogError(e.StackTrace);
+            }
+        }
+
+        private void ImportSingleBtn_clicked()
+        {
+            string selectFilePath = EditorUtility.OpenFilePanel("导入报告", _lastestOpenFolder, "json");
+            if (string.IsNullOrEmpty(selectFilePath))
+                return;
+
+            ImportSingleReprotFile(selectFilePath);
+        }
+        private void ImportMultiBtn_clicked()
+        {
+            string selectFolderPath = EditorUtility.OpenFolderPanel("导入报告", _lastestOpenFolder, null);
+            if (string.IsNullOrEmpty(selectFolderPath))
+                return;
+
+            // 记录本次打开目录
+            _lastestOpenFolder = selectFolderPath;
+            _reportCombiner = new ScanReportCombiner();
+
+            try
+            {
+                string[] files = Directory.GetFiles(selectFolderPath);
+                foreach (string filePath in files)
+                {
+                    string extension = System.IO.Path.GetExtension(filePath);
+                    if (extension == ".json")
+                    {
+                        var scanReport = ScanReportConfig.ImportJsonConfig(filePath);
+                        _reportCombiner.Combine(scanReport);
+                    }
+                }
+
+                // 刷新页面
+                RefreshToolbar();
+                FillTableView();
+                RebuildView();
+            }
+            catch (System.Exception e)
+            {
+                _reportCombiner = null;
+                _titleLabel.text = "导入报告失败！";
+                _descLabel.text = e.Message;
+                UnityEngine.Debug.LogError(e.StackTrace);
+            }
+        }
+        private void FixAllBtn_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", "修复全部资源（排除白名单和隐藏元素）", "Yes", "No"))
+            {
+                if (_reportCombiner != null)
+                    _reportCombiner.FixAll();
+            }
+        }
+        private void FixSelectBtn_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", "修复勾选资源（包含白名单和隐藏元素）", "Yes", "No"))
+            {
+                if (_reportCombiner != null)
+                    _reportCombiner.FixSelect();
+            }
+        }
+        private void ShowHiddenBtn_clicked()
+        {
+            _elementVisibleState = !_elementVisibleState;
+            RefreshToolbar();
+            RebuildView();
+        }
+        private void WhiteListVisibleBtn_clicked()
+        {
+            _whiteListVisibleState = !_whiteListVisibleState;
+            RefreshToolbar();
+            RebuildView();
+        }
+        private void PassesVsibleBtn_clicked()
+        {
+            _passesVisibleState = !_passesVisibleState;
+            RefreshToolbar();
+            RebuildView();
+        }
+        private void ExportFilesBtn_clicked()
+        {
+            string selectFolderPath = EditorUtility.OpenFolderPanel("导入所有选中资源", EditorTools.GetProjectPath(), string.Empty);
+            if (string.IsNullOrEmpty(selectFolderPath) == false)
+            {
+                if (_reportCombiner != null)
+                    _reportCombiner.ExportFiles(selectFolderPath);
+            }
+        }
+
+        private void RefreshToolbar()
+        {
+            if (_reportCombiner == null)
+                return;
+
+            _titleLabel.text = _reportCombiner.ReportTitle;
+            _descLabel.text = _reportCombiner.ReportDesc;
+
+            var enableColor = new Color32(18, 100, 18, 255);
+            var disableColor = new Color32(100, 100, 100, 255);
+
+            if (_elementVisibleState)
+                _showHiddenBtn.style.backgroundColor = new StyleColor(enableColor);
+            else
+                _showHiddenBtn.style.backgroundColor = new StyleColor(disableColor);
+
+            if (_whiteListVisibleState)
+                _whiteListVisibleBtn.style.backgroundColor = new StyleColor(enableColor);
+            else
+                _whiteListVisibleBtn.style.backgroundColor = new StyleColor(disableColor);
+
+            if (_passesVisibleState)
+                _passesVisibleBtn.style.backgroundColor = new StyleColor(enableColor);
+            else
+                _passesVisibleBtn.style.backgroundColor = new StyleColor(disableColor);
+        }
+        private void FillTableView()
+        {
+            if (_reportCombiner == null)
+                return;
+
+            _elementTableView.ClearAll(true, true);
+
+            // 眼睛标题
+            {
+                var columnStyle = new ColumnStyle(20);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = false;
+                var column = new TableColumn("眼睛框", string.Empty, columnStyle);
+                column.MakeCell = () =>
+                {
+                    var toggle = new ToggleDisplay();
+                    toggle.text = string.Empty;
+                    toggle.style.unityTextAlign = TextAnchor.MiddleCenter;
+                    toggle.RegisterValueChangedCallback((evt) => { OnDisplayToggleValueChange(toggle, evt); });
+                    return toggle;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var toggle = element as ToggleDisplay;
+                    toggle.userData = data;
+                    var tableData = data as ElementTableData;
+                    toggle.SetValueWithoutNotify(tableData.Element.Hidden);
+                };
+                _elementTableView.AddColumn(column);
+                var headerElement = _elementTableView.GetHeaderElement("眼睛框");
+                headerElement.style.unityTextAlign = TextAnchor.MiddleCenter;
+            }
+
+            // 通过标题
+            {
+                var columnStyle = new ColumnStyle(70);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("通过", "通过", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var button = new Button();
+                    button.text = "通过";
+                    button.style.unityTextAlign = TextAnchor.MiddleCenter;
+                    button.SetEnabled(false);
+                    return button;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    Button button = element as Button;
+                    var elementTableData = data as ElementTableData;
+                    if (elementTableData.Element.Passes)
+                    {
+                        button.style.backgroundColor = new StyleColor(new Color32(56, 147, 58, 255));
+                        button.text = "通过";
+                    }
+                    else
+                    {
+                        button.style.backgroundColor = new StyleColor(new Color32(137, 0, 0, 255));
+                        button.text = "失败";
+                    }
+                };
+                _elementTableView.AddColumn(column);
+                var headerElement = _elementTableView.GetHeaderElement("通过");
+                headerElement.style.unityTextAlign = TextAnchor.MiddleCenter;
+            }
+
+            // 白名单标题
+            {
+                var columnStyle = new ColumnStyle(70);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("白名单", "白名单", columnStyle);
+                column.MakeCell = () =>
+                {
+                    Button button = new Button();
+                    button.text = "白名单";
+                    button.style.unityTextAlign = TextAnchor.MiddleCenter;
+                    button.clickable.clickedWithEventInfo += OnClickWhitListButton;
+                    return button;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    Button button = element as Button;
+                    button.userData = data;
+                    var elementTableData = data as ElementTableData;
+                    if (elementTableData.Element.IsWhiteList)
+                        button.style.backgroundColor = new StyleColor(new Color32(56, 147, 58, 255));
+                    else
+                        button.style.backgroundColor = new StyleColor(new Color32(100, 100, 100, 255));
+                };
+                _elementTableView.AddColumn(column);
+                var headerElement = _elementTableView.GetHeaderElement("白名单");
+                headerElement.style.unityTextAlign = TextAnchor.MiddleCenter;
+            }
+
+            // 选中标题
+            {
+                var columnStyle = new ColumnStyle(20);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = false;
+                var column = new TableColumn("选中框", string.Empty, columnStyle);
+                column.MakeCell = () =>
+                {
+                    var toggle = new Toggle();
+                    toggle.text = string.Empty;
+                    toggle.style.unityTextAlign = TextAnchor.MiddleCenter;
+                    toggle.RegisterValueChangedCallback((evt) => { OnSelectToggleValueChange(toggle, evt); });
+                    return toggle;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var toggle = element as Toggle;
+                    toggle.userData = data;
+                    var tableData = data as ElementTableData;
+                    toggle.SetValueWithoutNotify(tableData.Element.IsSelected);
+                };
+                _elementTableView.AddColumn(column);
+            }
+
+            // 自定义标题栏
+            foreach (var header in _reportCombiner.Headers)
+            {
+                var columnStyle = new ColumnStyle(header.Width, header.MinWidth, header.MaxWidth);
+                columnStyle.Stretchable = header.Stretchable;
+                columnStyle.Searchable = header.Searchable;
+                columnStyle.Sortable = header.Sortable;
+                columnStyle.Counter = header.Counter;
+                columnStyle.Units = header.Units;
+                var column = new TableColumn(header.HeaderTitle, header.HeaderTitle, columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.marginLeft = 3f;
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                };
+                _elementTableView.AddColumn(column);
+            }
+
+            // 填充数据源
+            _sourceDatas = new List<ITableData>(_reportCombiner.Elements.Count);
+            foreach (var element in _reportCombiner.Elements)
+            {
+                var tableData = new ElementTableData();
+                tableData.Element = element;
+
+                // 固定标题
+                tableData.AddButtonCell("眼睛框");
+                tableData.AddCell(new PassesBtnCell("通过", element));
+                tableData.AddCell(new WhiteListBtnCell("白名单", element));
+                tableData.AddButtonCell("选中框");
+
+                // 自定义标题
+                foreach (var scanInfo in element.ScanInfos)
+                {
+                    var header = _reportCombiner.GetHeader(scanInfo.HeaderTitle);
+                    if (header.HeaderType == EHeaderType.AssetPath)
+                    {
+                        tableData.AddAssetPathCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);
+                    }
+                    else if (header.HeaderType == EHeaderType.StringValue)
+                    {
+                        tableData.AddStringValueCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);
+                    }
+                    else if (header.HeaderType == EHeaderType.LongValue)
+                    {
+                        long value = Convert.ToInt64(scanInfo.ScanInfo);
+                        tableData.AddLongValueCell(scanInfo.HeaderTitle, value);
+                    }
+                    else if (header.HeaderType == EHeaderType.DoubleValue)
+                    {
+                        double value = Convert.ToDouble(scanInfo.ScanInfo);
+                        tableData.AddDoubleValueCell(scanInfo.HeaderTitle, value);
+                    }
+                    else
+                    {
+                        throw new NotImplementedException(header.HeaderType.ToString());
+                    }
+                }
+
+                _sourceDatas.Add(tableData);
+            }
+            _elementTableView.itemsSource = _sourceDatas;
+        }
+        private void RebuildView()
+        {
+            if (_reportCombiner == null)
+                return;
+
+            string searchKeyword = _searchField.value;
+
+            // 搜索匹配
+            DefaultSearchSystem.Search(_sourceDatas, searchKeyword);
+
+            // 开关匹配
+            foreach (var tableData in _sourceDatas)
+            {
+                var elementTableData = tableData as ElementTableData;
+                if (_elementVisibleState == false && elementTableData.Element.Hidden)
+                {
+                    tableData.Visible = false;
+                    continue;
+                }
+                if (_passesVisibleState == false && elementTableData.Element.Passes)
+                {
+                    tableData.Visible = false;
+                    continue;
+                }
+                if (_whiteListVisibleState == false && elementTableData.Element.IsWhiteList)
+                {
+                    tableData.Visible = false;
+                    continue;
+                }
+            }
+
+            // 重建视图
+            _elementTableView.RebuildView();
+        }
+
+        private void OnClickTableViewItem(PointerDownEvent evt, ITableData tableData)
+        {
+            // 双击后检视对应的资源
+            if (evt.clickCount == 2)
+            {
+                foreach (var cell in tableData.Cells)
+                {
+                    if (cell is AssetPathCell assetPathCell)
+                    {
+                        if (assetPathCell.PingAssetObject())
+                            break;
+                    }
+                }
+            }
+        }
+        private void OnSearchKeyWordChange(ChangeEvent<string> e)
+        {
+            RebuildView();
+        }
+        private void OnSelectToggleValueChange(Toggle toggle, ChangeEvent<bool> e)
+        {
+            // 处理自身
+            toggle.SetValueWithoutNotify(e.newValue);
+
+            // 记录数据
+            var elementTableData = toggle.userData as ElementTableData;
+            elementTableData.Element.IsSelected = e.newValue;
+
+            // 处理多选目标
+            var selectedItems = _elementTableView.selectedItems;
+            foreach (var selectedItem in selectedItems)
+            {
+                var selectElement = selectedItem as ElementTableData;
+                selectElement.Element.IsSelected = e.newValue;
+            }
+
+            // 重绘视图
+            RebuildView();
+        }
+        private void OnDisplayToggleValueChange(ToggleDisplay toggle, ChangeEvent<bool> e)
+        {
+            // 处理自身
+            toggle.SetValueWithoutNotify(e.newValue);
+
+            // 记录数据
+            var elementTableData = toggle.userData as ElementTableData;
+            elementTableData.Element.Hidden = e.newValue;
+
+            // 处理多选目标
+            var selectedItems = _elementTableView.selectedItems;
+            foreach (var selectedItem in selectedItems)
+            {
+                var selectElement = selectedItem as ElementTableData;
+                if (selectElement != null)
+                    selectElement.Element.Hidden = e.newValue;
+            }
+
+            // 重绘视图
+            RebuildView();
+        }
+        private void OnClickWhitListButton(EventBase evt)
+        {
+            // 刷新点击的按钮
+            Button button = evt.target as Button;
+            var elementTableData = button.userData as ElementTableData;
+            elementTableData.Element.IsWhiteList = !elementTableData.Element.IsWhiteList;
+
+            // 刷新框选的按钮
+            var selectedItems = _elementTableView.selectedItems;
+            if (selectedItems.Count() > 1)
+            {
+                foreach (var selectedItem in selectedItems)
+                {
+                    var selectElement = selectedItem as ElementTableData;
+                    selectElement.Element.IsWhiteList = selectElement.Element.IsWhiteList;
+                }
+            }
+
+            RebuildView();
+        }
+    }
+}
+#endif

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e4a97c06e069c1146a881fcb359f9b4b
+guid: 4048f85b9ff1f424a89a9d6109e6faaf
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.uxml

@@ -0,0 +1,22 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row;">
+        <uie:ToolbarSearchField focusable="true" name="SearchField" style="flex-grow: 1;" />
+        <ui:Button text="Fix Select" display-tooltip-when-elided="true" name="FixSelectButton" style="width: 80px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="Fix All" display-tooltip-when-elided="true" name="FixAllButton" style="width: 80px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="Export Select" display-tooltip-when-elided="true" name="ExportFilesButton" style="width: 100px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text=" Multi-Import" display-tooltip-when-elided="true" name="MultiImportButton" style="width: 100px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="Import" display-tooltip-when-elided="true" name="SingleImportButton" style="width: 100px; background-color: rgb(56, 147, 58);" />
+    </uie:Toolbar>
+    <ui:VisualElement name="PublicContainer" style="background-color: rgb(79, 79, 79); flex-direction: column; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+        <ui:Label text="标题" display-tooltip-when-elided="true" name="ReportTitle" style="height: 16px; -unity-font-style: bold; -unity-text-align: middle-center;" />
+        <ui:Label text="说明" display-tooltip-when-elided="true" name="ReportDesc" style="-unity-text-align: upper-left; -unity-font-style: bold; background-color: rgb(42, 42, 42); min-height: 50px; border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; white-space: normal;" />
+    </ui:VisualElement>
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row;">
+        <ui:Button text="显示隐藏元素" display-tooltip-when-elided="true" name="ShowHiddenButton" style="width: 100px;" />
+        <ui:Button text="显示通过元素" display-tooltip-when-elided="true" name="PassesVisibleButton" style="width: 100px;" />
+        <ui:Button text="显示白名单元素" display-tooltip-when-elided="true" name="WhiteListVisibleButton" style="width: 100px;" />
+    </uie:Toolbar>
+    <ui:VisualElement name="AssetGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
+        <YooAsset.Editor.TableViewer name="TopTableView" />
+    </ui:VisualElement>
+</ui:UXML>

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b87fc70b750616849942173af3bdfd90
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/EHeaderType.cs

@@ -0,0 +1,26 @@
+
+namespace YooAsset.Editor
+{
+    public enum EHeaderType
+    {
+        /// <summary>
+        /// 资源路径
+        /// </summary>
+        AssetPath,
+
+        /// <summary>
+        /// 字符串
+        /// </summary>
+        StringValue,
+
+        /// <summary>
+        /// 整数数值
+        /// </summary>
+        LongValue,
+
+        /// <summary>
+        /// 浮点数数值
+        /// </summary>
+        DoubleValue,
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/EHeaderType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8616c7550a7890141af598898a12df1b
+guid: 97cd7d0d616708e42bc53ed7d88718c9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ReportElement.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+    [Serializable]
+    public class ReportElement
+    {
+        /// <summary>
+        /// GUID（白名单存储对象）
+        /// </summary>
+        public string GUID;
+
+        /// <summary>
+        /// 扫描是否通过
+        /// </summary>
+        public bool Passes = true;
+
+        /// <summary>
+        /// 反馈的信息列表
+        /// </summary>
+        public List<ReportScanInfo> ScanInfos = new List<ReportScanInfo>();
+
+
+        public ReportElement(string guid)
+        {
+            GUID = guid;
+        }
+
+        /// <summary>
+        /// 添加扫描信息
+        /// </summary>
+        public void AddScanInfo(string headerTitle, string value)
+        {
+            var reportScanInfo = new ReportScanInfo(headerTitle, value);
+            ScanInfos.Add(reportScanInfo);
+        }
+
+        /// <summary>
+        /// 添加扫描信息
+        /// </summary>
+        public void AddScanInfo(string headerTitle, long value)
+        {
+            AddScanInfo(headerTitle, value.ToString());
+        }
+
+        /// <summary>
+        /// 添加扫描信息
+        /// </summary>
+        public void AddScanInfo(string headerTitle, double value)
+        {
+            AddScanInfo(headerTitle, value.ToString());
+        }
+
+        /// <summary>
+        /// 获取扫描信息
+        /// </summary>
+        public ReportScanInfo GetScanInfo(string headerTitle)
+        {
+            foreach (var scanInfo in ScanInfos)
+            {
+                if (scanInfo.HeaderTitle == headerTitle)
+                    return scanInfo;
+            }
+
+            UnityEngine.Debug.LogWarning($"Not found {nameof(ReportScanInfo)} : {headerTitle}");
+            return null;
+        }
+
+        #region 临时字段
+        /// <summary>
+        /// 是否在列表里选中
+        /// </summary>
+        public bool IsSelected { set; get; }
+
+        /// <summary>
+        /// 是否在白名单里
+        /// </summary>
+        public bool IsWhiteList { set; get; }
+
+        /// <summary>
+        /// 是否隐藏元素
+        /// </summary>
+        public bool Hidden { set; get; }
+        #endregion
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ReportElement.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d61f7ee1a8215bf438071055f0a9cb09
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ReportHeader.cs

@@ -0,0 +1,148 @@
+using System;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    [Serializable]
+    public class ReportHeader
+    {
+        public const int MaxValue = 8388608;
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string HeaderTitle;
+
+        /// <summary>
+        /// 标题宽度
+        /// </summary>
+        public int Width;
+
+        /// <summary>
+        /// 单元列最小宽度
+        /// </summary>
+        public int MinWidth = 50;
+
+        /// <summary>
+        /// 单元列最大宽度
+        /// </summary>
+        public int MaxWidth = MaxValue;
+
+        /// <summary>
+        /// 可伸缩选项
+        /// </summary>
+        public bool Stretchable = false;
+
+        /// <summary>
+        /// 可搜索选项
+        /// </summary>
+        public bool Searchable = false;
+
+        /// <summary>
+        /// 可排序选项
+        /// </summary>
+        public bool Sortable = false;
+
+        /// <summary>
+        /// 统计数量
+        /// </summary>
+        public bool Counter = false;
+
+        /// <summary>
+        /// 展示单位
+        /// </summary>
+        public string Units = string.Empty;
+
+        /// <summary>
+        /// 数值类型
+        /// </summary>
+        public EHeaderType HeaderType = EHeaderType.StringValue;
+
+
+        public ReportHeader(string headerTitle, int width)
+        {
+            HeaderTitle = headerTitle;
+            Width = width;
+            MinWidth = width;
+            MaxWidth = width;
+        }
+        public ReportHeader(string headerTitle, int width, int minWidth, int maxWidth)
+        {
+            HeaderTitle = headerTitle;
+            Width = width;
+            MinWidth = minWidth;
+            MaxWidth = maxWidth;
+        }
+
+        public ReportHeader SetMinWidth(int value)
+        {
+            MinWidth = value;
+            return this;
+        }
+        public ReportHeader SetMaxWidth(int value)
+        {
+            MaxWidth = value;
+            return this;
+        }
+        public ReportHeader SetStretchable()
+        {
+            Stretchable = true;
+            return this;
+        }
+        public ReportHeader SetSearchable()
+        {
+            Searchable = true;
+            return this;
+        }
+        public ReportHeader SetSortable()
+        {
+            Sortable = true;
+            return this;
+        }
+        public ReportHeader SetCounter()
+        {
+            Counter = true;
+            return this;
+        }
+        public ReportHeader SetUnits(string units)
+        {
+            Units = units;
+            return this;
+        }
+        public ReportHeader SetHeaderType(EHeaderType value)
+        {
+            HeaderType = value;
+            return this;
+        }
+
+        /// <summary>
+        /// 检测数值有效性
+        /// </summary>
+        public void CheckValueValid(string value)
+        {
+            if (HeaderType == EHeaderType.AssetPath)
+            {
+                string guid = AssetDatabase.AssetPathToGUID(value);
+                if (string.IsNullOrEmpty(guid))
+                    throw new Exception($"{HeaderTitle} value is invalid asset path : {value}");
+            }
+            else if (HeaderType == EHeaderType.DoubleValue)
+            {
+                if (double.TryParse(value, out double doubleValue) == false)
+                    throw new Exception($"{HeaderTitle} value is invalid double value : {value}");
+            }
+            else if (HeaderType == EHeaderType.LongValue)
+            {
+                if (long.TryParse(value, out long longValue) == false)
+                    throw new Exception($"{HeaderTitle} value is invalid long value : {value}");
+            }
+            else if (HeaderType == EHeaderType.StringValue)
+            {
+            }
+            else
+            {
+                throw new System.NotImplementedException(HeaderType.ToString());
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ReportHeader.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3be8b45a77bb720478379c26da3aa68a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ReportScanInfo.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+    [Serializable]
+    public class ReportScanInfo
+    {
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string HeaderTitle;
+
+        /// <summary>
+        /// 扫描反馈的信息
+        /// </summary>
+        public string ScanInfo;
+
+        public ReportScanInfo(string headerTitle, string scanInfo)
+        {
+            HeaderTitle = headerTitle;
+            ScanInfo = scanInfo;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ReportScanInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 02caa7ae84ee8294a8904a5aaed420ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ScanReport.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+    [Serializable]
+    public class ScanReport
+    {
+        /// <summary>
+        /// 文件签名（自动填写）
+        /// </summary>
+        public string FileSign;
+
+        /// <summary>
+        /// 文件版本（自动填写）
+        /// </summary>
+        public string FileVersion;
+
+        /// <summary>
+        /// 模式类型（自动填写）
+        /// </summary>
+        public string SchemaType;
+
+        /// <summary>
+        /// 扫描器GUID（自动填写）
+        /// </summary>
+        public string ScannerGUID;
+
+
+        /// <summary>
+        /// 报告名称
+        /// </summary>
+        public string ReportName;
+
+        /// <summary>
+        /// 报告介绍
+        /// </summary>
+        public string ReportDesc;
+
+        /// <summary>
+        /// 报告的标题列表
+        /// </summary>
+        public List<ReportHeader> ReportHeaders = new List<ReportHeader>();
+
+        /// <summary>
+        /// 扫描的元素列表
+        /// </summary>
+        public List<ReportElement> ReportElements = new List<ReportElement>();
+
+
+        public ScanReport(string reportName, string reportDesc)
+        {
+            ReportName = reportName;
+            ReportDesc = reportDesc;
+        }
+
+        /// <summary>
+        /// 添加标题
+        /// </summary>
+        public ReportHeader AddHeader(string headerTitle, int width)
+        {
+            var reportHeader = new ReportHeader(headerTitle, width);
+            ReportHeaders.Add(reportHeader);
+            return reportHeader;
+        }
+
+        /// <summary>
+        /// 添加标题
+        /// </summary>
+        public ReportHeader AddHeader(string headerTitle, int width, int minWidth, int maxWidth)
+        {
+            var reportHeader = new ReportHeader(headerTitle, width, minWidth, maxWidth);
+            ReportHeaders.Add(reportHeader);
+            return reportHeader;
+        }
+
+        /// <summary>
+        /// 检测错误
+        /// </summary>
+        public void CheckError()
+        {
+            // 检测标题
+            Dictionary<string, ReportHeader> headerMap = new Dictionary<string, ReportHeader>();
+            foreach (var header in ReportHeaders)
+            {
+                string headerTitle = header.HeaderTitle;
+                if (headerMap.ContainsKey(headerTitle))
+                    throw new Exception($"The header title {headerTitle} already exists !");
+                else
+                    headerMap.Add(headerTitle, header);
+            }
+
+            // 检测扫描元素
+            HashSet<string> elementMap = new HashSet<string>();
+            foreach (var element in ReportElements)
+            {
+                if (string.IsNullOrEmpty(element.GUID))
+                    throw new Exception($"The report element GUID is null or empty !");
+
+                if (elementMap.Contains(element.GUID))
+                    throw new Exception($"The report element GUID already exists ! {element.GUID}");
+                else
+                    elementMap.Add(element.GUID);
+
+                foreach (var scanInfo in element.ScanInfos)
+                {
+                    if (headerMap.ContainsKey(scanInfo.HeaderTitle) == false)
+                        throw new Exception($"The report element header {scanInfo.HeaderTitle} is missing !");
+
+                    // 检测数值有效性
+                    var header = headerMap[scanInfo.HeaderTitle];
+                    header.CheckValueValid(scanInfo.ScanInfo);
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ScanReport.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 650e3e4af4ede2a4eb2471c30e7820bb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ScanReportCombiner.cs

@@ -0,0 +1,221 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    /// <summary>
+    /// 资源扫描报告合并器
+    /// 说明：相同类型的报告可以合并查看
+    /// </summary>
+    public class ScanReportCombiner
+    {
+        /// <summary>
+        /// 模式类型
+        /// </summary>
+        public string SchemaType { private set; get; }
+
+        /// <summary>
+        /// 报告标题
+        /// </summary>
+        public string ReportTitle { private set; get; }
+
+        /// <summary>
+        /// 报告介绍
+        /// </summary>
+        public string ReportDesc { private set; get; }
+
+        /// <summary>
+        /// 标题列表
+        /// </summary>
+        public List<ReportHeader> Headers = new List<ReportHeader>();
+
+        /// <summary>
+        /// 扫描结果
+        /// </summary>
+        public readonly List<ReportElement> Elements = new List<ReportElement>(10000);
+        private readonly Dictionary<string, ScanReport> _combines = new Dictionary<string, ScanReport>(100);
+
+
+        /// <summary>
+        /// 合并报告文件
+        /// 注意：模式不同的报告文件会合并失败！
+        /// </summary>
+        public bool Combine(ScanReport scanReport)
+        {
+            if (string.IsNullOrEmpty(scanReport.SchemaType))
+            {
+                Debug.LogError("Scan report schema type is null or empty !");
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(SchemaType))
+            {
+                SchemaType = scanReport.SchemaType;
+                ReportTitle = scanReport.ReportName;
+                ReportDesc = scanReport.ReportDesc;
+                Headers = scanReport.ReportHeaders;
+            }
+
+            if (SchemaType != scanReport.SchemaType)
+            {
+                Debug.LogWarning($"Scan report has different schema type！{scanReport.SchemaType} != {SchemaType}");
+                return false;
+            }
+
+            if (_combines.ContainsKey(scanReport.ScannerGUID))
+            {
+                Debug.LogWarning($"Scan report has already existed : {scanReport.ScannerGUID}");
+                return false;
+            }
+
+            _combines.Add(scanReport.ScannerGUID, scanReport);
+            CombineInternal(scanReport);
+            return true;
+        }
+        private void CombineInternal(ScanReport scanReport)
+        {
+            string scannerGUID = scanReport.ScannerGUID;
+            List<ReportElement> elements = scanReport.ReportElements;
+
+            // 设置白名单
+            var scanner = AssetArtScannerSettingData.Setting.GetScanner(scannerGUID);
+            if (scanner != null)
+            {
+                foreach (var element in elements)
+                {
+                    if (scanner.CheckWhiteList(element.GUID))
+                        element.IsWhiteList = true;
+                }
+            }
+
+            // 添加到集合
+            Elements.AddRange(elements);
+        }
+
+        /// <summary>
+        /// 获取指定的标题类
+        /// </summary>
+        public ReportHeader GetHeader(string headerTitle)
+        {
+            foreach (var header in Headers)
+            {
+                if (header.HeaderTitle == headerTitle)
+                    return header;
+            }
+
+            UnityEngine.Debug.LogWarning($"Not found {nameof(ReportHeader)} : {headerTitle}");
+            return null;
+        }
+
+        /// <summary>
+        /// 导出选中文件
+        /// </summary>
+        public void ExportFiles(string exportFolderPath)
+        {
+            if (string.IsNullOrEmpty(exportFolderPath))
+                return;
+
+            foreach (var element in Elements)
+            {
+                if (element.IsSelected)
+                {
+                    string assetPath = AssetDatabase.GUIDToAssetPath(element.GUID);
+                    if (string.IsNullOrEmpty(assetPath) == false)
+                    {
+                        string destPath = Path.Combine(exportFolderPath, assetPath);
+                        EditorTools.CopyFile(assetPath, destPath, true);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存改变数据
+        /// </summary>
+        public void SaveChange()
+        {
+            // 存储白名单
+            foreach (var scanReport in _combines.Values)
+            {
+                string scannerGUID = scanReport.ScannerGUID;
+                var elements = scanReport.ReportElements;
+
+                var scanner = AssetArtScannerSettingData.Setting.GetScanner(scannerGUID);
+                if (scanner != null)
+                {
+                    List<string> whiteList = new List<string>(elements.Count);
+                    foreach (var element in elements)
+                    {
+                        if (element.IsWhiteList)
+                            whiteList.Add(element.GUID);
+                    }
+                    whiteList.Sort();
+                    scanner.WhiteList = whiteList;
+                    AssetArtScannerSettingData.SaveFile();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 修复所有元素
+        /// 注意：排除白名单和隐藏元素
+        /// </summary>
+        public void FixAll()
+        {
+            foreach (var scanReport in _combines.Values)
+            {
+                string scannerGUID = scanReport.ScannerGUID;
+                var elements = scanReport.ReportElements;
+
+                List<ReportElement> fixList = new List<ReportElement>(elements.Count);
+                foreach (var element in elements)
+                {
+                    if (element.Passes || element.IsWhiteList || element.Hidden)
+                        continue;
+                    fixList.Add(element);
+                }
+                FixInternal(scannerGUID, fixList);
+            }
+        }
+
+        /// <summary>
+        /// 修复选定元素
+        /// 注意：包含白名单和隐藏元素
+        /// </summary>
+        public void FixSelect()
+        {
+            foreach (var scanReport in _combines.Values)
+            {
+                string scannerGUID = scanReport.ScannerGUID;
+                var elements = scanReport.ReportElements;
+
+                List<ReportElement> fixList = new List<ReportElement>(elements.Count);
+                foreach (var element in elements)
+                {
+                    if (element.Passes)
+                        continue;
+                    if (element.IsSelected)
+                        fixList.Add(element);
+                }
+                FixInternal(scannerGUID, fixList);
+            }
+        }
+
+        private void FixInternal(string scannerGUID, List<ReportElement> fixList)
+        {
+            AssetArtScanner scanner = AssetArtScannerSettingData.Setting.GetScanner(scannerGUID);
+            if (scanner != null)
+            {
+                var schema = scanner.LoadSchema();
+                if (schema != null)
+                {
+                    schema.FixResult(fixList);
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ScanReportCombiner.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8524c3deb9b27fe4e8e63f15b9ffaaa3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ScanReportConfig.cs

@@ -0,0 +1,54 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class ScanReportConfig
+    {
+        /// <summary>
+        /// 导入JSON报告文件
+        /// </summary>
+        public static ScanReport ImportJsonConfig(string filePath)
+        {
+            if (File.Exists(filePath) == false)
+                throw new FileNotFoundException(filePath);
+
+            string jsonData = FileUtility.ReadAllText(filePath);
+            ScanReport report = JsonUtility.FromJson<ScanReport>(jsonData);
+
+            // 检测配置文件的签名
+            if (report.FileSign != ScannerDefine.ReportFileSign)
+                throw new Exception($"导入的报告文件无法识别 : {filePath}");
+
+            // 检测报告文件的版本
+            if (report.FileVersion != ScannerDefine.ReportFileVersion)
+                throw new Exception($"报告文件的版本不匹配 : {report.FileVersion} != {ScannerDefine.ReportFileVersion}");
+
+            // 检测标题数和内容是否匹配
+            foreach (var element in report.ReportElements)
+            {
+                if (element.ScanInfos.Count != report.ReportHeaders.Count)
+                {
+                    throw new Exception($"报告的标题数和内容不匹配！");
+                }
+            }
+
+            return report;
+        }
+
+        /// <summary>
+        /// 导出JSON报告文件
+        /// </summary>
+        public static void ExportJsonConfig(string savePath, ScanReport scanReport)
+        {
+            if (File.Exists(savePath))
+                File.Delete(savePath);
+
+            string json = JsonUtility.ToJson(scanReport, true);
+            FileUtility.WriteAllText(savePath, json);
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtReporter/ScanReportConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 694cf47ade54f2b4fa6e618c1310c476
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 96a75a20111d6124696665e7aac3564c
+guid: 9bc1ecc3b72dfc34782fb6926d679f92
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtCollector.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace YooAsset.Editor
+{
+    [Serializable]
+    public class AssetArtCollector
+    {
+        /// <summary>
+        /// 扫描目录
+        /// </summary>
+        public string CollectPath = string.Empty;
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtCollector.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6e7252b59455e5c45af0041ccd24b234
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScanner.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    [Serializable]
+    public class AssetArtScanner
+    {
+        /// <summary>
+        /// 扫描器GUID
+        /// </summary>
+        public string ScannerGUID = string.Empty;
+
+        /// <summary>
+        /// 扫描器名称
+        /// </summary>
+        public string ScannerName = string.Empty;
+
+        /// <summary>
+        /// 扫描器描述
+        /// </summary>
+        public string ScannerDesc = string.Empty;
+
+        /// <summary>
+        /// 扫描模式
+        /// 注意：文件路径或文件GUID
+        /// </summary>
+        public string ScannerSchema = string.Empty;
+
+        /// <summary>
+        /// 存储目录
+        /// </summary>
+        public string SaveDirectory = string.Empty;
+
+        /// <summary>
+        /// 收集列表
+        /// </summary>
+        public List<AssetArtCollector> Collectors = new List<AssetArtCollector>();
+
+        /// <summary>
+        /// 白名单
+        /// </summary>
+        public List<string> WhiteList = new List<string>();
+
+
+        /// <summary>
+        /// 检测关键字匹配
+        /// </summary>
+        public bool CheckKeyword(string keyword)
+        {
+            if (ScannerName.Contains(keyword) || ScannerDesc.Contains(keyword))
+                return true;
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 是否在白名单里
+        /// </summary>
+        public bool CheckWhiteList(string guid)
+        {
+            return WhiteList.Contains(guid);
+        }
+
+        /// <summary>
+        /// 检测配置错误
+        /// </summary>
+        public void CheckConfigError()
+        {
+            if (string.IsNullOrEmpty(ScannerName))
+                throw new Exception($"Scanner name is null or empty !");
+
+            if (string.IsNullOrEmpty(ScannerSchema))
+                throw new Exception($"Scanner {ScannerName} schema is null !");
+
+            if (string.IsNullOrEmpty(SaveDirectory) == false)
+            {
+                if (Directory.Exists(SaveDirectory) == false)
+                    throw new Exception($"Scanner  {ScannerName} save directory is invalid : {SaveDirectory}");
+            }
+        }
+
+        /// <summary>
+        /// 加载扫描模式实例
+        /// </summary>
+        public ScannerSchema LoadSchema()
+        {
+            if (string.IsNullOrEmpty(ScannerSchema))
+                return null;
+
+            string filePath;
+            if (ScannerSchema.StartsWith("Assets/"))
+            {
+                filePath = ScannerSchema;
+            }
+            else
+            {
+                string guid = ScannerSchema;
+                filePath = AssetDatabase.GUIDToAssetPath(guid);
+            }
+
+            var schema = AssetDatabase.LoadMainAssetAtPath(filePath) as ScannerSchema;
+            if (schema == null)
+                Debug.LogWarning($"Failed load scanner schema : {filePath}");
+            return schema;
+        }
+
+        /// <summary>
+        /// 运行扫描器生成报告类
+        /// </summary>
+        public ScanReport RunScanner()
+        {
+            if (Collectors.Count == 0)
+                Debug.LogWarning($"Scanner {ScannerName} collector is empty !");
+
+            ScannerSchema schema = LoadSchema();
+            if (schema == null)
+                throw new Exception($"Failed to load schema : {ScannerSchema}");
+
+            var report = schema.RunScanner(this);
+            report.FileSign = ScannerDefine.ReportFileSign;
+            report.FileVersion = ScannerDefine.ReportFileVersion;
+            report.SchemaType = schema.GetType().FullName;
+            report.ScannerGUID = ScannerGUID;
+            return report;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScanner.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c63683b07b7a2454b93539ae6b9f32ea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerConfig.cs

@@ -0,0 +1,85 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class AssetArtScannerConfig
+    {
+        public class ConfigWrapper
+        {
+            /// <summary>
+            /// 文件签名
+            /// </summary>
+            public string FileSign;
+
+            /// <summary>
+            /// 文件版本
+            /// </summary>
+            public string FileVersion;
+
+            /// <summary>
+            /// 扫描器列表
+            /// </summary>
+            public List<AssetArtScanner> Scanners = new List<AssetArtScanner>();
+        }
+
+        /// <summary>
+        /// 导入JSON配置文件
+        /// </summary>
+        public static void ImportJsonConfig(string filePath)
+        {
+            if (File.Exists(filePath) == false)
+                throw new FileNotFoundException(filePath);
+
+            string json = FileUtility.ReadAllText(filePath);
+            ConfigWrapper setting = JsonUtility.FromJson<ConfigWrapper>(json);
+
+            // 检测配置文件的签名
+            if (setting.FileSign != ScannerDefine.SettingFileSign)
+                throw new Exception($"导入的配置文件无法识别 : {filePath}");
+
+            // 检测配置文件的版本
+            if (setting.FileVersion != ScannerDefine.SettingFileVersion)
+                throw new Exception($"配置文件的版本不匹配 : {setting.FileVersion} != {ScannerDefine.SettingFileVersion}");
+
+            // 检测配置合法性
+            HashSet<string> scanGUIDs = new HashSet<string>();
+            foreach (var sacnner in setting.Scanners)
+            {
+                if (scanGUIDs.Contains(sacnner.ScannerGUID))
+                {
+                    throw new Exception($"Scanner {sacnner.ScannerName} GUID is existed : {sacnner.ScannerGUID} ");
+                }
+                else
+                {
+                    scanGUIDs.Add(sacnner.ScannerGUID);
+                }
+            }
+
+            AssetArtScannerSettingData.Setting.Scanners = setting.Scanners;
+            AssetArtScannerSettingData.SaveFile();
+        }
+
+        /// <summary>
+        /// 导出JSON配置文件
+        /// </summary>
+        public static void ExportJsonConfig(string savePath)
+        {
+            if (File.Exists(savePath))
+                File.Delete(savePath);
+
+            ConfigWrapper wrapper = new ConfigWrapper();
+            wrapper.FileSign = ScannerDefine.SettingFileSign;
+            wrapper.FileVersion = ScannerDefine.SettingFileVersion;
+            wrapper.Scanners = AssetArtScannerSettingData.Setting.Scanners;
+
+            string json = JsonUtility.ToJson(wrapper, true);
+            FileUtility.WriteAllText(savePath, json);
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bed1ef72d1c03e848a41d5ea115e9870
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using UnityEngine;
+using NUnit.Framework.Constraints;
+
+namespace YooAsset.Editor
+{
+    public class AssetArtScannerSetting : ScriptableObject
+    {
+        /// <summary>
+        /// 扫描器列表
+        /// </summary>
+        public List<AssetArtScanner> Scanners = new List<AssetArtScanner>();
+
+        /// <summary>
+        /// 开始扫描
+        /// </summary>
+        public ScannerResult BeginScan(string scannerGUID)
+        {
+            try
+            {
+                // 获取扫描器配置
+                var scanner = GetScanner(scannerGUID);
+                if (scanner == null)
+                    throw new Exception($"Invalid scanner GUID : {scannerGUID}");
+
+                // 检测配置合法性
+                scanner.CheckConfigError();
+
+                // 开始扫描工作
+                ScanReport report = scanner.RunScanner();
+
+                // 检测报告合法性
+                report.CheckError();
+
+                // 保存扫描结果
+                string saveDirectory = scanner.SaveDirectory;
+                if (string.IsNullOrEmpty(saveDirectory))
+                    saveDirectory = "Assets/";
+                string filePath = $"{saveDirectory}/{scanner.ScannerName}_{scanner.ScannerDesc}.json";
+                ScanReportConfig.ExportJsonConfig(filePath, report);
+                return new ScannerResult(filePath, report);
+            }
+            catch (Exception e)
+            {
+                return new ScannerResult(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 获取指定的扫描器
+        /// </summary>
+        public AssetArtScanner GetScanner(string scannerGUID)
+        {
+            foreach (var scanner in Scanners)
+            {
+                if (scanner.ScannerGUID == scannerGUID)
+                    return scanner;
+            }
+
+            Debug.LogWarning($"Not found scanner : {scannerGUID}");
+            return null;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 84df5e62e3f1b6746a1263e076b003e1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerSettingData.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class AssetArtScannerSettingData
+    {
+        /// <summary>
+        /// 配置数据是否被修改
+        /// </summary>
+        public static bool IsDirty { private set; get; } = false;
+
+
+        static AssetArtScannerSettingData()
+        {
+        }
+
+        private static AssetArtScannerSetting _setting = null;
+        public static AssetArtScannerSetting Setting
+        {
+            get
+            {
+                if (_setting == null)
+                    _setting = SettingLoader.LoadSettingData<AssetArtScannerSetting>();
+                return _setting;
+            }
+        }
+
+        /// <summary>
+        /// 存储配置文件
+        /// </summary>
+        public static void SaveFile()
+        {
+            if (Setting != null)
+            {
+                IsDirty = false;
+                EditorUtility.SetDirty(Setting);
+                AssetDatabase.SaveAssets();
+                Debug.Log($"{nameof(AssetArtScannerSetting)}.asset is saved!");
+            }
+        }
+
+        /// <summary>
+        /// 清空所有数据
+        /// </summary>
+        public static void ClearAll()
+        {
+            Setting.Scanners.Clear();
+            SaveFile();
+        }
+
+        /// <summary>
+        /// 扫描所有项
+        /// </summary>
+        public static void ScanAll()
+        {
+            foreach (var scanner in Setting.Scanners)
+            {
+                var scanResult = Setting.BeginScan(scanner.ScannerGUID);
+                if (scanResult.Succeed == false)
+                {
+                    Debug.LogError($"{scanner.ScannerName} failed : {scanResult.ErrorInfo}");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 扫描所有项
+        /// </summary>
+        public static void ScanAll(string keyword)
+        {
+            foreach (var scanner in Setting.Scanners)
+            {
+                if (string.IsNullOrEmpty(keyword) == false)
+                {
+                    if (scanner.CheckKeyword(keyword) == false)
+                        continue;
+                }
+
+                var scanResult = Setting.BeginScan(scanner.ScannerGUID);
+                if (scanResult.Succeed == false)
+                {
+                    Debug.LogError($"{scanner.ScannerName} failed : {scanResult.ErrorInfo}");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 扫描单项
+        /// </summary>
+        public static ScannerResult Scan(string scannerGUID)
+        {
+            var scanResult = Setting.BeginScan(scannerGUID);
+            if (scanResult.Succeed == false)
+            {
+                Debug.LogError(scanResult.ErrorInfo);
+            }
+            return scanResult;
+        }
+
+        // 扫描器编辑相关
+        public static AssetArtScanner CreateScanner(string name, string desc)
+        {
+            AssetArtScanner scanner = new AssetArtScanner();
+            scanner.ScannerGUID = System.Guid.NewGuid().ToString();
+            scanner.ScannerName = name;
+            scanner.ScannerDesc = desc;
+            Setting.Scanners.Add(scanner);
+            IsDirty = true;
+            return scanner;
+        }
+        public static void RemoveScanner(AssetArtScanner scanner)
+        {
+            if (Setting.Scanners.Remove(scanner))
+            {
+                IsDirty = true;
+            }
+            else
+            {
+                Debug.LogWarning($"Failed remove scanner : {scanner.ScannerName}");
+            }
+        }
+        public static void ModifyScanner(AssetArtScanner scanner)
+        {
+            if (scanner != null)
+            {
+                IsDirty = true;
+            }
+        }
+
+        // 资源收集编辑相关
+        public static void CreateCollector(AssetArtScanner scanner, AssetArtCollector collector)
+        {
+            scanner.Collectors.Add(collector);
+            IsDirty = true;
+        }
+        public static void RemoveCollector(AssetArtScanner scanner, AssetArtCollector collector)
+        {
+            if (scanner.Collectors.Remove(collector))
+            {
+                IsDirty = true;
+            }
+            else
+            {
+                Debug.LogWarning($"Failed remove collector : {collector.CollectPath}");
+            }
+        }
+        public static void ModifyCollector(AssetArtScanner scanner, AssetArtCollector collector)
+        {
+            if (scanner != null && collector != null)
+            {
+                IsDirty = true;
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerSettingData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fda10f23f6f36bf498b54323fe4f680b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

@@ -0,0 +1,544 @@
+#if UNITY_2019_4_OR_NEWER
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    public class AssetArtScannerWindow : EditorWindow
+    {
+        [MenuItem("YooAsset/AssetArt Scanner", false, 301)]
+        public static void OpenWindow()
+        {
+            AssetArtScannerWindow window = GetWindow<AssetArtScannerWindow>("AssetArt Scanner", true, WindowsDefine.DockedWindowTypes);
+            window.minSize = new Vector2(800, 600);
+        }
+
+        private Button _saveButton;
+        private ListView _scannerListView;
+        private ToolbarSearchField _scannerSearchField;
+        private VisualElement _scannerContentContainer;
+        private VisualElement _inspectorContainer;
+        private Label _schemaGuideTxt;
+        private TextField _scannerNameTxt;
+        private TextField _scannerDescTxt;
+        private ObjectField _scannerSchemaField;
+        private ObjectField _outputFolderField;
+        private ScrollView _collectorScrollView;
+
+        private int _lastModifyScannerIndex = 0;
+
+
+        public void CreateGUI()
+        {
+            Undo.undoRedoPerformed -= RefreshWindow;
+            Undo.undoRedoPerformed += RefreshWindow;
+
+            try
+            {
+                VisualElement root = this.rootVisualElement;
+
+                // 加载布局文件
+                var visualAsset = UxmlLoader.LoadWindowUXML<AssetArtScannerWindow>();
+                if (visualAsset == null)
+                    return;
+
+                visualAsset.CloneTree(root);
+
+                // 导入导出按钮
+                var exportBtn = root.Q<Button>("ExportButton");
+                exportBtn.clicked += ExportBtn_clicked;
+                var importBtn = root.Q<Button>("ImportButton");
+                importBtn.clicked += ImportBtn_clicked;
+
+                // 配置保存按钮
+                _saveButton = root.Q<Button>("SaveButton");
+                _saveButton.clicked += SaveBtn_clicked;
+
+                // 扫描按钮
+                var scanAllBtn = root.Q<Button>("ScanAllButton");
+                scanAllBtn.clicked += ScanAllBtn_clicked;
+                var scanBtn = root.Q<Button>("ScanBtn");
+                scanBtn.clicked += ScanBtn_clicked;
+
+                // 扫描列表相关
+                _scannerListView = root.Q<ListView>("ScannerListView");
+                _scannerListView.makeItem = MakeScannerListViewItem;
+                _scannerListView.bindItem = BindScannerListViewItem;
+#if UNITY_2022_3_OR_NEWER
+                _scannerListView.selectionChanged += ScannerListView_onSelectionChange;
+#elif  UNITY_2020_1_OR_NEWER
+                _scannerListView.onSelectionChange += ScannerListView_onSelectionChange;
+#else
+                _scannerListView.onSelectionChanged += ScannerListView_onSelectionChange;
+#endif
+
+                // 扫描列表过滤
+                _scannerSearchField = root.Q<ToolbarSearchField>("ScannerSearchField");
+                _scannerSearchField.RegisterValueChangedCallback(OnSearchKeyWordChange);
+
+                // 扫描器添加删除按钮
+                var scannerAddContainer = root.Q("ScannerAddContainer");
+                {
+                    var addBtn = scannerAddContainer.Q<Button>("AddBtn");
+                    addBtn.clicked += AddScannerBtn_clicked;
+                    var removeBtn = scannerAddContainer.Q<Button>("RemoveBtn");
+                    removeBtn.clicked += RemoveScannerBtn_clicked;
+                }
+
+                // 扫描器容器
+                _scannerContentContainer = root.Q("ScannerContentContainer");
+
+                // 检视界面容器
+                _inspectorContainer = root.Q("InspectorContainer");
+
+                // 扫描器指南
+                _schemaGuideTxt = root.Q<Label>("SchemaUserGuide");
+
+                // 扫描器名称
+                _scannerNameTxt = root.Q<TextField>("ScannerName");
+                _scannerNameTxt.RegisterValueChangedCallback(evt =>
+                {
+                    var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+                    if (selectScanner != null)
+                    {
+                        selectScanner.ScannerName = evt.newValue;
+                        AssetArtScannerSettingData.ModifyScanner(selectScanner);
+                        FillScannerListViewData();
+                    }
+                });
+
+                // 扫描器备注
+                _scannerDescTxt = root.Q<TextField>("ScannerDesc");
+                _scannerDescTxt.RegisterValueChangedCallback(evt =>
+                {
+                    var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+                    if (selectScanner != null)
+                    {
+                        selectScanner.ScannerDesc = evt.newValue;
+                        AssetArtScannerSettingData.ModifyScanner(selectScanner);
+                        FillScannerListViewData();
+                    }
+                });
+
+                // 扫描模式
+                _scannerSchemaField = root.Q<ObjectField>("ScanSchema");
+                _scannerSchemaField.RegisterValueChangedCallback(evt =>
+                {
+                    var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+                    if (selectScanner != null)
+                    {
+                        string assetPath = AssetDatabase.GetAssetPath(evt.newValue);
+                        selectScanner.ScannerSchema = AssetDatabase.AssetPathToGUID(assetPath);
+                        AssetArtScannerSettingData.ModifyScanner(selectScanner);
+                    }
+                });
+
+                // 存储目录
+                _outputFolderField = root.Q<ObjectField>("OutputFolder");
+                _outputFolderField.RegisterValueChangedCallback(evt =>
+                {
+                    var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+                    if (selectScanner != null)
+                    {
+                        if (evt.newValue == null)
+                        {
+                            selectScanner.SaveDirectory = string.Empty;
+                            AssetArtScannerSettingData.ModifyScanner(selectScanner);
+                        }
+                        else
+                        {
+                            string assetPath = AssetDatabase.GetAssetPath(evt.newValue);
+                            if (AssetDatabase.IsValidFolder(assetPath))
+                            {
+                                selectScanner.SaveDirectory = assetPath;
+                                AssetArtScannerSettingData.ModifyScanner(selectScanner);
+                            }
+                            else
+                            {
+                                Debug.LogWarning($"Select asset object not folder ! {assetPath}");
+                            }
+                        }
+                    }
+                });
+
+                // 收集列表相关
+                _collectorScrollView = root.Q<ScrollView>("CollectorScrollView");
+                _collectorScrollView.style.height = new Length(100, LengthUnit.Percent);
+                _collectorScrollView.viewDataKey = "scrollView";
+
+                // 收集器创建按钮
+                var collectorAddContainer = root.Q("CollectorAddContainer");
+                {
+                    var addBtn = collectorAddContainer.Q<Button>("AddBtn");
+                    addBtn.clicked += AddCollectorBtn_clicked;
+                }
+
+                // 刷新窗体
+                RefreshWindow();
+            }
+            catch (System.Exception e)
+            {
+                Debug.LogError(e.ToString());
+            }
+        }
+        public void OnDestroy()
+        {
+            // 注意：清空所有撤销操作
+            Undo.ClearAll();
+
+            if (AssetArtScannerSettingData.IsDirty)
+                AssetArtScannerSettingData.SaveFile();
+        }
+        public void Update()
+        {
+            if (_saveButton != null)
+            {
+                if (AssetArtScannerSettingData.IsDirty)
+                {
+                    if (_saveButton.enabledSelf == false)
+                        _saveButton.SetEnabled(true);
+                }
+                else
+                {
+                    if (_saveButton.enabledSelf)
+                        _saveButton.SetEnabled(false);
+                }
+            }
+        }
+
+        private void RefreshWindow()
+        {
+            _scannerContentContainer.visible = false;
+
+            FillScannerListViewData();
+        }
+        private void ExportBtn_clicked()
+        {
+            string resultPath = EditorTools.OpenFolderPanel("Export JSON", "Assets/");
+            if (resultPath != null)
+            {
+                AssetArtScannerConfig.ExportJsonConfig($"{resultPath}/AssetArtScannerConfig.json");
+            }
+        }
+        private void ImportBtn_clicked()
+        {
+            string resultPath = EditorTools.OpenFilePath("Import JSON", "Assets/", "json");
+            if (resultPath != null)
+            {
+                AssetArtScannerConfig.ImportJsonConfig(resultPath);
+                RefreshWindow();
+            }
+        }
+        private void SaveBtn_clicked()
+        {
+            AssetArtScannerSettingData.SaveFile();
+        }
+        private void ScanAllBtn_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", $"开始全面扫描！", "Yes", "No"))
+            {
+                string searchKeyWord = _scannerSearchField.value;
+                AssetArtScannerSettingData.ScanAll(searchKeyWord);
+                AssetDatabase.Refresh();
+            }
+            else
+            {
+                Debug.LogWarning("全面扫描已经取消");
+            }
+        }
+        private void ScanBtn_clicked()
+        {
+            var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectScanner == null)
+                return;
+
+            ScannerResult scannerResult = AssetArtScannerSettingData.Scan(selectScanner.ScannerGUID);
+            if (scannerResult.Succeed)
+            {
+                // 自动打开报告界面
+                scannerResult.OpenReportWindow();
+                AssetDatabase.Refresh();
+            }
+        }
+        private void OnSearchKeyWordChange(ChangeEvent<string> e)
+        {
+            _lastModifyScannerIndex = 0;
+            RefreshWindow();
+        }
+
+        // 分组列表相关
+        private void FillScannerListViewData()
+        {
+            _scannerListView.Clear();
+            _scannerListView.ClearSelection();
+
+            var filterItems = FilterScanners();
+            if (AssetArtScannerSettingData.Setting.Scanners.Count == filterItems.Count)
+            {
+#if UNITY_2020_3_OR_NEWER
+                _scannerListView.reorderable = true;
+#endif
+                _scannerListView.itemsSource = AssetArtScannerSettingData.Setting.Scanners;
+                _scannerListView.Rebuild();
+            }
+            else
+            {
+#if UNITY_2020_3_OR_NEWER
+                _scannerListView.reorderable = false;
+#endif
+                _scannerListView.itemsSource = filterItems;
+                _scannerListView.Rebuild();
+            }
+        }
+        private List<AssetArtScanner> FilterScanners()
+        {
+            string searchKeyWord = _scannerSearchField.value;
+            List<AssetArtScanner> result = new List<AssetArtScanner>(AssetArtScannerSettingData.Setting.Scanners.Count);
+
+            // 过滤列表
+            foreach (var scanner in AssetArtScannerSettingData.Setting.Scanners)
+            {
+                if (string.IsNullOrEmpty(searchKeyWord) == false)
+                {
+                    if (scanner.CheckKeyword(searchKeyWord) == false)
+                        continue;
+                }
+                result.Add(scanner);
+            }
+
+            return result;
+        }
+        private VisualElement MakeScannerListViewItem()
+        {
+            VisualElement element = new VisualElement();
+
+            {
+                var label = new Label();
+                label.name = "Label1";
+                label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                label.style.flexGrow = 1f;
+                label.style.height = 20f;
+                element.Add(label);
+            }
+
+            return element;
+        }
+        private void BindScannerListViewItem(VisualElement element, int index)
+        {
+            List<AssetArtScanner> sourceList = _scannerListView.itemsSource as List<AssetArtScanner>;
+            var scanner = sourceList[index];
+            var textField1 = element.Q<Label>("Label1");
+            if (string.IsNullOrEmpty(scanner.ScannerDesc))
+                textField1.text = scanner.ScannerName;
+            else
+                textField1.text = $"{scanner.ScannerName} ({scanner.ScannerDesc})";
+        }
+        private void ScannerListView_onSelectionChange(IEnumerable<object> objs)
+        {
+            var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectScanner == null)
+            {
+                _scannerContentContainer.visible = false;
+                return;
+            }
+
+            _scannerContentContainer.visible = true;
+            _lastModifyScannerIndex = _scannerListView.selectedIndex;
+            _scannerNameTxt.SetValueWithoutNotify(selectScanner.ScannerName);
+            _scannerDescTxt.SetValueWithoutNotify(selectScanner.ScannerDesc);
+
+            // 显示检视面板
+            var scanSchema = selectScanner.LoadSchema();
+            RefreshInspector(scanSchema);
+
+            // 设置Schema对象
+            if (scanSchema == null)
+            {
+                _scannerSchemaField.SetValueWithoutNotify(null);
+                _schemaGuideTxt.text = string.Empty;
+            }
+            else
+            {
+                _scannerSchemaField.SetValueWithoutNotify(scanSchema);
+                _schemaGuideTxt.text = scanSchema.GetUserGuide();
+            }
+
+            // 显示存储目录
+            DefaultAsset saveFolder = AssetDatabase.LoadAssetAtPath<DefaultAsset>(selectScanner.SaveDirectory);
+            if (saveFolder == null)
+            {
+                _outputFolderField.SetValueWithoutNotify(null);
+            }
+            else
+            {
+                _outputFolderField.SetValueWithoutNotify(saveFolder);
+            }
+
+            FillCollectorViewData();
+        }
+        private void AddScannerBtn_clicked()
+        {
+            Undo.RecordObject(AssetArtScannerSettingData.Setting, "YooAsset.AssetArtScannerWindow AddScanner");
+            AssetArtScannerSettingData.CreateScanner("Default Scanner", string.Empty);
+            FillScannerListViewData();
+        }
+        private void RemoveScannerBtn_clicked()
+        {
+            var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectScanner == null)
+                return;
+
+            Undo.RecordObject(AssetArtScannerSettingData.Setting, "YooAsset.AssetArtScannerWindow RemoveScanner");
+            AssetArtScannerSettingData.RemoveScanner(selectScanner);
+            FillScannerListViewData();
+        }
+
+        // 收集列表相关
+        private void FillCollectorViewData()
+        {
+            var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectScanner == null)
+                return;
+
+            // 填充数据
+            _collectorScrollView.Clear();
+            for (int i = 0; i < selectScanner.Collectors.Count; i++)
+            {
+                VisualElement element = MakeCollectorListViewItem();
+                BindCollectorListViewItem(element, i);
+                _collectorScrollView.Add(element);
+            }
+        }
+        private VisualElement MakeCollectorListViewItem()
+        {
+            VisualElement element = new VisualElement();
+
+            VisualElement elementTop = new VisualElement();
+            elementTop.style.flexDirection = FlexDirection.Row;
+            element.Add(elementTop);
+
+            VisualElement elementSpace = new VisualElement();
+            elementSpace.style.flexDirection = FlexDirection.Column;
+            element.Add(elementSpace);
+
+            // Top VisualElement
+            {
+                var button = new Button();
+                button.name = "Button1";
+                button.text = "-";
+                button.style.unityTextAlign = TextAnchor.MiddleCenter;
+                button.style.flexGrow = 0f;
+                elementTop.Add(button);
+            }
+            {
+                var objectField = new ObjectField();
+                objectField.name = "ObjectField1";
+                objectField.label = "Collector";
+                objectField.objectType = typeof(UnityEngine.Object);
+                objectField.style.unityTextAlign = TextAnchor.MiddleLeft;
+                objectField.style.flexGrow = 1f;
+                elementTop.Add(objectField);
+                var label = objectField.Q<Label>();
+                label.style.minWidth = 63;
+            }
+
+            // Space VisualElement
+            {
+                var label = new Label();
+                label.style.height = 10;
+                elementSpace.Add(label);
+            }
+
+            return element;
+        }
+        private void BindCollectorListViewItem(VisualElement element, int index)
+        {
+            var selectScanner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectScanner == null)
+                return;
+
+            var collector = selectScanner.Collectors[index];
+            var collectObject = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(collector.CollectPath);
+            if (collectObject != null)
+                collectObject.name = collector.CollectPath;
+
+            // Remove Button
+            var removeBtn = element.Q<Button>("Button1");
+            removeBtn.clicked += () =>
+            {
+                RemoveCollectorBtn_clicked(collector);
+            };
+
+            // Collector Path
+            var objectField1 = element.Q<ObjectField>("ObjectField1");
+            objectField1.SetValueWithoutNotify(collectObject);
+            objectField1.RegisterValueChangedCallback(evt =>
+            {
+                collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
+                objectField1.value.name = collector.CollectPath;
+                AssetArtScannerSettingData.ModifyCollector(selectScanner, collector);
+            });
+        }
+        private void AddCollectorBtn_clicked()
+        {
+            var selectSacnner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectSacnner == null)
+                return;
+
+            Undo.RecordObject(AssetArtScannerSettingData.Setting, "YooAsset.AssetArtScannerWindow AddCollector");
+            AssetArtCollector collector = new AssetArtCollector();
+            AssetArtScannerSettingData.CreateCollector(selectSacnner, collector);
+            FillCollectorViewData();
+        }
+        private void RemoveCollectorBtn_clicked(AssetArtCollector selectCollector)
+        {
+            var selectSacnner = _scannerListView.selectedItem as AssetArtScanner;
+            if (selectSacnner == null)
+                return;
+            if (selectCollector == null)
+                return;
+
+            Undo.RecordObject(AssetArtScannerSettingData.Setting, "YooAsset.AssetArtScannerWindow RemoveCollector");
+            AssetArtScannerSettingData.RemoveCollector(selectSacnner, selectCollector);
+            FillCollectorViewData();
+        }
+
+        // 属性面板相关
+        private void RefreshInspector(ScannerSchema scanSchema)
+        {
+            if (scanSchema == null)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+                return;
+            }
+
+            var inspector = scanSchema.CreateInspector();
+            if (inspector == null)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+                return;
+            }
+
+            if (inspector.Containner is VisualElement container)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, true);
+                _inspectorContainer.Clear();
+                _inspectorContainer.Add(container);
+                _inspectorContainer.style.width = inspector.Width;
+                _inspectorContainer.style.minWidth = inspector.MinWidth;
+                _inspectorContainer.style.maxWidth = inspector.MaxWidth;
+            }
+            else
+            {
+                Debug.LogWarning($"{nameof(ScannerSchema)} inspector container is invalid !");
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+            }
+        }
+    }
+}
+#endif

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bff583b32bbeb7e498920bfdc84dba90
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.uxml

@@ -0,0 +1,33 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
+        <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="Export" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="Import" display-tooltip-when-elided="true" name="ImportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="Scan All" display-tooltip-when-elided="true" name="ScanAllButton" style="width: 80px; background-color: rgb(56, 147, 58);" />
+    </uie:Toolbar>
+    <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
+        <ui:VisualElement name="ScannerListContainer" style="width: 250px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+            <ui:Label text="Scanner List" display-tooltip-when-elided="true" name="ScannerListTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 3px; border-right-width: 3px; border-top-width: 3px; border-bottom-width: 3px; font-size: 12px;" />
+            <uie:ToolbarSearchField focusable="true" name="ScannerSearchField" style="width: 230px;" />
+            <ui:ListView focusable="true" name="ScannerListView" item-height="20" virtualization-method="DynamicHeight" reorder-mode="Animated" reorderable="true" style="flex-grow: 1;" />
+            <ui:VisualElement name="ScannerAddContainer" style="justify-content: center; flex-direction: row; flex-shrink: 0;">
+                <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
+                <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
+            </ui:VisualElement>
+        </ui:VisualElement>
+        <ui:VisualElement name="ScannerContentContainer" style="flex-grow: 1; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; min-width: 400px;">
+            <ui:Label text="Scanner" display-tooltip-when-elided="true" name="ScannerContentTitle" style="-unity-text-align: upper-center; -unity-font-style: bold; font-size: 12px; border-top-width: 3px; border-right-width: 3px; border-bottom-width: 3px; border-left-width: 3px; background-color: rgb(89, 89, 89);" />
+            <ui:Label display-tooltip-when-elided="true" name="SchemaUserGuide" style="-unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px; height: 40px;" />
+            <ui:TextField picking-mode="Ignore" label="Scanner Name" name="ScannerName" />
+            <ui:TextField picking-mode="Ignore" label="Scanner Desc" name="ScannerDesc" />
+            <uie:ObjectField label="Scanner Schema" name="ScanSchema" type="YooAsset.Editor.ScannerSchema, YooAsset.Editor" allow-scene-objects="false" />
+            <uie:ObjectField label="Output Folder" name="OutputFolder" type="UnityEditor.DefaultAsset, UnityEditor.CoreModule" allow-scene-objects="false" />
+            <ui:VisualElement name="CollectorAddContainer" style="height: 20px; flex-direction: row-reverse;">
+                <ui:Button text="[ + ]" display-tooltip-when-elided="true" name="AddBtn" />
+                <ui:Button text="Scan" display-tooltip-when-elided="true" name="ScanBtn" style="width: 60px;" />
+            </ui:VisualElement>
+            <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
+        </ui:VisualElement>
+        <ui:VisualElement name="InspectorContainer" style="flex-grow: 1; border-top-width: 5px; border-right-width: 5px; border-bottom-width: 5px; border-left-width: 5px; background-color: rgb(67, 67, 67);" />
+    </ui:VisualElement>
+</ui:UXML>

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5bbb873a7bee2924a86c876b67bb2cb4
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/ScannerDefine.cs

@@ -0,0 +1,26 @@
+
+namespace YooAsset.Editor
+{
+    public class ScannerDefine
+    {
+        /// <summary>
+        /// 报告文件签名
+        /// </summary>
+        public const string ReportFileSign = "596f6f4172745265706f7274";
+
+        /// <summary>
+        /// 配置文件签名
+        /// </summary>
+        public const string SettingFileSign = "596f6f41727453657474696e67";
+        
+        /// <summary>
+        /// 报告文件的版本
+        /// </summary>
+        public const string ReportFileVersion = "1.0";
+
+        /// <summary>
+        /// 配置文件的版本
+        /// </summary>
+        public const string SettingFileVersion = "1.0";
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/ScannerDefine.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ed658bfc32cbfc44caf262a741a7c387
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/ScannerResult.cs

@@ -0,0 +1,59 @@
+
+namespace YooAsset.Editor
+{
+    public class ScannerResult
+    {
+        /// <summary>
+        /// 生成的报告文件路径
+        /// </summary>
+        public string ReprotFilePath { private set; get; }
+
+        /// <summary>
+        /// 报告对象
+        /// </summary>
+        public ScanReport Report { private set; get; }
+
+        /// <summary>
+        /// 错误信息
+        /// </summary>
+        public string ErrorInfo { private set; get; }
+
+        /// <summary>
+        /// 是否成功
+        /// </summary>
+        public bool Succeed
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(ErrorInfo))
+                    return true;
+                else
+                    return false;
+            }
+        }
+
+
+        public ScannerResult(string error)
+        {
+            ErrorInfo = error;
+        }
+        public ScannerResult(string filePath, ScanReport report)
+        {
+            ReprotFilePath = filePath;
+            Report = report;
+            ErrorInfo = string.Empty;
+        }
+
+        /// <summary>
+        /// 打开报告窗口
+        /// </summary>
+        public void OpenReportWindow()
+        {
+            if (Succeed)
+            {
+                var reproterWindow = AssetArtReporterWindow.OpenWindow();
+                reproterWindow.ImportSingleReprotFile(ReprotFilePath);
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/ScannerResult.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e10cdab189d80b142ad5903d12956c59
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/ScannerSchema.cs

@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public abstract class ScannerSchema : ScriptableObject
+    {
+        /// <summary>
+        /// 获取用户指南信息
+        /// </summary>
+        public abstract string GetUserGuide();
+
+        /// <summary>
+        /// 运行生成扫描报告
+        /// </summary>
+        public abstract ScanReport RunScanner(AssetArtScanner scanner);
+
+        /// <summary>
+        /// 修复扫描结果
+        /// </summary>
+        public abstract void FixResult(List<ReportElement> fixList);
+
+        /// <summary>
+        /// 创建检视面板
+        /// </summary>
+        public virtual SchemaInspector CreateInspector()
+        {
+            return null;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/ScannerSchema.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eb6a587c72ccecc4ab6d386063cf0736
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/SchemaInspector.cs

@@ -0,0 +1,45 @@
+
+namespace YooAsset.Editor
+{
+    public class SchemaInspector
+    {
+        /// <summary>
+        /// 检视界面的UI元素容器（UIElements元素）
+        /// </summary>
+        public object Containner { private set; get; }
+
+        /// <summary>
+        /// 检视界面宽度
+        /// </summary>
+        public int Width = 250;
+
+        /// <summary>
+        /// 检视界面最小宽度
+        /// </summary>
+        public int MinWidth = 250;
+
+        /// <summary>
+        /// 检视界面最大宽度
+        /// </summary>
+        public int MaxWidth = 250;
+
+        public SchemaInspector(object containner)
+        {
+            Containner = containner;
+        }
+        public SchemaInspector(object containner, int width)
+        {
+            Containner = containner;
+            Width = width;
+            MinWidth = width;
+            MaxWidth = width;
+        }
+        public SchemaInspector(object containner, int width, int minWidth, int maxWidth)
+        {
+            Containner = containner;
+            Width = width;
+            MinWidth = minWidth;
+            MaxWidth = maxWidth;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetArtScanner/SchemaInspector.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3440549fcb36bbf4c8c6da17fb858947
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -36,7 +36,7 @@ namespace YooAsset.Editor
             BuildLogger.InitLogger(enableLog);
 
             // 执行构建流程
-            Debug.Log($"Begin to build package : {buildParameters.PackageName} by {buildParameters.BuildPipeline}");
+            BuildLogger.Log($"Begin to build package : {buildParameters.PackageName} by {buildParameters.BuildPipeline}");
             var buildResult = BuildRunner.Run(buildPipeline, _buildContext);
             if (buildResult.Success)
             {

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,7 +22,7 @@ namespace YooAsset.Editor
         /// </summary>
         public static string GetStreamingAssetsRoot()
         {
-            return $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.DefaultYooFolderName}/";
+            return YooAssetSettingsData.GetYooDefaultBuildinRoot();
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -18,18 +18,6 @@ namespace YooAsset.Editor
             EditorPrefs.SetInt(key, (int)buildPipeline);
         }
 
-        // EBuildMode
-        public static EBuildMode GetPackageBuildMode(string packageName, EBuildPipeline buildPipeline)
-        {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildMode)}";
-            return (EBuildMode)EditorPrefs.GetInt(key, (int)EBuildMode.ForceRebuild);
-        }
-        public static void SetPackageBuildMode(string packageName, EBuildPipeline buildPipeline, EBuildMode buildMode)
-        {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildMode)}";
-            EditorPrefs.SetInt(key, (int)buildMode);
-        }
-
         // ECompressOption
         public static ECompressOption GetPackageCompressOption(string packageName, EBuildPipeline buildPipeline)
         {
@@ -89,5 +77,29 @@ namespace YooAsset.Editor
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
             EditorPrefs.SetString(key, encyptionClassName);
         }
+
+        // ClearBuildCache
+        public static bool GetPackageClearBuildCache(string packageName, EBuildPipeline buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ClearBuildCache";
+            return EditorPrefs.GetInt(key, 0) > 0;
+        }
+        public static void SetPackageClearBuildCache(string packageName, EBuildPipeline buildPipeline, bool clearBuildCache)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ClearBuildCache";
+            EditorPrefs.SetInt(key, clearBuildCache ? 1 : 0);
+        }
+
+        // UseAssetDependencyDB
+        public static bool GetPackageUseAssetDependencyDB(string packageName, EBuildPipeline buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_UseAssetDependencyDB";
+            return EditorPrefs.GetInt(key, 0) > 0;
+        }
+        public static void SetPackageUseAssetDependencyDB(string packageName, EBuildPipeline buildPipeline, bool useAssetDependencyDB)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_UseAssetDependencyDB";
+            EditorPrefs.SetInt(key, useAssetDependencyDB ? 1 : 0);
+        }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -69,6 +69,7 @@ namespace YooAsset.Editor
                 {
                     _pipelineMenu = new ToolbarMenu();
                     _pipelineMenu.style.width = 200;
+                    _pipelineMenu.menu.AppendAction(EBuildPipeline.EditorSimulateBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.EditorSimulateBuildPipeline);
                     _pipelineMenu.menu.AppendAction(EBuildPipeline.BuiltinBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.BuiltinBuildPipeline);
                     _pipelineMenu.menu.AppendAction(EBuildPipeline.ScriptableBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.ScriptableBuildPipeline);
                     _pipelineMenu.menu.AppendAction(EBuildPipeline.RawFileBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.RawFileBuildPipeline);
@@ -93,7 +94,11 @@ namespace YooAsset.Editor
             _pipelineMenu.text = _buildPipeline.ToString();
 
             var buildTarget = EditorUserBuildSettings.activeBuildTarget;
-            if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+            if (_buildPipeline == EBuildPipeline.EditorSimulateBuildPipeline)
+            {
+                var viewer = new EditorSimulateBuildPipelineViewer(_buildPackage, buildTarget, _container);
+            }
+            else if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
             {
                 var viewer = new BuiltinBuildPipelineViewer(_buildPackage, buildTarget, _container);
             }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -8,87 +8,38 @@ namespace YooAsset.Editor
         /// <summary>
         /// 模拟构建
         /// </summary>
-        public static string SimulateBuild(string buildPipelineName, string packageName)
+        public static PackageInvokeBuildResult SimulateBuild(PackageInvokeBuildParam buildParam)
         {
-            if (buildPipelineName == EBuildPipeline.BuiltinBuildPipeline.ToString())
+            string packageName = buildParam.PackageName;
+            string buildPipelineName = buildParam.BuildPipelineName;
+
+            if (buildPipelineName == "EditorSimulateBuildPipeline")
             {
-                BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
+                var buildParameters = new EditorSimulateBuildParameters();
                 buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
                 buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-                buildParameters.BuildPipeline = buildPipelineName;
+                buildParameters.BuildPipeline = EBuildPipeline.EditorSimulateBuildPipeline.ToString();
+                buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle;
                 buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
-                buildParameters.BuildMode = EBuildMode.SimulateBuild;
                 buildParameters.PackageName = packageName;
                 buildParameters.PackageVersion = "Simulate";
                 buildParameters.FileNameStyle = EFileNameStyle.HashName;
                 buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
                 buildParameters.BuildinFileCopyParams = string.Empty;
+                buildParameters.UseAssetDependencyDB = true;
 
-                BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
-                var buildResult = pipeline.Run(buildParameters, false);
+                var pipeline = new EditorSimulateBuildPipeline();
+                BuildResult buildResult = pipeline.Run(buildParameters, false);
                 if (buildResult.Success)
                 {
-                    string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-                    string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
-                    return manifestFilePath;
+                    var reulst = new PackageInvokeBuildResult();
+                    reulst.PackageRootDirectory = buildResult.OutputPackageDirectory;
+                    return reulst;
                 }
                 else
                 {
-                    return null;
-                }
-            }
-            else if (buildPipelineName == EBuildPipeline.ScriptableBuildPipeline.ToString())
-            {
-                ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
-                buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-                buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-                buildParameters.BuildPipeline = buildPipelineName;
-                buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
-                buildParameters.BuildMode = EBuildMode.SimulateBuild;
-                buildParameters.PackageName = packageName;
-                buildParameters.PackageVersion = "Simulate";
-                buildParameters.FileNameStyle = EFileNameStyle.HashName;
-                buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
-                buildParameters.BuildinFileCopyParams = string.Empty;
-
-                ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
-                var buildResult = pipeline.Run(buildParameters, true);
-                if (buildResult.Success)
-                {
-                    string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-                    string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
-                    return manifestFilePath;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else if (buildPipelineName == EBuildPipeline.RawFileBuildPipeline.ToString())
-            {
-                RawFileBuildParameters buildParameters = new RawFileBuildParameters();
-                buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-                buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-                buildParameters.BuildPipeline = buildPipelineName;
-                buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
-                buildParameters.BuildMode = EBuildMode.SimulateBuild;
-                buildParameters.PackageName = packageName;
-                buildParameters.PackageVersion = "Simulate";
-                buildParameters.FileNameStyle = EFileNameStyle.HashName;
-                buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
-                buildParameters.BuildinFileCopyParams = string.Empty;
-
-                RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
-                var buildResult = pipeline.Run(buildParameters, true);
-                if (buildResult.Success)
-                {
-                    string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-                    string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
-                    return manifestFilePath;
-                }
-                else
-                {
-                    return null;
+                    Debug.LogError(buildResult.ErrorInfo);
+                    throw new System.Exception($"{nameof(EditorSimulateBuildPipeline)} build failed !");
                 }
             }
             else

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -56,12 +56,13 @@ namespace YooAsset.Editor
         public string EncryptedFilePath { set; get; }
         #endregion
 
+        private readonly Dictionary<string, BuildAssetInfo> _packAssetDic = new Dictionary<string, BuildAssetInfo>(100);
 
         /// <summary>
         /// 参与构建的资源列表
         /// 注意：不包含零依赖资源和冗余资源
         /// </summary>
-        public readonly List<BuildAssetInfo> MainAssets = new List<BuildAssetInfo>();
+        public readonly List<BuildAssetInfo> AllPackAssets = new List<BuildAssetInfo>(100);
 
         /// <summary>
         /// 资源包名称
@@ -84,57 +85,69 @@ namespace YooAsset.Editor
         /// </summary>
         public void PackAsset(BuildAssetInfo buildAsset)
         {
-            if (IsContainsAsset(buildAsset.AssetInfo.AssetPath))
-                throw new System.Exception($"Should never get here ! Asset is existed : {buildAsset.AssetInfo.AssetPath}");
+            string assetPath = buildAsset.AssetInfo.AssetPath;
+            if (_packAssetDic.ContainsKey(assetPath))
+                throw new System.Exception($"Should never get here ! Asset is existed : {assetPath}");
 
-            MainAssets.Add(buildAsset);
+            _packAssetDic.Add(assetPath, buildAsset);
+            AllPackAssets.Add(buildAsset);
         }
 
         /// <summary>
         /// 是否包含指定资源
         /// </summary>
-        public bool IsContainsAsset(string assetPath)
+        public bool IsContainsPackAsset(string assetPath)
         {
-            foreach (var buildAsset in MainAssets)
-            {
-                if (buildAsset.AssetInfo.AssetPath == assetPath)
-                {
-                    return true;
-                }
-            }
-            return false;
+            return _packAssetDic.ContainsKey(assetPath);
         }
 
         /// <summary>
         /// 获取构建的资源路径列表
         /// </summary>
-        public string[] GetAllMainAssetPaths()
+        public string[] GetAllPackAssetPaths()
         {
-            return MainAssets.Select(t => t.AssetInfo.AssetPath).ToArray();
+            return AllPackAssets.Select(t => t.AssetInfo.AssetPath).ToArray();
         }
 
         /// <summary>
-        /// 获取该资源包内的所有资源（包括零依赖资源和冗余资源）
+        /// 获取构建的主资源信息
         /// </summary>
-        public List<string> GetAllBuiltinAssetPaths()
+        public BuildAssetInfo GetPackAssetInfo(string assetPath)
         {
-            var packAssets = GetAllMainAssetPaths();
-            List<string> result = new List<string>(packAssets);
-            foreach (var buildAsset in MainAssets)
+            if (_packAssetDic.TryGetValue(assetPath, out BuildAssetInfo value))
             {
-                if (buildAsset.AllDependAssetInfos == null)
-                    continue;
-                foreach (var dependAssetInfo in buildAsset.AllDependAssetInfos)
+                return value;
+            }
+            else
+            {
+                throw new Exception($"Can not found pack asset info {assetPath} in bundle : {BundleName}");
+            }
+        }
+
+        /// <summary>
+        /// 获取资源包内部所有资产
+        /// </summary>
+        public List<AssetInfo> GetBundleContents()
+        {
+            Dictionary<string, AssetInfo> result = new Dictionary<string, AssetInfo>(AllPackAssets.Count);
+            foreach (var packAsset in AllPackAssets)
+            {
+                result.Add(packAsset.AssetInfo.AssetPath, packAsset.AssetInfo);
+                if (packAsset.AllDependAssetInfos != null)
                 {
-                    // 注意：依赖资源里只添加零依赖资源和冗余资源
-                    if (dependAssetInfo.HasBundleName() == false)
+                    foreach (var dependAssetInfo in packAsset.AllDependAssetInfos)
                     {
-                        if (result.Contains(dependAssetInfo.AssetInfo.AssetPath) == false)
-                            result.Add(dependAssetInfo.AssetInfo.AssetPath);
+                        // 注意：依赖资源里只添加零依赖资源和冗余资源
+                        if (dependAssetInfo.HasBundleName() == false)
+                        {
+                            string dependAssetPath = dependAssetInfo.AssetInfo.AssetPath;
+                            if (result.ContainsKey(dependAssetPath) == false)
+                                result.Add(dependAssetPath, dependAssetInfo.AssetInfo);
+                        }
                     }
                 }
             }
-            return result;
+            return result.Values.ToList();
         }
 
         /// <summary>
@@ -146,7 +159,7 @@ namespace YooAsset.Editor
             AssetBundleBuild build = new AssetBundleBuild();
             build.assetBundleName = BundleName;
             build.assetBundleVariant = string.Empty;
-            build.assetNames = GetAllMainAssetPaths();
+            build.assetNames = GetAllPackAssetPaths();
             return build;
         }
 
@@ -155,7 +168,7 @@ namespace YooAsset.Editor
         /// </summary>
         public BuildAssetInfo[] GetAllManifestAssetInfos()
         {
-            return MainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
+            return AllPackAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
         }
 
         /// <summary>

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -17,7 +17,7 @@ namespace YooAsset.Editor
         /// 未被依赖的资源列表
         /// </summary>
         public readonly List<ReportIndependAsset> IndependAssets = new List<ReportIndependAsset>(1000);
-        
+
         /// <summary>
         /// 参与构建的资源总数
         /// 说明：包括主动收集的资源以及其依赖的所有资源
@@ -96,14 +96,14 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 创建着色器信息类
+        /// 创建空的资源包
         /// </summary>
-        public void CreateShadersBundleInfo(string shadersBundleName)
+        public void CreateEmptyBundleInfo(string bundleName)
         {
-            if (IsContainsBundle(shadersBundleName) == false)
+            if (IsContainsBundle(bundleName) == false)
             {
-                var shaderBundleInfo = new BuildBundleInfo(shadersBundleName);
-                _bundleInfoDic.Add(shadersBundleName, shaderBundleInfo);
+                var bundleInfo = new BuildBundleInfo(bundleName);
+                _bundleInfoDic.Add(bundleName, bundleInfo);
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -22,20 +22,20 @@ namespace YooAsset.Editor
         public string BuildinFileRoot;
 
         /// <summary>
-        /// 构建管线
+        /// 构建管线名称
         /// </summary>
         public string BuildPipeline;
 
+        /// <summary>
+        /// 构建资源包类型
+        /// </summary>
+        public int BuildBundleType;
+
         /// <summary>
         /// 构建的平台
         /// </summary>
         public BuildTarget BuildTarget;
 
-        /// <summary>
-        /// 构建模式
-        /// </summary>
-        public EBuildMode BuildMode;
-
         /// <summary>
         /// 构建的包裹名称
         /// </summary>
@@ -46,12 +46,33 @@ namespace YooAsset.Editor
         /// </summary>
         public string PackageVersion;
 
+        /// <summary>
+        /// 构建的包裹备注
+        /// </summary>
+        public string PackageNote;
 
         /// <summary>
-        /// 是否启用共享资源打包
+        /// 清空构建缓存文件
+        /// </summary>
+        public bool ClearBuildCacheFiles = false;
+
+        /// <summary>
+        /// 使用资源依赖缓存数据库
+        /// 说明：开启此项可以极大提高资源收集速度！
+        /// </summary>
+        public bool UseAssetDependencyDB = false;
+
+        /// <summary>
+        /// 启用共享资源打包
         /// </summary>
         public bool EnableSharePackRule = false;
 
+        /// <summary>
+        /// 对单独引用的共享资源进行独立打包
+        /// 说明：关闭该选项单独引用的共享资源将会构建到引用它的资源包内！
+        /// </summary>
+        public bool SingleReferencedPackAlone = true;
+
         /// <summary>
         /// 验证构建结果
         /// </summary>
@@ -60,12 +81,12 @@ namespace YooAsset.Editor
         /// <summary>
         /// 资源包名称样式
         /// </summary>
-        public EFileNameStyle FileNameStyle;
+        public EFileNameStyle FileNameStyle = EFileNameStyle.HashName;
 
         /// <summary>
         /// 内置文件的拷贝选项
         /// </summary>
-        public EBuildinFileCopyOption BuildinFileCopyOption;
+        public EBuildinFileCopyOption BuildinFileCopyOption = EBuildinFileCopyOption.None;
 
         /// <summary>
         /// 内置文件的拷贝参数
@@ -95,32 +116,12 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
 
-            // 检测是否有未保存场景
-            if (BuildMode != EBuildMode.SimulateBuild)
-            {
-                if (EditorTools.HasDirtyScenes())
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.FoundUnsavedScene, "Found unsaved scene !");
-                    throw new Exception(message);
-                }
-            }
-
             // 检测构建参数合法性
             if (BuildTarget == BuildTarget.NoTarget)
             {
                 string message = BuildLogger.GetErrorMessage(ErrorCode.NoBuildTarget, "Please select the build target platform !");
                 throw new Exception(message);
             }
-            if (string.IsNullOrEmpty(PackageName))
-            {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageNameIsNullOrEmpty, "Package name is null or empty !");
-                throw new Exception(message);
-            }
-            if (string.IsNullOrEmpty(PackageVersion))
-            {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageVersionIsNullOrEmpty, "Package version is null or empty !");
-                throw new Exception(message);
-            }
             if (string.IsNullOrEmpty(BuildOutputRoot))
             {
                 string message = BuildLogger.GetErrorMessage(ErrorCode.BuildOutputRootIsNullOrEmpty, "Build output root is null or empty !");
@@ -131,33 +132,31 @@ namespace YooAsset.Editor
                 string message = BuildLogger.GetErrorMessage(ErrorCode.BuildinFileRootIsNullOrEmpty, "Buildin file root is null or empty !");
                 throw new Exception(message);
             }
-
-            // 强制构建删除包裹目录
-            if (BuildMode == EBuildMode.ForceRebuild)
+            if (string.IsNullOrEmpty(BuildPipeline))
             {
-                string packageRootDirectory = GetPackageRootDirectory();
-                if (EditorTools.DeleteDirectory(packageRootDirectory))
-                {
-                    BuildLogger.Log($"Delete package root directory: {packageRootDirectory}");
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineIsNullOrEmpty, "Build pipeline is null or empty !");
+                throw new Exception(message);
+            }
+            if (BuildBundleType == (int)EBuildBundleType.Unknown)
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildBundleTypeIsUnknown, $"Build bundle type is unknown {BuildBundleType} !");
+                throw new Exception(message);
+            }
+            if (string.IsNullOrEmpty(PackageName))
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageNameIsNullOrEmpty, "Package name is null or empty !");
+                throw new Exception(message);
+            }
+            if (string.IsNullOrEmpty(PackageVersion))
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageVersionIsNullOrEmpty, "Package version is null or empty !");
+                throw new Exception(message);
             }
 
-            // 检测包裹输出目录是否存在
-            if (BuildMode != EBuildMode.SimulateBuild)
+            // 设置默认备注信息
+            if (string.IsNullOrEmpty(PackageNote))
             {
-                string packageOutputDirectory = GetPackageOutputDirectory();
-                if (Directory.Exists(packageOutputDirectory))
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.PackageOutputDirectoryExists, $"Package outout directory exists: {packageOutputDirectory}");
-                    throw new Exception(message);
-                }
-            }
-
-            // 如果输出目录不存在
-            string pipelineOutputDirectory = GetPipelineOutputDirectory();
-            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
-            {
-                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
+                PackageNote = DateTime.Now.ToString();
             }
         }
 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -12,19 +12,22 @@ namespace YooAsset.Editor
 
     public abstract class TaskCreateManifest
     {
-        private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
+        private readonly Dictionary<string, int> _cachedBundleIndexIDs = new Dictionary<string, int>(10000);
         private readonly Dictionary<int, HashSet<string>> _cacheBundleTags = new Dictionary<int, HashSet<string>>(10000);
 
         /// <summary>
         /// 创建补丁清单文件到输出目录
         /// </summary>
-        protected void CreateManifestFile(BuildContext context)
+        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, BuildContext context)
         {
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters;
             string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
 
+            // 检测资源包哈希冲突
+            CheckBundleHashConflict(buildMapContext);
+
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
             manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
@@ -32,20 +35,28 @@ namespace YooAsset.Editor
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
             manifest.OutputNameStyle = (int)buildParameters.FileNameStyle;
+            manifest.BuildBundleType = buildParameters.BuildBundleType;
             manifest.BuildPipeline = buildParameters.BuildPipeline;
             manifest.PackageName = buildParameters.PackageName;
             manifest.PackageVersion = buildParameters.PackageVersion;
-            manifest.BundleList = GetAllPackageBundle(buildMapContext);
-            manifest.AssetList = GetAllPackageAsset(buildMapContext);
+            manifest.PackageNote = buildParameters.PackageNote;
+            manifest.AssetList = CreatePackageAssetList(buildMapContext);
+            manifest.BundleList = CreatePackageBundleList(buildMapContext);
 
-            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
-            {
-                // 处理资源包的依赖列表
+            // 1. 处理资源清单的资源对象
+            ProcessPacakgeAsset(manifest);
+
+            // 2. 处理资源包的依赖列表
+            if (processBundleDepends)
                 ProcessBundleDepends(context, manifest);
 
-                // 处理资源包的标签集合
+            // 3. 处理资源包的标签集合
+            if (processBundleTags)
                 ProcessBundleTags(manifest);
-            }
+
+            // 4. 处理内置资源包
+            if (processBundleDepends)
+                ProcessBuiltinBundleDependency(context, manifest);
 
             // 创建补丁清单文本文件
             {
@@ -57,17 +68,13 @@ namespace YooAsset.Editor
 
             // 创建补丁清单二进制文件
             string packageHash;
+            string packagePath;
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-                string filePath = $"{packageOutputDirectory}/{fileName}";
-                ManifestTools.SerializeToBinary(filePath, manifest);
-                packageHash = HashUtility.FileMD5(filePath);
-                BuildLogger.Log($"Create package manifest file: {filePath}");
-
-                ManifestContext manifestContext = new ManifestContext();
-                byte[] bytesData = FileUtility.ReadAllBytes(filePath);
-                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
-                context.SetContextObject(manifestContext);
+                packagePath = $"{packageOutputDirectory}/{fileName}";
+                ManifestTools.SerializeToBinary(packagePath, manifest);
+                packageHash = HashUtility.FileCRC32(packagePath);
+                BuildLogger.Log($"Create package manifest file: {packagePath}");
             }
 
             // 创建补丁清单哈希文件
@@ -85,6 +92,36 @@ namespace YooAsset.Editor
                 FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
                 BuildLogger.Log($"Create package manifest version file: {filePath}");
             }
+
+            // 填充上下文
+            {
+                ManifestContext manifestContext = new ManifestContext();
+                byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
+                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+                context.SetContextObject(manifestContext);
+            }
+        }
+
+        /// <summary>
+        /// 检测资源包哈希冲突
+        /// </summary>
+        private void CheckBundleHashConflict(BuildMapContext buildMapContext)
+        {
+            // 说明：在特殊情况下，例如某些文件加密算法会导致加密后的文件哈希值冲突！
+            // 说明：二进制完全相同的原生文件也会冲突！
+            HashSet<string> guids = new HashSet<string>();
+            foreach (var bundleInfo in buildMapContext.Collection)
+            {
+                if (guids.Contains(bundleInfo.PackageFileHash))
+                {
+                    string message = BuildLogger.GetErrorMessage(ErrorCode.BundleHashConflict, $"Bundle hash conflict : {bundleInfo.BundleName}");
+                    throw new Exception(message);
+                }
+                else
+                {
+                    guids.Add(bundleInfo.PackageFileHash);
+                }
+            }
         }
 
         /// <summary>
@@ -93,9 +130,9 @@ namespace YooAsset.Editor
         protected abstract string[] GetBundleDepends(BuildContext context, string bundleName);
 
         /// <summary>
-        /// 获取主资源对象列表
+        /// 创建资源对象列表
         /// </summary>
-        private List<PackageAsset> GetAllPackageAsset(BuildMapContext buildMapContext)
+        private List<PackageAsset> CreatePackageAssetList(BuildMapContext buildMapContext)
         {
             List<PackageAsset> result = new List<PackageAsset>(1000);
             foreach (var bundleInfo in buildMapContext.Collection)
@@ -108,17 +145,20 @@ namespace YooAsset.Editor
                     packageAsset.AssetPath = assetInfo.AssetInfo.AssetPath;
                     packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetInfo.AssetGUID : string.Empty;
                     packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-                    packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
+                    packageAsset.TempDataInEditor = assetInfo;
                     result.Add(packageAsset);
                 }
             }
+
+            // 按照AssetPath排序
+            result.Sort((a, b) => a.AssetPath.CompareTo(b.AssetPath));
             return result;
         }
 
         /// <summary>
-        /// 获取资源包列表
+        /// 创建资源包列表
         /// </summary>
-        private List<PackageBundle> GetAllPackageBundle(BuildMapContext buildMapContext)
+        private List<PackageBundle> CreatePackageBundleList(BuildMapContext buildMapContext)
         {
             List<PackageBundle> result = new List<PackageBundle>(1000);
             foreach (var bundleInfo in buildMapContext.Collection)
@@ -127,14 +167,37 @@ namespace YooAsset.Editor
                 result.Add(packageBundle);
             }
 
-            // 注意：缓存资源包索引
-            for (int index = 0; index < result.Count; index++)
+            // 按照BundleName排序
+            result.Sort((a, b) => a.BundleName.CompareTo(b.BundleName));
+            return result;
+        }
+
+        /// <summary>
+        /// 处理资源清单的资源对象列表
+        /// </summary>
+        private void ProcessPacakgeAsset(PackageManifest manifest)
+        {
+            // 注意：优先缓存资源包索引
+            for (int index = 0; index < manifest.BundleList.Count; index++)
             {
-                string bundleName = result[index].BundleName;
-                _cachedBundleID.Add(bundleName, index);
+                string bundleName = manifest.BundleList[index].BundleName;
+                _cachedBundleIndexIDs.Add(bundleName, index);
             }
 
-            return result;
+            // 记录资源对象所属的资源包ID
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                var assetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.BundleID = GetCachedBundleIndexID(assetInfo.BundleName);
+            }
+
+            // 记录资源对象依赖的资源包ID集合
+            // 注意：依赖关系非引擎构建结果里查询！
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                var mainAssetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.DependBundleIDs = GetAssetDependBundleIDs(mainAssetInfo);
+            }
         }
 
         /// <summary>
@@ -145,16 +208,19 @@ namespace YooAsset.Editor
             // 查询引擎生成的资源包依赖关系，然后记录到清单
             foreach (var packageBundle in manifest.BundleList)
             {
-                int mainBundleID = GetCachedBundleID(packageBundle.BundleName);
-                var depends = GetBundleDepends(context, packageBundle.BundleName);
-                List<int> dependIDs = new List<int>(depends.Length);
-                foreach (var dependBundleName in depends)
+                int mainBundleID = GetCachedBundleIndexID(packageBundle.BundleName);
+                string[] dependNames = GetBundleDepends(context, packageBundle.BundleName);
+                List<int> dependIDs = new List<int>(dependNames.Length);
+                foreach (var dependName in dependNames)
                 {
-                    int bundleID = GetCachedBundleID(dependBundleName);
-                    if (bundleID != mainBundleID)
-                        dependIDs.Add(bundleID);
+                    int dependBundleID = GetCachedBundleIndexID(dependName);
+                    if (dependBundleID != mainBundleID)
+                        dependIDs.Add(dependBundleID);
                 }
-                packageBundle.DependIDs = dependIDs.ToArray();
+
+                // 排序并填充数据
+                dependIDs.Sort();
+                packageBundle.DependBundleIDs = dependIDs.ToArray();
             }
         }
 
@@ -163,26 +229,33 @@ namespace YooAsset.Editor
         /// </summary>
         private void ProcessBundleTags(PackageManifest manifest)
         {
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                packageBundle.Tags = Array.Empty<string>();
+            }
+
             // 将主资源的标签信息传染给其依赖的资源包集合
             foreach (var packageAsset in manifest.AssetList)
             {
                 var assetTags = packageAsset.AssetTags;
                 int bundleID = packageAsset.BundleID;
                 CacheBundleTags(bundleID, assetTags);
-
-                var packageBundle = manifest.BundleList[bundleID];
-                foreach (var dependBundleID in packageBundle.DependIDs)
+                if (packageAsset.DependBundleIDs != null)
                 {
-                    CacheBundleTags(dependBundleID, assetTags);
+                    foreach (var dependBundleID in packageAsset.DependBundleIDs)
+                    {
+                        CacheBundleTags(dependBundleID, assetTags);
+                    }
                 }
             }
 
+            // 将缓存的资源标签赋值给资源包
             for (int index = 0; index < manifest.BundleList.Count; index++)
             {
                 var packageBundle = manifest.BundleList[index];
-                if (_cacheBundleTags.ContainsKey(index))
+                if (_cacheBundleTags.TryGetValue(index, out var value))
                 {
-                    packageBundle.Tags = _cacheBundleTags[index].ToArray();
+                    packageBundle.Tags = value.ToArray();
                 }
                 else
                 {
@@ -205,15 +278,104 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 获取资源包的索引ID
+        /// 获取缓存的资源包的索引ID
         /// </summary>
-        private int GetCachedBundleID(string bundleName)
+        private int GetCachedBundleIndexID(string bundleName)
         {
-            if (_cachedBundleID.TryGetValue(bundleName, out int value) == false)
+            if (_cachedBundleIndexIDs.TryGetValue(bundleName, out int value) == false)
             {
-                throw new Exception($"Should never get here ! Not found bundle ID : {bundleName}");
+                throw new Exception($"Should never get here ! Not found bundle index ID : {bundleName}");
             }
             return value;
         }
+
+        /// <summary>
+        /// 是否包含该资源包的索引ID
+        /// </summary>
+        private bool ContainsCachedBundleIndexID(string bundleName)
+        {
+            return _cachedBundleIndexIDs.ContainsKey(bundleName);
+        }
+
+        #region YOOASSET_LEGACY_DEPENDENCY
+        private void ProcessBuiltinBundleDependency(BuildContext context, PackageManifest manifest)
+        {
+            // 注意：如果是可编程构建管线，需要补充内置资源包
+            // 注意：该步骤依赖前面的操作！
+            var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
+            if (buildResultContext != null)
+            {
+                // 注意：初始化资源清单建立引用关系
+                ManifestTools.InitManifest(manifest);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
+            }
+        }
+        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
+        {
+            if (string.IsNullOrEmpty(builtinBundleName))
+                return;
+
+            // 查询内置资源包是否存在
+            if (ContainsCachedBundleIndexID(builtinBundleName) == false)
+                return;
+
+            // 获取内置资源包
+            int builtinBundleID = GetCachedBundleIndexID(builtinBundleName);
+            var builtinPackageBundle = manifest.BundleList[builtinBundleID];
+
+            // 更新依赖资源包ID集合
+            HashSet<int> cacheBundleIDs = new HashSet<int>(builtinPackageBundle.ReferenceBundleIDs);
+            HashSet<string> tempTags = new HashSet<string>();
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                if (cacheBundleIDs.Contains(packageAsset.BundleID))
+                {
+                    if (packageAsset.DependBundleIDs.Contains(builtinBundleID) == false)
+                    {
+                        var tempBundleIDs = new List<int>(packageAsset.DependBundleIDs);
+                        tempBundleIDs.Add(builtinBundleID);
+                        packageAsset.DependBundleIDs = tempBundleIDs.ToArray();
+                    }
+
+                    foreach (var tag in packageAsset.AssetTags)
+                    {
+                        if (tempTags.Contains(tag) == false)
+                            tempTags.Add(tag);
+                    }
+                }
+            }
+
+            // 更新内置资源包的标签集合
+            foreach (var tag in builtinPackageBundle.Tags)
+            {
+                if (tempTags.Contains(tag) == false)
+                    tempTags.Add(tag);
+            }
+            builtinPackageBundle.Tags = tempTags.ToArray();
+        }
+        private int[] GetAssetDependBundleIDs(BuildAssetInfo mainAssetInfo)
+        {
+            HashSet<int> result = new HashSet<int>();
+            int mainBundleID = GetCachedBundleIndexID(mainAssetInfo.BundleName);
+            foreach (var dependAssetInfo in mainAssetInfo.AllDependAssetInfos)
+            {
+                if (dependAssetInfo.HasBundleName())
+                {
+                    int bundleID = GetCachedBundleIndexID(dependAssetInfo.BundleName);
+                    if (mainBundleID != bundleID)
+                    {
+                        if (result.Contains(bundleID) == false)
+                            result.Add(bundleID);
+                    }
+                }
+            }
+
+            // 排序并返回数据
+            List<int> listResult = new List<int>(result);
+            listResult.Sort();
+            return listResult.ToArray();
+        }
+        #endregion
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs

@@ -18,53 +18,50 @@ namespace YooAsset.Editor
 
             // 概述信息
             {
-#if UNITY_2019_4_OR_NEWER
-                UnityEditor.PackageManager.PackageInfo packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(BuildReport).Assembly);
-                if (packageInfo != null)
-                    buildReport.Summary.YooVersion = packageInfo.version;
-#endif
+                buildReport.Summary.YooVersion = EditorTools.GetPackageManagerYooVersion();
                 buildReport.Summary.UnityVersion = UnityEngine.Application.unityVersion;
                 buildReport.Summary.BuildDate = DateTime.Now.ToString();
                 buildReport.Summary.BuildSeconds = BuildRunner.TotalSeconds;
                 buildReport.Summary.BuildTarget = buildParameters.BuildTarget;
                 buildReport.Summary.BuildPipeline = buildParameters.BuildPipeline;
-                buildReport.Summary.BuildMode = buildParameters.BuildMode;
+                buildReport.Summary.BuildBundleType = buildParameters.BuildBundleType;
                 buildReport.Summary.BuildPackageName = buildParameters.PackageName;
                 buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
+                buildReport.Summary.BuildPackageNote = buildParameters.PackageNote;
 
                 // 收集器配置
                 buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
                 buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable;
                 buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
                 buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-                buildReport.Summary.IgnoreRuleName = buildMapContext.Command.IgnoreRule.GetType().FullName;
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
+                buildReport.Summary.IgnoreRuleName = buildMapContext.Command.IgnoreRule.GetType().FullName;
 
                 // 构建参数
+                buildReport.Summary.ClearBuildCacheFiles = buildParameters.ClearBuildCacheFiles;
+                buildReport.Summary.UseAssetDependencyDB = buildParameters.UseAssetDependencyDB;
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
+                buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
+                buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                 buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
-                if (buildParameters.BuildPipeline == nameof(BuiltinBuildPipeline))
+                if (buildParameters is BuiltinBuildParameters)
                 {
                     var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                     buildReport.Summary.CompressOption = builtinBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = builtinBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = builtinBuildParameters.IgnoreTypeTreeChanges;
                 }
-                else if (buildParameters.BuildPipeline == nameof(ScriptableBuildPipeline))
+                else if (buildParameters is ScriptableBuildParameters)
                 {
                     var scriptableBuildParameters = buildParameters as ScriptableBuildParameters;
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                     buildReport.Summary.CompressOption = scriptableBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = scriptableBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = scriptableBuildParameters.IgnoreTypeTreeChanges;
-                }
-                else
-                {
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
-                    buildReport.Summary.CompressOption = ECompressOption.Uncompressed;
-                    buildReport.Summary.DisableWriteTypeTree = false;
-                    buildReport.Summary.IgnoreTypeTreeChanges = false;
+                    buildReport.Summary.WriteLinkXML = scriptableBuildParameters.WriteLinkXML;
+                    buildReport.Summary.CacheServerHost = scriptableBuildParameters.CacheServerHost;
+                    buildReport.Summary.CacheServerPort = scriptableBuildParameters.CacheServerPort;
+                    buildReport.Summary.BuiltinShadersBundleName = scriptableBuildParameters.BuiltinShadersBundleName;
+                    buildReport.Summary.MonoScriptsBundleName = scriptableBuildParameters.MonoScriptsBundleName;
                 }
 
                 // 构建结果
@@ -88,7 +85,8 @@ namespace YooAsset.Editor
                 reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(packageAsset.AssetPath);
                 reportAssetInfo.MainBundleName = mainBundle.BundleName;
                 reportAssetInfo.MainBundleSize = mainBundle.FileSize;
-                reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+                reportAssetInfo.DependAssets = GetAssetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+                reportAssetInfo.DependBundles = GetAssetDependBundles(manifest, packageAsset);
                 buildReport.AssetInfos.Add(reportAssetInfo);
             }
 
@@ -104,8 +102,9 @@ namespace YooAsset.Editor
                 reportBundleInfo.FileSize = packageBundle.FileSize;
                 reportBundleInfo.Encrypted = packageBundle.Encrypted;
                 reportBundleInfo.Tags = packageBundle.Tags;
-                reportBundleInfo.DependBundles = GetDependBundles(manifest, packageBundle);
-                reportBundleInfo.AllBuiltinAssets = GetAllBuiltinAssets(buildMapContext, packageBundle.BundleName);
+                reportBundleInfo.DependBundles = GetBundleDependBundles(manifest, packageBundle);
+                reportBundleInfo.ReferenceBundles = GetBundleReferenceBundles(manifest, packageBundle);
+                reportBundleInfo.BundleContents = GetBundleContents(buildMapContext, packageBundle.BundleName);
                 buildReport.BundleInfos.Add(reportBundleInfo);
             }
 
@@ -113,62 +112,82 @@ namespace YooAsset.Editor
             buildReport.IndependAssets = new List<ReportIndependAsset>(buildMapContext.IndependAssets);
 
             // 序列化文件
-            string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+            string fileName = YooAssetSettingsData.GetBuildReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
             string filePath = $"{packageOutputDirectory}/{fileName}";
             BuildReport.Serialize(filePath, buildReport);
             BuildLogger.Log($"Create build report file: {filePath}");
         }
 
-        /// <summary>
-        /// 获取资源对象依赖的所有资源包
-        /// </summary>
-        private List<string> GetDependBundles(PackageManifest manifest, PackageBundle packageBundle)
-        {
-            List<string> dependBundles = new List<string>(packageBundle.DependIDs.Length);
-            foreach (int index in packageBundle.DependIDs)
-            {
-                string dependBundleName = manifest.BundleList[index].BundleName;
-                dependBundles.Add(dependBundleName);
-            }
-            return dependBundles;
-        }
-
         /// <summary>
         /// 获取资源对象依赖的其它所有资源
         /// </summary>
-        private List<string> GetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
+        private List<AssetInfo> GetAssetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
         {
-            List<string> result = new List<string>();
+            List<AssetInfo> result = new List<AssetInfo>();
             var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+            var assetInfo = bundleInfo.GetPackAssetInfo(assetPath);
+            foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
             {
-                BuildAssetInfo findAssetInfo = null;
-                foreach (var buildAsset in bundleInfo.MainAssets)
-                {
-                    if (buildAsset.AssetInfo.AssetPath == assetPath)
-                    {
-                        findAssetInfo = buildAsset;
-                        break;
-                    }
-                }
-                if (findAssetInfo == null)
-                {
-                    throw new Exception($"Should never get here ! Not found asset {assetPath} in bunlde {bundleName}");
-                }
-                foreach (var dependAssetInfo in findAssetInfo.AllDependAssetInfos)
-                {
-                    result.Add(dependAssetInfo.AssetInfo.AssetPath);
-                }
+                result.Add(dependAssetInfo.AssetInfo);
             }
+            result.Sort();
             return result;
         }
 
         /// <summary>
-        /// 获取该资源包内的所有资源
+        /// 获取资源对象依赖的资源包集合
         /// </summary>
-        private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
+        private List<string> GetAssetDependBundles(PackageManifest manifest, PackageAsset packageAsset)
+        {
+            List<string> dependBundles = new List<string>(packageAsset.DependBundleIDs.Length);
+            foreach (int index in packageAsset.DependBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                dependBundles.Add(dependBundleName);
+            }
+            dependBundles.Sort();
+            return dependBundles;
+        }
+
+        /// <summary>
+        /// 获取资源包依赖的资源包集合
+        /// </summary>
+        private List<string> GetBundleDependBundles(PackageManifest manifest, PackageBundle packageBundle)
+        {
+            List<string> dependBundles = new List<string>(packageBundle.DependBundleIDs.Length);
+            foreach (int index in packageBundle.DependBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                dependBundles.Add(dependBundleName);
+            }
+            dependBundles.Sort();
+            return dependBundles;
+        }
+
+        /// <summary>
+        /// 获取引用该资源包的资源包集合
+        /// </summary>
+        private List<string> GetBundleReferenceBundles(PackageManifest manifest, PackageBundle packageBundle)
+        {
+            List<string> referenceBundles = new List<string>(packageBundle.ReferenceBundleIDs.Count);
+            foreach (int index in packageBundle.ReferenceBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                referenceBundles.Add(dependBundleName);
+            }
+            referenceBundles.Sort();
+            return referenceBundles;
+        }
+
+        /// <summary>
+        /// 获取资源包内部所有资产
+        /// </summary>
+        private List<AssetInfo> GetBundleContents(BuildMapContext buildMapContext, string bundleName)
         {
             var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
-            return bundleInfo.GetAllBuiltinAssetPaths();
+            List<AssetInfo> result = bundleInfo.GetBundleContents();
+            result.Sort();
+            return result;
         }
 
         private int GetMainAssetCount(PackageManifest manifest)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs

@@ -26,7 +26,7 @@ namespace YooAsset.Editor
             {
                 EncryptFileInfo fileInfo = new EncryptFileInfo();
                 fileInfo.BundleName = bundleInfo.BundleName;
-                fileInfo.FilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+                fileInfo.FileLoadPath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
                 var encryptResult = encryptionServices.Encrypt(fileInfo);
                 if (encryptResult.Encrypted)
                 {

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs

@@ -12,16 +12,16 @@ namespace YooAsset.Editor
         /// <summary>
         /// 生成资源构建上下文
         /// </summary>
-        public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
+        public BuildMapContext CreateBuildMap(bool simulateBuild, BuildParameters buildParameters)
         {
             BuildMapContext context = new BuildMapContext();
-            var buildMode = buildParameters.BuildMode;
             var packageName = buildParameters.PackageName;
 
             Dictionary<string, BuildAssetInfo> allBuildAssetInfos = new Dictionary<string, BuildAssetInfo>(1000);
 
             // 1. 获取所有收集器收集的资源
-            var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
+            bool useAssetDependencyDB = buildParameters.UseAssetDependencyDB;
+            var collectResult = AssetBundleCollectorSettingData.Setting.BeginCollect(packageName, simulateBuild, useAssetDependencyDB);
             List<CollectAssetInfo> allCollectAssets = collectResult.CollectAssets;
 
             // 2. 剔除未被引用的依赖项资源
@@ -56,9 +56,9 @@ namespace YooAsset.Editor
                 string bundleName = collectAssetInfo.BundleName;
                 foreach (var dependAsset in collectAssetInfo.DependAssets)
                 {
-                    if (allBuildAssetInfos.ContainsKey(dependAsset.AssetPath))
+                    if (allBuildAssetInfos.TryGetValue(dependAsset.AssetPath, out var value))
                     {
-                        allBuildAssetInfos[dependAsset.AssetPath].AddReferenceBundleName(bundleName);
+                        value.AddReferenceBundleName(bundleName);
                     }
                     else
                     {
@@ -109,15 +109,10 @@ namespace YooAsset.Editor
                 {
                     if (buildAssetInfo.HasBundleName() == false)
                     {
-                        PackRuleResult packRuleResult = GetShareBundleName(buildAssetInfo);
-                        if (packRuleResult.IsValid())
-                        {
-                            string shareBundleName = packRuleResult.GetShareBundleName(collectResult.Command.PackageName, collectResult.Command.UniqueBundleName);
-                            buildAssetInfo.SetBundleName(shareBundleName);
-                        }
+                        ProcessingPackShareBundle(buildParameters, collectResult.Command, buildAssetInfo);
                     }
                 }
-                PostProcessPackShareBundle();
+                PostProcessPackShareBundle(buildParameters, collectResult.Command, allBuildAssetInfos);
             }
 
             // 8. 记录关键信息
@@ -209,21 +204,38 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 共享资源打包后置处理
+        /// 共享资源打包机制
         /// </summary>
-        protected virtual void PostProcessPackShareBundle()
+        protected virtual void ProcessingPackShareBundle(BuildParameters buildParameters, CollectCommand command, BuildAssetInfo buildAssetInfo)
         {
-        }
+            PackRuleResult packRuleResult = GetShareBundleName(buildAssetInfo);
+            if (packRuleResult.IsValid() == false)
+                return;
 
-        /// <summary>
-        /// 获取共享资源包名称
-        /// </summary>
-        protected virtual PackRuleResult GetShareBundleName(BuildAssetInfo buildAssetInfo)
+            // 处理单个引用的共享资源
+            if (buildAssetInfo.GetReferenceBundleCount() <= 1)
+            {
+                if (buildParameters.SingleReferencedPackAlone == false)
+                    return;
+            }
+
+            // 设置共享资源包名
+            string shareBundleName = packRuleResult.GetShareBundleName(command.PackageName, command.UniqueBundleName);
+            buildAssetInfo.SetBundleName(shareBundleName);
+        }
+        private PackRuleResult GetShareBundleName(BuildAssetInfo buildAssetInfo)
         {
             string bundleName = Path.GetDirectoryName(buildAssetInfo.AssetInfo.AssetPath);
             PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
             return result;
         }
+
+        /// <summary>
+        /// 共享资源打包后置处理
+        /// </summary>
+        protected virtual void PostProcessPackShareBundle(BuildParameters buildParameters, CollectCommand command, Dictionary<string, BuildAssetInfo> allBuildAssetInfos)
+        {
+        }
         #endregion
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs

@@ -65,32 +65,5 @@ namespace YooAsset.Editor
         protected abstract string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
         protected abstract string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
         protected abstract long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
-
-        protected string GetFilePathTempHash(string filePath)
-        {
-            byte[] bytes = Encoding.UTF8.GetBytes(filePath);
-            return HashUtility.BytesMD5(bytes);
-
-            // 注意：在文件路径的哈希值冲突的情况下，可以使用下面的方法
-            //return $"{HashUtility.BytesMD5(bytes)}-{Guid.NewGuid():N}";
-        }
-        protected long GetBundleTempSize(BuildBundleInfo bundleInfo)
-        {
-            long tempSize = 0;
-
-            var assetPaths = bundleInfo.GetAllMainAssetPaths();
-            foreach (var assetPath in assetPaths)
-            {
-                long size = FileUtility.GetFileSize(assetPath);
-                tempSize += size;
-            }
-
-            if (tempSize == 0)
-            {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BundleTempSizeIsZero, $"Bundle temp size is zero, check bundle main asset list : {bundleInfo.BundleName}");
-                throw new Exception(message);
-            }
-            return tempSize;
-        }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs

@@ -20,11 +20,6 @@ namespace YooAsset.Editor
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var builtinBuildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
 
-            // 模拟构建模式下跳过引擎构建
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return;
-
             // 开始构建
             string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
             BuildAssetBundleOptions buildOptions = builtinBuildParameters.GetBundleBuildOptions();
@@ -35,14 +30,12 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
 
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+            // 检测输出目录
+            string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+            if (System.IO.File.Exists(unityOutputManifestFilePath) == false)
             {
-                string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
-                if (System.IO.File.Exists(unityOutputManifestFilePath) == false)
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFatal, $"Not found output {nameof(AssetBundleManifest)} file : {unityOutputManifestFilePath}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFatal, $"Not found output {nameof(AssetBundleManifest)} file : {unityOutputManifestFilePath}");
+                throw new Exception(message);
             }
 
             BuildLogger.Log("UnityEngine build success !");

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs

@@ -12,14 +12,9 @@ namespace YooAsset.Editor
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
-                if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-                {
-                    CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
-                }
+                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
 
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(context);
+            CreateManifestFile(true, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs

@@ -9,17 +9,13 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild && buildMode != EBuildMode.DryRunBuild)
-            {
-                CreatePackageCatalog(buildParameters, buildMapContext);
-            }
+            CreatePackagePatch(buildParameters, buildMapContext);
         }
 
         /// <summary>
         /// 拷贝补丁文件到补丁包目录
         /// </summary>
-        private void CreatePackageCatalog(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+        private void CreatePackagePatch(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
         {
             string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
             string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs

@@ -13,12 +13,7 @@ namespace YooAsset.Editor
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild)
-            {
-                CreateReportFile(buildParameters, buildMapContext, manifestContext);
-            }
+            CreateReportFile(buildParameters, buildMapContext, manifestContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
+
 namespace YooAsset.Editor
 {
     public class TaskEncryption_BBP : TaskEncryption, IBuildTask
@@ -12,12 +7,7 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-            {
-                EncryptingBundleFiles(buildParameters, buildMapContext);
-            }
+            EncryptingBundleFiles(buildParameters, buildMapContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(false, buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs

@@ -17,13 +17,42 @@ namespace YooAsset.Editor
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
 
+            // 检测是否有未保存场景
+            if (EditorTools.HasDirtyScenes())
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.FoundUnsavedScene, "Found unsaved scene !");
+                throw new Exception(message);
+            }
+
+            // 删除包裹目录
+            if (buildParameters.ClearBuildCacheFiles)
+            {
+                string packageRootDirectory = buildParameters.GetPackageRootDirectory();
+                if (EditorTools.DeleteDirectory(packageRootDirectory))
+                {
+                    BuildLogger.Log($"Delete package root directory: {packageRootDirectory}");
+                }
+            }
+
+            // 检测包裹输出目录是否存在
+            string packageOutputDirectory = buildParameters.GetPackageOutputDirectory();
+            if (Directory.Exists(packageOutputDirectory))
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageOutputDirectoryExists, $"Package outout directory exists: {packageOutputDirectory}");
+                throw new Exception(message);
+            }
+
+            // 如果输出目录不存在
+            string pipelineOutputDirectory = buildParameters.GetPipelineOutputDirectory();
+            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
+            {
+                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
+            }
+
             // 检测Unity版本
 #if UNITY_2021_3_OR_NEWER
-            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
-            {
-                string warning = BuildLogger.GetErrorMessage(ErrorCode.RecommendScriptBuildPipeline, $"Starting with UnityEngine2021, recommend use script build pipeline (SBP) !");
-                BuildLogger.Warning(warning);
-            }
+            string warning = BuildLogger.GetErrorMessage(ErrorCode.RecommendScriptBuildPipeline, $"Starting with UnityEngine2021, recommend use script build pipeline (SBP) !");
+            BuildLogger.Warning(warning);
 #endif
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs

@@ -15,77 +15,45 @@ namespace YooAsset.Editor
 
         protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var parameters = buildParametersContext.Parameters;
-            var buildMode = parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+            var buildResult = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
+            var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
+            if (hash.isValid)
             {
-                return "00000000000000000000000000000000"; //32位
+                return hash.ToString();
             }
             else
             {
-                var buildResult = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
-                var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
-                if (hash.isValid)
-                {
-                    return hash.ToString();
-                }
-                else
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleHash, $"Not found unity bundle hash : {bundleInfo.BundleName}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleHash, $"Not found unity bundle hash : {bundleInfo.BundleName}");
+                throw new Exception(message);
             }
         }
         protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var parameters = buildParametersContext.Parameters;
-            var buildMode = parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+            string filePath = bundleInfo.BuildOutputFilePath;
+            if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
             {
-                return 0;
+                return crc;
             }
             else
             {
-                string filePath = bundleInfo.BuildOutputFilePath;
-                if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
-                {
-                    return crc;
-                }
-                else
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleCRC, $"Not found unity bundle crc : {bundleInfo.BundleName}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleCRC, $"Not found unity bundle crc : {bundleInfo.BundleName}");
+                throw new Exception(message);
             }
         }
         protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-                return GetFilePathTempHash(filePath);
-            else
-                return HashUtility.FileMD5(filePath);
+            return HashUtility.FileMD5(filePath);
         }
         protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-                return "00000000"; //8位
-            else
-                return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-                return GetBundleTempSize(bundleInfo);
-            else
-                return FileUtility.GetFileSize(filePath);
+            return FileUtility.GetFileSize(filePath);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs

@@ -15,10 +15,6 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
 
-            // 模拟构建模式下跳过验证
-            if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
-                return;
-
             // 验证构建结果
             if (buildParameters.VerifyBuildingResult)
             {
@@ -32,15 +28,14 @@ namespace YooAsset.Editor
         /// </summary>
         private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
+            string[] unityBuildContent = unityManifest.GetAllAssetBundles();
 
-            // 1. 过滤掉原生Bundle
-            string[] mapBundles = buildMapContext.Collection.Select(t => t.BundleName).ToArray();
+            // 1. 计划内容
+            string[] planningContent = buildMapContext.Collection.Select(t => t.BundleName).ToArray();
 
-            // 2. 验证Bundle
-            List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
+            // 2. 验证差异
+            List<string> exceptBundleList1 = unityBuildContent.Except(planningContent).ToList();
             if (exceptBundleList1.Count > 0)
             {
                 foreach (var exceptBundle in exceptBundleList1)
@@ -53,8 +48,8 @@ namespace YooAsset.Editor
                 throw new Exception(exception);
             }
 
-            // 3. 验证Bundle
-            List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
+            // 3. 验证差异
+            List<string> exceptBundleList2 = planningContent.Except(unityBuildContent).ToList();
             if (exceptBundleList2.Count > 0)
             {
                 foreach (var exceptBundle in exceptBundleList2)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs

@@ -34,18 +34,12 @@ namespace YooAsset.Editor
             BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
             opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
 
-            if (BuildMode == EBuildMode.DryRunBuild)
-            {
-                opt |= BuildAssetBundleOptions.DryRunBuild;
-                return opt;
-            }
-
             if (CompressOption == ECompressOption.Uncompressed)
                 opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
             else if (CompressOption == ECompressOption.LZ4)
                 opt |= BuildAssetBundleOptions.ChunkBasedCompression;
 
-            if (BuildMode == EBuildMode.ForceRebuild)
+            if (ClearBuildCacheFiles)
                 opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
             if (DisableWriteTypeTree)
                 opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs

@@ -8,8 +8,15 @@ namespace YooAsset.Editor
     {
         public BuildResult Run(BuildParameters buildParameters, bool enableLog)
         {
-            AssetBundleBuilder builder = new AssetBundleBuilder();
-            return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            if (buildParameters is BuiltinBuildParameters)
+            {              
+                AssetBundleBuilder builder = new AssetBundleBuilder();
+                return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            }
+            else
+            {
+                throw new Exception($"Invalid build parameter type : {buildParameters.GetType().Name}");
+            }
         }
 
         /// <summary>

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 12f78ad22f0513c44b6037469dbd6363
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1138888cdba447345abb498b0c89affa
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs

@@ -0,0 +1,18 @@
+
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateManifest_ESBP : TaskCreateManifest, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            CreateManifestFile(false, false, context);
+        }
+
+        protected override string[] GetBundleDepends(BuildContext context, string bundleName)
+        {
+            return Array.Empty<string>();
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 120e126cc10604c4f811c3b6377f7452
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskGetBuildMap_ESBP.cs

@@ -0,0 +1,15 @@
+
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskGetBuildMap_ESBP : TaskGetBuildMap, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            var buildMapContext = CreateBuildMap(true, buildParametersContext.Parameters);
+            context.SetContextObject(buildMapContext);
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskGetBuildMap_ESBP.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 789c337b5b82f1c438a588982dfca346
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskPrepare_ESBP.cs

@@ -0,0 +1,17 @@
+
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskPrepare_ESBP : IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            var buildParameters = buildParametersContext.Parameters;
+
+            // 检测基础构建参数
+            buildParametersContext.CheckBuildParameters();
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskPrepare_ESBP.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: abbe56a7120e34349b10f20956ed51a7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs

@@ -0,0 +1,63 @@
+
+using System.Text;
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskUpdateBundleInfo_ESBP : TaskUpdateBundleInfo, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            UpdateBundleInfo(context);
+        }
+
+        protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
+        {
+            return "00000000000000000000000000000000"; //32位
+        }
+        protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
+        {
+            return 0;
+        }
+        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            string filePath = bundleInfo.PackageSourceFilePath;
+            return GetFilePathTempHash(filePath);
+        }
+        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            return "00000000"; //8位
+        }
+        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            return GetBundleTempSize(bundleInfo);
+        }
+
+        private string GetFilePathTempHash(string filePath)
+        {
+            byte[] bytes = Encoding.UTF8.GetBytes(filePath);
+            return HashUtility.BytesMD5(bytes);
+
+            // 注意：在文件路径的哈希值冲突的情况下，可以使用下面的方法
+            //return $"{HashUtility.BytesMD5(bytes)}-{Guid.NewGuid():N}";
+        }
+        private long GetBundleTempSize(BuildBundleInfo bundleInfo)
+        {
+            long tempSize = 0;
+
+            var assetPaths = bundleInfo.GetAllPackAssetPaths();
+            foreach (var assetPath in assetPaths)
+            {
+                long size = FileUtility.GetFileSize(assetPath);
+                tempSize += size;
+            }
+
+            if (tempSize == 0)
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BundleTempSizeIsZero, $"Bundle temp size is zero, check bundle main asset list : {bundleInfo.BundleName}");
+                throw new Exception(message);
+            }
+            return tempSize;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 990b41f647b80a34ab666a3b0c1ba3f6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildParameters.cs

@@ -0,0 +1,7 @@
+
+namespace YooAsset.Editor
+{
+    public class EditorSimulateBuildParameters : BuildParameters
+    {
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildParameters.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 03ea37371e6dc644cb2e6eabf9e7e2ad
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildPipeline.cs

@@ -0,0 +1,37 @@
+
+using System.Collections.Generic;
+using System;
+
+namespace YooAsset.Editor
+{
+    public class EditorSimulateBuildPipeline : IBuildPipeline
+    {
+        public BuildResult Run(BuildParameters buildParameters, bool enableLog)
+        {
+            if (buildParameters is EditorSimulateBuildParameters)
+            {
+                AssetBundleBuilder builder = new AssetBundleBuilder();
+                return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            }
+            else
+            {
+                throw new Exception($"Invalid build parameter type : {buildParameters.GetType().Name}");
+            }
+        }
+        
+        /// <summary>
+        /// 获取默认的构建流程
+        /// </summary>
+        private List<IBuildTask> GetDefaultBuildPipeline()
+        {
+            List<IBuildTask> pipeline = new List<IBuildTask>
+                {
+                    new TaskPrepare_ESBP(),
+                    new TaskGetBuildMap_ESBP(),
+                    new TaskUpdateBundleInfo_ESBP(),
+                    new TaskCreateManifest_ESBP()
+                };
+            return pipeline;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildPipeline.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9caf8e4846ad8b64eb04a4d5179942ff
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs

@@ -10,14 +10,8 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-            {
-                CopyRawBundle(buildMapContext, buildParametersContext);
-            }
+            CopyRawBundle(buildMapContext, buildParametersContext);
         }
 
         /// <summary>
@@ -29,7 +23,7 @@ namespace YooAsset.Editor
             foreach (var bundleInfo in buildMapContext.Collection)
             {
                 string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-                foreach (var buildAsset in bundleInfo.MainAssets)
+                foreach (var buildAsset in bundleInfo.AllPackAssets)
                 {
                     EditorTools.CopyFile(buildAsset.AssetInfo.AssetPath, dest, true);
                 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs

@@ -13,13 +13,9 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters;
             var manifestContext = context.GetContextObject<ManifestContext>();
-
-            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+            if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
-                if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-                {
-                    CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
-                }
+                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs

@@ -9,12 +9,12 @@ namespace YooAsset.Editor
     {
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(context);
+            CreateManifestFile(false, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)
         {
-            return new string[] { };
+            return Array.Empty<string>();
         }
     }
 }