JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into LouDi_Quan

Browse Source
This commit is contained in:
shenjianxing 2025-03-27 15:49:07 +08:00
commit 987bf6b142
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/QFramework/Toolkits/UIKit/Scripts/UIManager.cs
View File

@ -32,7 +32,6 @@ namespace QFramework
{ {
var uiRoot = UIRoot.Instance; var uiRoot = UIRoot.Instance;
Debug.Log("currentUIRoot:" + uiRoot); Debug.Log("currentUIRoot:" + uiRoot);
StringEventSystem.Global.Send("UIRootCreated");
mInstance = MonoSingletonProperty<UIManager>.Instance; mInstance = MonoSingletonProperty<UIManager>.Instance;
} }

6
Assets/Scripts/Actions/TimeLineAction.cs
View File

@ -60,14 +60,16 @@ public class TimeLineAction : IAction
public void OnExecute(float dt) public void OnExecute(float dt)
{ {
Debug.LogError($"time:{play.time * fps} >= curEnd:{curEndFrame} ");
if (curEndFrame != -1 && play.time * fps >= curEndFrame) if (curEndFrame != -1 && play.time * fps >= curEndFrame)
{ {
play.Stop();
play.time = curEndFrame / 24; play.time = curEndFrame / 24;
play.Evaluate(); play.Pause();
} }
if (play.state != PlayState.Playing) if (play.state != PlayState.Playing)
{ {
Debug.LogError("Finished");
Finished(); Finished();
} }
} }

1
Assets/Scripts/Launch.cs
View File

@ -41,6 +41,7 @@ public class Launch : MonoBehaviour
}); });
yield return UIKit.OpenPanelAsync<UILoading>(); yield return UIKit.OpenPanelAsync<UILoading>();
StringEventSystem.Global.Send("CloseDefaultLoading");
yield return UIKit.OpenPanelAsync<UIDeviceTip>(canvasLevel: UILevel.PopUI); yield return UIKit.OpenPanelAsync<UIDeviceTip>(canvasLevel: UILevel.PopUI);
UIKit.GetPanel<UIDeviceTip>().Hide(); UIKit.GetPanel<UIDeviceTip>().Hide();
yield return new WaitUntil(() => isLoadFinished == true); yield return new WaitUntil(() => isLoadFinished == true);

4
Assets/Scripts/LaunchLoading.cs
View File

@ -11,7 +11,7 @@ public class LaunchLoading : MonoBehaviour
private void Awake() private void Awake()
{ {
instance = this; instance = this;
StringEventSystem.Global.Register("UIRootCreated", OnUIRootCreated); StringEventSystem.Global.Register("CloseDefaultLoading", OnUIRootCreated);
} }
private void OnUIRootCreated() private void OnUIRootCreated()
@ -20,7 +20,7 @@ public class LaunchLoading : MonoBehaviour
} }
private void OnDestroy() private void OnDestroy()
{ {
StringEventSystem.Global.UnRegister("UIRootCreated", OnUIRootCreated); StringEventSystem.Global.UnRegister("CloseDefaultLoading", OnUIRootCreated);
} }
} }

6
Assets/Scripts/UI/UIModeSelect.cs
View File

@ -14,15 +14,13 @@ namespace QFramework.Example
mData = uiData as UIModeSelectData ?? new UIModeSelectData(); mData = uiData as UIModeSelectData ?? new UIModeSelectData();
TechBtn.onClick.AddListener(() => TechBtn.onClick.AddListener(() =>
{ {
Hide();
Global.appTpe = Global.AppType.Study; Global.appTpe = Global.AppType.Study;
UIKit.OpenPanelAsync<UIModuleSelect>().ToAction().StartGlobal(); UIKit.OpenPanelAsync<UIModuleSelect>().ToAction().StartGlobal(Hide);
}); });
ExamBtn.onClick.AddListener(() => ExamBtn.onClick.AddListener(() =>
{ {
Hide();
Global.appTpe = Global.AppType.Exam; Global.appTpe = Global.AppType.Exam;
UIKit.OpenPanelAsync<UIModuleSelect>().ToAction().StartGlobal(); UIKit.OpenPanelAsync<UIModuleSelect>().ToAction().StartGlobal(Hide);
}); });
} }