Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Code cleanup.

Browse Source
This commit is contained in:
PopSlime
2022-11-15 12:12:29 +08:00
parent fcc9935325
commit 7b1f639412
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs
View File

@@ -200,8 +200,7 @@ namespace Cryville.Common.Unity.UI {
void GenerateLine(int index, int line) { void GenerateLine(int index, int line) {
for (int j = 0; j < LineItemCount; j++) { for (int j = 0; j < LineItemCount; j++) {
var child = GameObject.Instantiate(m_itemTemplate); var child = GameObject.Instantiate(m_itemTemplate, transform, false);
child.transform.SetParent(transform, false);
lines[index][j] = child; lines[index][j] = child;
} }
LoadLine(index, line); LoadLine(index, line);

3
Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs
View File

@@ -32,8 +32,7 @@ namespace Cryville.Crtr.Browsing {
public void Load(string name, IEnumerable<PropertyInfo> props, object target) { public void Load(string name, IEnumerable<PropertyInfo> props, object target) {
Name = name.ToUpper(); Name = name.ToUpper();
foreach (var prop in props) { foreach (var prop in props) {
var obj = GameObject.Instantiate<GameObject>(m_propertyPrefab); var obj = GameObject.Instantiate<GameObject>(m_propertyPrefab, transform, false);
obj.transform.SetParent(transform, false);
obj.GetComponent<PropertyPanel>().Load(prop, target); obj.GetComponent<PropertyPanel>().Load(prop, target);
} }
} }

2
Assets/Cryville/Crtr/Browsing/PropertyPanel.cs
View File

@@ -33,7 +33,7 @@ namespace Cryville.Crtr.Browsing {
if (prop.PropertyType == typeof(bool)) vp = m_bool; if (prop.PropertyType == typeof(bool)) vp = m_bool;
else if (prop.PropertyType == typeof(float) || prop.PropertyType == typeof(int)) vp = m_number; else if (prop.PropertyType == typeof(float) || prop.PropertyType == typeof(int)) vp = m_number;
else return; else return;
_value = GameObject.Instantiate(vp, _valueContainer).GetComponent<PropertyValuePanel>(); _value = GameObject.Instantiate(vp, _valueContainer, false).GetComponent<PropertyValuePanel>();
if (_value is PVPNumber) { if (_value is PVPNumber) {
var t = (PVPNumber)_value; var t = (PVPNumber)_value;
t.IntegerMode = prop.PropertyType == typeof(int); t.IntegerMode = prop.PropertyType == typeof(int);

6
Assets/Cryville/Crtr/Config/InputConfig.cs
View File

@@ -66,8 +66,7 @@ namespace Cryville.Crtr.Config {
ruleset.LoadPdt(dir); ruleset.LoadPdt(dir);
_proxy = new InputProxy(ruleset.Root, null); _proxy = new InputProxy(ruleset.Root, null);
foreach (var i in ruleset.Root.inputs) { foreach (var i in ruleset.Root.inputs) {
var e = GameObject.Instantiate(m_prefabInputConfigEntry).GetComponent<InputConfigEntry>(); var e = GameObject.Instantiate(m_prefabInputConfigEntry, m_entryList.transform).GetComponent<InputConfigEntry>();
e.transform.SetParent(m_entryList.transform);
_entries.Add(i.Key, e); _entries.Add(i.Key, e);
e.SetKey(this, i.Key); e.SetKey(this, i.Key);
} }
@@ -92,8 +91,7 @@ namespace Cryville.Crtr.Config {
void AddSourceItem(InputSource? src) { void AddSourceItem(InputSource? src) {
if (_recvsrcs.Contains(src)) return; if (_recvsrcs.Contains(src)) return;
_recvsrcs.Add(src); _recvsrcs.Add(src);
var obj = Instantiate(m_prefabListItem); var obj = Instantiate(m_prefabListItem, m_deviceList);
obj.transform.SetParent(m_deviceList);
obj.transform.Find("Text").GetComponent<Text>().text = src == null ? "None" : src.Value.Handler.GetTypeName(src.Value.Type); obj.transform.Find("Text").GetComponent<Text>().text = src == null ? "None" : src.Value.Handler.GetTypeName(src.Value.Type);
var btn = obj.GetComponent<Button>(); var btn = obj.GetComponent<Button>();
if (src != null) btn.interactable = !_proxy.IsUsed(src.Value); if (src != null) btn.interactable = !_proxy.IsUsed(src.Value);