diff --git a/Assets/Scripts/Actions/AudioAction.cs b/Assets/Scripts/Actions/AudioAction.cs index 058b067b..fa30700d 100644 --- a/Assets/Scripts/Actions/AudioAction.cs +++ b/Assets/Scripts/Actions/AudioAction.cs @@ -119,6 +119,8 @@ namespace QFramework AudioKit.StopAllSound(); break; } + this.Finish(); + } } diff --git a/Assets/Scripts/UILongPicture/UIKnowledge.cs b/Assets/Scripts/UILongPicture/UIKnowledge.cs index cda7d498..26ec4b96 100644 --- a/Assets/Scripts/UILongPicture/UIKnowledge.cs +++ b/Assets/Scripts/UILongPicture/UIKnowledge.cs @@ -14,7 +14,8 @@ namespace QFramework.Example public partial class UIKnowledge : UIPanel { ResLoader loader; - + Transform content; + Transform subContent; Dictionary sprites = new Dictionary(); IAction curAction; @@ -32,6 +33,8 @@ namespace QFramework.Example UIKit.OpenPanelAsync().ToAction().StartGlobal(); }); + + } protected override void OnOpen(IUIData uiData = null) @@ -39,6 +42,7 @@ namespace QFramework.Example if (Global.Instance.curModule.knowledge != null && Global.Instance.curModule.knowledge.items != null) { LeftContent.RemoveAllChildren(); + GlobalComs.RemoveAllChildren(); string bg = Global.Instance.curModule.knowledge.bgImage; LoadBgImage(bg, () => { @@ -55,8 +59,10 @@ namespace QFramework.Example public void ItemFactory(XMLTool.Knowledge.Item itemData, Transform parent = null) { Transform content = parent == null ? LeftContent : parent; + GameObject leftObj = GameObject.Instantiate(LeftItem.gameObject, content); Transform subContent = leftObj.transform.Find("SubContent"); + Toggle toggle = leftObj.transform.Find("Toggle").GetComponent(); TextMeshProUGUI label = toggle.transform.Find("Name").GetComponent(); label.text = itemData.title; @@ -103,6 +109,7 @@ namespace QFramework.Example /// public void RefreshComponents(List coms, Transform content) { + int numIndex = 0; if (coms != null && coms.Count > 0) { foreach (var ComData in coms) @@ -111,6 +118,7 @@ namespace QFramework.Example { case "Button": GameObject btn = GameObject.Instantiate(BtnPrefab.gameObject, content); + btn.name ="Btn" +numIndex; btn.GetComponent().sizeDelta = Utility.GetVector2FromStrArray(ComData.size); btn.transform.localPosition = Utility.GetVector2FromStrArray(ComData.pos); btn.GetComponent