mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

trading in bugs for more bugs

Browse source 
gotta catch 'em all!
This commit is contained in:
ThatZeoMan 2022-08-18 13:13:26 -05:00
parent 715ae47c7a
commit 08bce95bb1
3 changed files with 28 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Assets/Scenes/Editor.unity
View file

@ -14016,7 +14016,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 704039020}
m_Direction: 0
m_Value: 0
m_Size: 0.032871284
m_Size: 0.03287128
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -19841,8 +19841,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
m_Size: 0.9978523
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -25461,7 +25461,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 129.92245}
m_AnchoredPosition: {x: 0, y: 129.8409}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1154875944
@ -27527,7 +27527,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1252591648}
- component: {fileID: 1252591649}
m_Layer: 5
m_Name: String
m_TagString: Untagged
@ -27556,29 +27555,6 @@ RectTransform:
m_AnchoredPosition: {x: -240.99994, y: 263.99997}
m_SizeDelta: {x: 537.35, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1252591649
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252591647}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3b7c76a246115c1459c963e93f7db056, type: 3}
m_Name:
m_EditorClassIdentifier:
caption: {fileID: 1980463955}
parameterManager: {fileID: 830452354}
slider: {fileID: 0}
inputField: {fileID: 0}
toggle: {fileID: 0}
dropdown: {fileID: 0}
ColorBTN: {fileID: 0}
ColorTable: {fileID: 0}
colorTableActive: 0
colorPreview: {fileID: 0}
inputFieldString: {fileID: 1425536044}
--- !u!1 &1254178913
GameObject:
m_ObjectHideFlags: 0
@ -35332,7 +35308,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1292844878}
m_HandleRect: {fileID: 1292844877}
m_Direction: 2
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -44916,7 +44892,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2086733128
RectTransform:
m_ObjectHideFlags: 0

11
Assets/Scripts/LevelEditor/Properties/PropController.cs
View file

@ -11,7 +11,6 @@ using HeavenStudio.Games;
namespace HeavenStudio.Properties
{
public class PropManager : MonoBehaviour
{
[Header("Property Prefabs")]
@ -56,13 +55,13 @@ namespace HeavenStudio.Properties
{
get
{
return typeof(Entity).GetField(propertyName).GetValue(this);
return typeof(Properties).GetField(propertyName).GetValue(this);
}
set
{
try
{
typeof(Entity).GetField(propertyName).SetValue(this, value);
typeof(Properties).GetField(propertyName).SetValue(this, value);
}
catch (Exception ex)
{
@ -93,5 +92,11 @@ namespace HeavenStudio.Properties
}
}
public class EditInput
{
[Header("Properties")]
public bool editingInputField = false;
}
}
}

28
Assets/Scripts/LevelEditor/Properties/PropertyDefn.cs
View file

@ -50,34 +50,34 @@ namespace HeavenStudio.Properties
slider.minValue = integer.min;
slider.maxValue = integer.max;
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(PropController.properties.instance[propertyName]));
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(PropController.instance.properties[propertyName]));
inputField.text = slider.value.ToString();
slider.onValueChanged.AddListener(delegate
{
inputField.text = slider.value.ToString();
PropController.properties.instance[propertyName] = (int)slider.value;
PropController.instance.properties[propertyName] = (int)slider.value;
});
inputField.onSelect.AddListener(delegate
{
Editor.instance.editingInputField = true;
PropController.instance.EditInput.editingInputField = true;
});
inputField.onEndEdit.AddListener(delegate
{
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(System.Convert.ToSingle(inputField.text)));
PropController.properties.instance[propertyName] = (int)slider.value;
Editor.instance.editingInputField = false;
PropController.instance.properties[propertyName] = (int)slider.value;
PropController.instance.EditInput.editingInputField = false;
});
}
else if (type is bool)
{
toggle.isOn = System.Convert.ToBoolean(PropController.properties.instance[propertyName]); // ' (bool)type ' always results in false
toggle.isOn = System.Convert.ToBoolean(PropController.instance.properties[propertyName]); // ' (bool)type ' always results in false
toggle.onValueChanged.AddListener(delegate
{
PropController.properties.instance[propertyName] = toggle.isOn;
PropController.instance.properties[propertyName] = toggle.isOn;
});
}
else if (objType.IsEnum)
@ -94,7 +94,7 @@ namespace HeavenStudio.Properties
dropDownData.Add(optionData);
if ((int)vals.GetValue(i) == (int)PropController.properties.instance[propertyName])
if ((int)vals.GetValue(i) == (int)PropController.instance.properties[propertyName])
selected = i;
}
dropdown.AddOptions(dropDownData);
@ -102,25 +102,25 @@ namespace HeavenStudio.Properties
dropdown.onValueChanged.AddListener(delegate
{
PropController.properties.instance[propertyName] = (int)Enum.GetValues(objType).GetValue(dropdown.value);
PropController.instance.properties[propertyName] = (int)Enum.GetValues(objType).GetValue(dropdown.value);
});
}
//why the FUCK wasn't this a thing before lmao
else if (objType == typeof(string))
{
// Debug.Log("entity " + propertyName + " is: " + (string)(PropController.properties.instance[propertyName]));
inputFieldString.text = (string)(PropController.properties.instance[propertyName]);
// Debug.Log("entity " + propertyName + " is: " + (string)(PropController.instance.properties[propertyName]));
inputFieldString.text = (string)(PropController.instance.properties[propertyName]);
inputFieldString.onSelect.AddListener(delegate
{
Editor.instance.editingInputField = true;
PropController.instance.EditInput.editingInputField = true;
});
inputFieldString.onEndEdit.AddListener(delegate
{
// Debug.Log("setting " + propertyName + " to: " + inputFieldString.text);
PropController.properties.instance[propertyName] = inputFieldString.text;
Editor.instance.editingInputField = false;
PropController.instance.properties[propertyName] = inputFieldString.text;
PropController.instance.EditInput.editingInputField = false;
});
}
}