Merge branch 'master' into LouDi_Quan

This commit is contained in:
shenjianxing 2025-01-13 09:11:47 +08:00
commit 62d13b98ea
2 changed files with 14 additions and 6 deletions

View File

@ -48,7 +48,15 @@ public class DeviceItem : MonoBehaviour
bool.TryParse(obj[0], out isActive);
if (obj.Length == 1 || (obj.Length > 1 && obj[1] == device.Name))
{
gameObject.GetComponent<HighlightTrigger>().enabled = isActive;
var high = gameObject.GetComponent<HighlightTrigger>();
if (high != null)
{
gameObject.GetComponent<HighlightTrigger>().enabled = isActive;
}
else
{
Debug.LogError(device.Name + "身上没有高亮组件");
}
}
}
}

View File

@ -12,11 +12,6 @@ namespace QFramework.Example
protected override void OnInit(IUIData uiData = null)
{
mData = uiData as UIModeSelectData ?? new UIModeSelectData();
// please add init code here
}
protected override void OnOpen(IUIData uiData = null)
{
TechBtn.onClick.AddListener(() =>
{
Hide();
@ -31,6 +26,11 @@ namespace QFramework.Example
});
}
protected override void OnOpen(IUIData uiData = null)
{
}
protected override void OnShow()
{