From ee4c50c696148e5c889c0a5f2268e51d39ea2039 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Wed, 8 Jan 2025 17:20:18 +0800 Subject: [PATCH] =?UTF-8?q?module=E6=94=AF=E6=8C=81=E6=9C=89=E5=BA=8F?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Actions/LoadResAction.cs | 13 +++++++++---- Assets/Scripts/Launch.cs | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Assets/Scripts/Actions/LoadResAction.cs b/Assets/Scripts/Actions/LoadResAction.cs index 9e8321df..a164d8c4 100644 --- a/Assets/Scripts/Actions/LoadResAction.cs +++ b/Assets/Scripts/Actions/LoadResAction.cs @@ -58,10 +58,15 @@ namespace QFramework XDocument doc = XDocument.Parse(xmlStr); // ȡԪ XElement moduleXml = doc.Root; - Global.moduleDict.Add(index, moduleXml); - - // ֱӼػᵼ - //XmlParser.LoadModule(moduleXml, Global.Instance.appData); + if (string.IsNullOrEmpty(index)) + { + // + XmlParser.LoadModule(moduleXml, Global.Instance.appData); + } + else + { + Global.moduleDict.Add(index, moduleXml); + } } } }); diff --git a/Assets/Scripts/Launch.cs b/Assets/Scripts/Launch.cs index 81b66925..cfe71e87 100644 --- a/Assets/Scripts/Launch.cs +++ b/Assets/Scripts/Launch.cs @@ -41,19 +41,21 @@ public class Launch : MonoBehaviour yield return new WaitUntil(() => isLoadFinished == true); if (Global.Instance.appData.preLoad != null && Global.Instance.appData.preLoad.action != null) { - yield return ActionHelper.GetActionAndSub(Global.Instance.appData.preLoad.action).Start(this); - } - // ʱ - if (Global.moduleDict.Count > 0) - { - for (int i = 0; i < Global.moduleDict.Count; i++) + yield return ActionHelper.GetActionAndSub(Global.Instance.appData.preLoad.action).Start(this, () => { - string index = (i + 1).ToString(); - if (Global.moduleDict.ContainsKey(index)) + // ʱ + if (Global.moduleDict.Count > 0) { - XmlParser.LoadModule(Global.moduleDict[index], Global.Instance.appData); + for (int i = 0; i < Global.moduleDict.Count; i++) + { + string index = (i + 1).ToString(); + if (Global.moduleDict.ContainsKey(index)) + { + XmlParser.LoadModule(Global.moduleDict[index], Global.Instance.appData); + } + } } - } + }); } yield return UIKit.OpenPanelAsync(); UIKit.HidePanel();