Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:27:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

finally fix deserialization of the new format

Browse Source
This commit is contained in:
minenice55
2022-08-21 21:57:32 -04:00
parent cc577966c1
commit fe0b97d1ab
6 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs
View File

@ -118,7 +118,7 @@ namespace HeavenStudio.Editor
{
prefab = DropdownP;
}
else if (objType == typeof(Color) || objType == typeof(EntityTypes.SerializableColor))
else if (objType == typeof(Color))
{
prefab = ColorP;
}

4
Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs
View File

@ -120,10 +120,10 @@ namespace HeavenStudio.Editor
);
break;
case EntityTypes.SerializableColor _:
// case EntityTypes.SerializableColor _:
case Color _:
colorPreview.colorPicker.onColorChanged += _ =>
parameterManager.entity[propertyName] = new EntityTypes.SerializableColor { Color = colorPreview.colorPicker.color };
parameterManager.entity[propertyName] = colorPreview.colorPicker.color;
Color paramCol = parameterManager.entity[propertyName];

4
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View File

@ -592,10 +592,6 @@ namespace HeavenStudio.Editor.Track
{
returnVal = ((EntityTypes.Float)ep[i].parameter).val;
}
else if (propertyType == typeof(Color))
{
returnVal = new EntityTypes.SerializableColor { Color = (UnityEngine.Color) ep[i].parameter };
}
else if (propertyType.IsEnum)
{
returnVal = (int) ep[i].parameter;