1

Assets/BITKit/Core/Applation/BITApp.cs

@@ -172,22 +172,16 @@ namespace BITKit
         /// <summary>
         /// 依赖服务集合
         /// </summary>
-        public static ServiceCollection ServiceCollection { get; internal set; } = new();
+        public static ServiceCollection ServiceCollection { get; set; } = new();
         /// <summary>
         /// 依赖服务提供接口
         /// </summary>
-        public static ServiceProvider ServiceProvider { get; private set; }
-        public static ServiceProvider BuildServiceProvider()
+        public static ServiceProvider ServiceProvider
         {
-            var value = ServiceProvider = ServiceCollection.BuildServiceProvider();
-            OnServiceProviderBuild?.Invoke(value);
-            return value;
+            get=>_serviceProvider??=ServiceCollection.BuildServiceProvider();
+            set => _serviceProvider = value;
         }
-
-        /// <summary>
-        /// 服务创建后的回调
-        /// </summary>
-        public static Action<ServiceProvider> OnServiceProviderBuild;
+        private static ServiceProvider _serviceProvider;
         /// <summary>
         /// 主线程
         /// </summary>

Assets/BITKit/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs

@@ -29,6 +29,7 @@ namespace BITKit.UX
 		public VisualElement RootVisualElement { get; set; }
 		protected VisualTreeAsset VisualTreeAsset { get; private set; }
 		private readonly ValidHandle _isBusy = new();
+		public readonly UniTaskCompletionSource WaitUtilInitialized = new();
 		protected UIToolKitPanel(IUXService uxService)
 		{
 			UXService = uxService;
@@ -76,6 +77,8 @@ namespace BITKit.UX
 				UXUtils.Inject(this);
 				
 				RootVisualElement.SetActive(false);
+				
+				WaitUtilInitialized.TrySetResult();
 			}
 		}
 		

Assets/BITKit/Unity/Scripts/UX/Service/UI Toolkit/UIToolkitSubPanel.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using BITKit.UX;
-using UnityEngine;
-
-public class UIToolkitSubPanel
-{
-    public UIToolkitSubPanel()
-    {
-    }
-}