Compare commits

..

No commits in common. "987bf6b142b7db1aa3bd8822d7f5656ddaadbda2" and "926c3551b5496890c1ce0abb3eeda83455b9e606" have entirely different histories.

5 changed files with 9 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

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