root
/
BITKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of http://server.bitfall.icu:3000/root/BITKit

This commit is contained in:
CortexCore 2024-12-26 23:07:17 +08:00
parent f1a6ede97b 47547df963
commit cd35241711
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Core/Ticker/ITicker.cs
View File

@ -83,6 +83,8 @@ namespace BITKit
TickRate = 1; TickRate = 1;
} }
_timer.Interval = 1000d / TickRate;
_timer.Elapsed += OnElapsed; _timer.Elapsed += OnElapsed;
if (_isDisposed is false) if (_isDisposed is false)

18
Src/Unity/Scripts/Assets/BITFramework.cs
View File

@ -142,24 +142,22 @@ namespace BITKit
} }
} }
#endif #endif
#if UNITY_5_3_OR_NEWER
if (IsEditorSimulateMode is false && isOffline) if (isOffline&& IsEditorSimulateMode is false)
{ {
initParameters = new OfflinePlayModeParameters(); initParameters = new OfflinePlayModeParameters();
} }
#else
if (isOffline)
{
initParameters = new OfflinePlayModeParameters();
}
#endif
InitializationOperation initOperation = null; InitializationOperation initOperation = null;
try try
{ {
initOperation = package.InitializeAsync(initParameters); initOperation = package.InitializeAsync(initParameters);
_progressLabel.text ="正在初始化资源系统...";
var text = $"正在初始化资源系统...,使用{initParameters.GetType().Name}";
_progressLabel.text =text;
Debug.Log(text);
} }
catch (Exception e) catch (Exception e)
{ {

9
Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs
View File

@ -50,6 +50,9 @@ namespace BITKit.UX
VisualTreeAsset = await ModService.LoadAsset<VisualTreeAsset>(DocumentPath); VisualTreeAsset = await ModService.LoadAsset<VisualTreeAsset>(DocumentPath);
RootVisualElement = UXService.Root.As<VisualElement>().Create(VisualTreeAsset); RootVisualElement = UXService.Root.As<VisualElement>().Create(VisualTreeAsset);
RootVisualElement.name = DocumentPath;
RootVisualElement.pickingMode = PickingMode.Ignore; RootVisualElement.pickingMode = PickingMode.Ignore;
RootVisualElement.style.position = Position.Absolute; RootVisualElement.style.position = Position.Absolute;
RootVisualElement.style.left = 0; RootVisualElement.style.left = 0;
@ -78,12 +81,12 @@ namespace BITKit.UX
invisible.style.backgroundColor = new Color(0, 0, 0, 0.9f); invisible.style.backgroundColor = new Color(0, 0, 0, 0.9f);
} }
UXUtils.Inject(this); UXUtils.Inject(this,RootVisualElement);
OnInitiated?.Invoke();
RootVisualElement.SetActive(false); RootVisualElement.SetActive(false);
OnInitiated?.Invoke();
await OnInitiatedAsync.UniTaskFunc(); await OnInitiatedAsync.UniTaskFunc();
WaitUtilInitialized.TrySetResult(); WaitUtilInitialized.TrySetResult();