pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compacted json format (was Color[] now is Color32[]). 

Commented out code that opens json file when saved.
pull/413/head
Sean Mann 2018-02-18 23:28:41 -05:00
parent b5f8f17203
commit 8d4a2fe698
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Scripts/Controls/ColorPicker/ColorPickerPresets.cs
View File

@ -82,7 +82,7 @@ namespace UnityEngine.UI.Extensions.ColorPicker
try
{
var jsonColors = JsonUtility.FromJson<JsonColor>(jsonData);
presets.AddRange(jsonColors.colors);
presets.AddRange(jsonColors.GetColors());
}
catch (System.Exception e)
{
@ -105,9 +105,8 @@ namespace UnityEngine.UI.Extensions.ColorPicker
return;
}
var jsonColor = new JsonColor() {
colors = presets.ToArray()
};
var jsonColor = new JsonColor();
jsonColor.SetColors(presets.ToArray());
string jsonData = JsonUtility.ToJson(jsonColor);
@ -122,7 +121,7 @@ namespace UnityEngine.UI.Extensions.ColorPicker
break;
case SaveType.JsonFile:
System.IO.File.WriteAllText(JsonFilePath, jsonData);
Application.OpenURL(JsonFilePath);
//Application.OpenURL(JsonFilePath);
break;
default:
throw new System.NotImplementedException(saveType.ToString());
@ -131,7 +130,25 @@ namespace UnityEngine.UI.Extensions.ColorPicker
protected class JsonColor
{
public Color[] colors;
public Color32[] colors;
public void SetColors(Color[] colorsIn)
{
this.colors = new Color32[colorsIn.Length];
for (int i = 0; i < colorsIn.Length; i++)
{
this.colors[i] = colorsIn[i];
}
}
public Color[] GetColors()
{
Color[] colorsOut = new Color[colors.Length];
for (int i = 0; i < colors.Length; i++)
{
colorsOut[i] = colors[i];
}
return colorsOut;
}
}
public virtual void CreatePreset(Color color, bool loading)