Merge branch 'master' into LouDi_Quan
This commit is contained in:
commit
62d13b98ea
@ -47,9 +47,17 @@ public class DeviceItem : MonoBehaviour
|
||||
bool isActive = true;
|
||||
bool.TryParse(obj[0], out isActive);
|
||||
if (obj.Length == 1 || (obj.Length > 1 && obj[1] == device.Name))
|
||||
{
|
||||
var high = gameObject.GetComponent<HighlightTrigger>();
|
||||
if (high != null)
|
||||
{
|
||||
gameObject.GetComponent<HighlightTrigger>().enabled = isActive;
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError(device.Name + "身上没有高亮组件");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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()
|
||||
{
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user