增加空判断
This commit is contained in:
parent
ca9f64276d
commit
421a072c7f
@ -39,7 +39,10 @@ public class Launch : MonoBehaviour
|
|||||||
|
|
||||||
yield return UIKit.OpenPanelAsync<UILoading>();
|
yield return UIKit.OpenPanelAsync<UILoading>();
|
||||||
yield return new WaitUntil(() => isLoadFinished == true);
|
yield return new WaitUntil(() => isLoadFinished == true);
|
||||||
yield return ActionHelper.GetActionAndSub(Global.Instance.appData.preLoad.action).Start(this);
|
if (Global.Instance.appData.preLoad != null && Global.Instance.appData.preLoad.action != null)
|
||||||
|
{
|
||||||
|
yield return ActionHelper.GetActionAndSub(Global.Instance.appData.preLoad.action).Start(this);
|
||||||
|
}
|
||||||
yield return UIKit.OpenPanelAsync<UIModeSelect>();
|
yield return UIKit.OpenPanelAsync<UIModeSelect>();
|
||||||
UIKit.HidePanel<UILoading>();
|
UIKit.HidePanel<UILoading>();
|
||||||
|
|
||||||
|
|||||||
@ -134,7 +134,6 @@ namespace XMLTool
|
|||||||
// ³õʼ»¯AppData¶ÔÏó
|
// ³õʼ»¯AppData¶ÔÏó
|
||||||
AppData appData = new AppData
|
AppData appData = new AppData
|
||||||
{
|
{
|
||||||
preLoad = new PreLoad(),
|
|
||||||
Modules = new List<Module>(),
|
Modules = new List<Module>(),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -143,6 +142,7 @@ namespace XMLTool
|
|||||||
var preLoadElement = appDataElement.Element("PreLoad");
|
var preLoadElement = appDataElement.Element("PreLoad");
|
||||||
if (preLoadElement!=null)
|
if (preLoadElement!=null)
|
||||||
{
|
{
|
||||||
|
appData.preLoad = new PreLoad();
|
||||||
foreach (XElement actionElement in preLoadElement.Elements("Action"))
|
foreach (XElement actionElement in preLoadElement.Elements("Action"))
|
||||||
{
|
{
|
||||||
var action = ParseAction(actionElement);
|
var action = ParseAction(actionElement);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user