This commit is contained in:
parent
1c00d8fb1c
commit
c79782b307
|
@ -83,6 +83,8 @@ namespace BITKit
|
|||
TickRate = 1;
|
||||
}
|
||||
|
||||
_timer.Interval = 1000d / TickRate;
|
||||
|
||||
_timer.Elapsed += OnElapsed;
|
||||
|
||||
if (_isDisposed is false)
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -46,6 +46,9 @@ namespace BITKit.UX
|
|||
VisualTreeAsset = await ModService.LoadAsset<VisualTreeAsset>(DocumentPath);
|
||||
|
||||
RootVisualElement = UXService.Root.As<VisualElement>().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();
|
||||
|
|
Loading…
Reference in New Issue