diff --git a/Assets/Scripts/Actions/AudioAction.cs b/Assets/Scripts/Actions/AudioAction.cs index d3d29e6d..058b067b 100644 --- a/Assets/Scripts/Actions/AudioAction.cs +++ b/Assets/Scripts/Actions/AudioAction.cs @@ -155,7 +155,7 @@ namespace QFramework { OnFinished = null; Deinited = true; - loader.Recycle2Cache(); + loader?.Recycle2Cache(); mPool.Recycle(this); } } diff --git a/Assets/Scripts/Item/DeviceItem.cs b/Assets/Scripts/Item/DeviceItem.cs index 4d7aa614..0821ed95 100644 --- a/Assets/Scripts/Item/DeviceItem.cs +++ b/Assets/Scripts/Item/DeviceItem.cs @@ -21,7 +21,7 @@ public class DeviceItem : MonoBehaviour { gameObject.GetOrAddComponent(); } - else if (string.IsNullOrEmpty(device.BoxColliderSize)==false) + else if (string.IsNullOrEmpty(device.BoxColliderSize) == false) { BoxCollider box = gameObject.GetOrAddComponent(); box.size = Utility.GetVector3FromStrArray(device.BoxColliderSize); @@ -40,6 +40,15 @@ public class DeviceItem : MonoBehaviour } } + private void OnMouseUpAsButton() + { + var effect = gameObject.GetComponent(); + if (effect != null) + { + effect.highlighted = false; + } + } + } diff --git a/Assets/Scripts/Item/TipItem.cs b/Assets/Scripts/Item/TipItem.cs index 4adfa644..d0f746b0 100644 --- a/Assets/Scripts/Item/TipItem.cs +++ b/Assets/Scripts/Item/TipItem.cs @@ -41,4 +41,12 @@ public class TipItem : MonoBehaviour tip.Active(false); } } + + private void OnMouseUpAsButton() + { + if (tip != null) + { + tip.Active(false); + } + } }