From 7b1f639412d4ba3b750e25ae9407a5340a190f8f Mon Sep 17 00:00:00 2001 From: PopSlime Date: Tue, 15 Nov 2022 12:12:29 +0800 Subject: [PATCH] Code cleanup. --- Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs | 3 +-- Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs | 3 +-- Assets/Cryville/Crtr/Browsing/PropertyPanel.cs | 2 +- Assets/Cryville/Crtr/Config/InputConfig.cs | 6 ++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs b/Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs index 74db3a1..c5c775e 100644 --- a/Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs +++ b/Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs @@ -200,8 +200,7 @@ namespace Cryville.Common.Unity.UI { void GenerateLine(int index, int line) { for (int j = 0; j < LineItemCount; j++) { - var child = GameObject.Instantiate(m_itemTemplate); - child.transform.SetParent(transform, false); + var child = GameObject.Instantiate(m_itemTemplate, transform, false); lines[index][j] = child; } LoadLine(index, line); diff --git a/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs b/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs index 9daea16..33b9bc1 100644 --- a/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs +++ b/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs @@ -32,8 +32,7 @@ namespace Cryville.Crtr.Browsing { public void Load(string name, IEnumerable props, object target) { Name = name.ToUpper(); foreach (var prop in props) { - var obj = GameObject.Instantiate(m_propertyPrefab); - obj.transform.SetParent(transform, false); + var obj = GameObject.Instantiate(m_propertyPrefab, transform, false); obj.GetComponent().Load(prop, target); } } diff --git a/Assets/Cryville/Crtr/Browsing/PropertyPanel.cs b/Assets/Cryville/Crtr/Browsing/PropertyPanel.cs index 70b0425..570d425 100644 --- a/Assets/Cryville/Crtr/Browsing/PropertyPanel.cs +++ b/Assets/Cryville/Crtr/Browsing/PropertyPanel.cs @@ -33,7 +33,7 @@ namespace Cryville.Crtr.Browsing { if (prop.PropertyType == typeof(bool)) vp = m_bool; else if (prop.PropertyType == typeof(float) || prop.PropertyType == typeof(int)) vp = m_number; else return; - _value = GameObject.Instantiate(vp, _valueContainer).GetComponent(); + _value = GameObject.Instantiate(vp, _valueContainer, false).GetComponent(); if (_value is PVPNumber) { var t = (PVPNumber)_value; t.IntegerMode = prop.PropertyType == typeof(int); diff --git a/Assets/Cryville/Crtr/Config/InputConfig.cs b/Assets/Cryville/Crtr/Config/InputConfig.cs index 6900008..8bb39e8 100644 --- a/Assets/Cryville/Crtr/Config/InputConfig.cs +++ b/Assets/Cryville/Crtr/Config/InputConfig.cs @@ -66,8 +66,7 @@ namespace Cryville.Crtr.Config { ruleset.LoadPdt(dir); _proxy = new InputProxy(ruleset.Root, null); foreach (var i in ruleset.Root.inputs) { - var e = GameObject.Instantiate(m_prefabInputConfigEntry).GetComponent(); - e.transform.SetParent(m_entryList.transform); + var e = GameObject.Instantiate(m_prefabInputConfigEntry, m_entryList.transform).GetComponent(); _entries.Add(i.Key, e); e.SetKey(this, i.Key); } @@ -92,8 +91,7 @@ namespace Cryville.Crtr.Config { void AddSourceItem(InputSource? src) { if (_recvsrcs.Contains(src)) return; _recvsrcs.Add(src); - var obj = Instantiate(m_prefabListItem); - obj.transform.SetParent(m_deviceList); + var obj = Instantiate(m_prefabListItem, m_deviceList); obj.transform.Find("Text").GetComponent().text = src == null ? "None" : src.Value.Handler.GetTypeName(src.Value.Type); var btn = obj.GetComponent