JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: JiNan:6b36d58a47b6d7c92235c0e7853c6f7b83933b97
Branches Tags
JiNan:NewMaster
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main
..
compare: JiNan:22ff85a6cff0c5000c08264341c47c1d678670e0
Branches Tags
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:NewMaster
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main

No commits in common. "6b36d58a47b6d7c92235c0e7853c6f7b83933b97" and "22ff85a6cff0c5000c08264341c47c1d678670e0" have entirely different histories.
6b36d58a47 ... 22ff85a6cf

2 changed files with 2 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
Assets/Scripts/UI/UIBody3D.cs
View File

@ -421,6 +421,7 @@ namespace QFramework.Example
bodyItem.transform.Find("Content/Btns").gameObject.SetActive(false); bodyItem.transform.Find("Content/Btns").gameObject.SetActive(false);
bodyItem.transform.Find("Content/Label").GetComponent<TextMeshProUGUI>().text = body.Name; bodyItem.transform.Find("Content/Label").GetComponent<TextMeshProUGUI>().text = body.Name;
var bodyToggle = bodyItem.GetComponent<Toggle>(); var bodyToggle = bodyItem.GetComponent<Toggle>();
bodyToggle.isOn = body.isShow;
GameObject obj = Utility.FindObj(body.Path); GameObject obj = Utility.FindObj(body.Path);
obj.SetActive(body.isShow); obj.SetActive(body.isShow);
bodyToggle.onValueChanged.AddListener(isOn => bodyToggle.onValueChanged.AddListener(isOn =>
@ -428,7 +429,6 @@ namespace QFramework.Example
SetAllChildren<Transform>(obj.transform, isOn); SetAllChildren<Transform>(obj.transform, isOn);
obj.SetActive(isOn); obj.SetActive(isOn);
}); });
bodyToggle.isOn = body.isShow;
var iconImg = bodyItem.transform.Find("Icon").GetComponent<Image>(); var iconImg = bodyItem.transform.Find("Icon").GetComponent<Image>();
LoadIcon(body.Icon, body, iconImg); LoadIcon(body.Icon, body, iconImg);
} }

9
Assets/Scripts/UI/UIBody3DMenuTree.cs
View File

@ -348,7 +348,6 @@ namespace QFramework.Example
for (int i = 0; i < parent.childCount; i++) for (int i = 0; i < parent.childCount; i++)
{ {
Transform child = parent.GetChild(i); Transform child = parent.GetChild(i);
Transform subContent = child.Find("SubContent");
Transform labelTransform = child.Find("Content/Toggle/Content/Label"); Transform labelTransform = child.Find("Content/Toggle/Content/Label");
if (labelTransform != null) if (labelTransform != null)
{ {
@ -360,6 +359,7 @@ namespace QFramework.Example
{ {
GameObject clone = GameObject.Instantiate(SearchItem.gameObject, SearchContent); GameObject clone = GameObject.Instantiate(SearchItem.gameObject, SearchContent);
searchItemMap.Add(clone, child.gameObject); searchItemMap.Add(clone, child.gameObject);
Transform subContent = child.Find("SubContent");
Button btn = clone.transform.Find("Button").GetComponent<Button>(); Button btn = clone.transform.Find("Button").GetComponent<Button>();
btn.onClick.AddListener(() => btn.onClick.AddListener(() =>
{ {
@ -383,13 +383,6 @@ namespace QFramework.Example
} }
} }
} }
else
{
if (subContent.childCount > 0)
{
CheckChildren(subContent, str);
}
}
} }
} }
} }