From c79782b30753becda65d1ebdf57aa48f95813baf Mon Sep 17 00:00:00 2001 From: CortexCore <2630229280@qq.com> Date: Thu, 26 Dec 2024 18:00:05 +0800 Subject: [PATCH] 1 --- Src/Core/Ticker/ITicker.cs | 2 ++ Src/Unity/Scripts/Assets/BITFramework.cs | 11 ++++++++++- .../Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs | 9 ++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Src/Core/Ticker/ITicker.cs b/Src/Core/Ticker/ITicker.cs index 1825d11..f6820aa 100644 --- a/Src/Core/Ticker/ITicker.cs +++ b/Src/Core/Ticker/ITicker.cs @@ -83,6 +83,8 @@ namespace BITKit TickRate = 1; } + _timer.Interval = 1000d / TickRate; + _timer.Elapsed += OnElapsed; if (_isDisposed is false) diff --git a/Src/Unity/Scripts/Assets/BITFramework.cs b/Src/Unity/Scripts/Assets/BITFramework.cs index c33ad3b..7a1b2d0 100644 --- a/Src/Unity/Scripts/Assets/BITFramework.cs +++ b/Src/Unity/Scripts/Assets/BITFramework.cs @@ -142,8 +142,12 @@ namespace BITKit } } #endif +<<<<<<< Updated upstream #if UNITY_5_3_OR_NEWER if (IsEditorSimulateMode is false && isOffline) +======= + if (isOffline&& IsEditorSimulateMode is false) +>>>>>>> Stashed changes { initParameters = new OfflinePlayModeParameters(); } @@ -159,7 +163,12 @@ namespace BITKit try { initOperation = package.InitializeAsync(initParameters); - _progressLabel.text ="正在初始化资源系统..."; + + var text = $"正在初始化资源系统...,使用{initParameters.GetType().Name}"; + + _progressLabel.text =text; + + Debug.Log(text); } catch (Exception e) { diff --git a/Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs b/Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs index b144757..dc23628 100644 --- a/Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs +++ b/Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs @@ -46,6 +46,9 @@ namespace BITKit.UX VisualTreeAsset = await ModService.LoadAsset(DocumentPath); RootVisualElement = UXService.Root.As().Create(VisualTreeAsset); + + RootVisualElement.name = DocumentPath; + RootVisualElement.pickingMode = PickingMode.Ignore; RootVisualElement.style.position = Position.Absolute; RootVisualElement.style.left = 0; @@ -74,12 +77,12 @@ namespace BITKit.UX invisible.style.backgroundColor = new Color(0, 0, 0, 0.9f); } - UXUtils.Inject(this); + UXUtils.Inject(this,RootVisualElement); + + OnInitiated?.Invoke(); RootVisualElement.SetActive(false); - OnInitiated?.Invoke(); - await OnInitiatedAsync.UniTaskFunc(); WaitUtilInitialized.TrySetResult();