diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index b785582a..e112da0f 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -261,7 +261,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 50 + field of view: 25 orthographic: 0 orthographic size: 5 m_Depth: -1 diff --git a/Assets/Scripts/Conditions/UIClickCondition.cs b/Assets/Scripts/Conditions/UIClickCondition.cs index bdfc53f5..2f705764 100644 --- a/Assets/Scripts/Conditions/UIClickCondition.cs +++ b/Assets/Scripts/Conditions/UIClickCondition.cs @@ -62,6 +62,7 @@ namespace QFramework { Deinited = true; mCondition = null; + obj = null; mSimpleObjectPool.Recycle(this); } } diff --git a/Assets/Scripts/UI/UITextTip.cs b/Assets/Scripts/UI/UITextTip.cs index f679bc37..b7738738 100644 --- a/Assets/Scripts/UI/UITextTip.cs +++ b/Assets/Scripts/UI/UITextTip.cs @@ -3,6 +3,7 @@ using UnityEngine.UI; using QFramework; using System.Collections.Generic; using TMPro; +using System.Text.RegularExpressions; namespace QFramework.Example { @@ -25,7 +26,7 @@ namespace QFramework.Example protected override void OnOpen(IUIData uiData = null) { mData = uiData as UITextTipData ?? new UITextTipData(); - Des.text = mData.text; + Des.text = Regex.Replace(mData.text, @"\\n", "\n"); BtnContent.RemoveAllChildren(); foreach (var item in mData.btns) { diff --git a/Assets/Scripts/UI/UITools.cs b/Assets/Scripts/UI/UITools.cs index f829a955..ff0635ce 100644 --- a/Assets/Scripts/UI/UITools.cs +++ b/Assets/Scripts/UI/UITools.cs @@ -58,7 +58,7 @@ namespace QFramework.Example { if (success) { - var texture2D = Utility.GetSprite(res.Asset as Texture2D); + icon.sprite = Utility.GetSprite(res.Asset as Texture2D); } }); Button btn = obj.GetComponent