diff --git a/Runtime/GuruCore/Runtime/Common/JsonParser.cs b/Runtime/GuruCore/Runtime/Common/JsonParser.cs index c044c7a..0b3bf7f 100644 --- a/Runtime/GuruCore/Runtime/Common/JsonParser.cs +++ b/Runtime/GuruCore/Runtime/Common/JsonParser.cs @@ -1,10 +1,12 @@ + + namespace Guru { using System; + using Newtonsoft.Json; using UnityEngine; - using Guru.LitJson; public static class JsonParser { @@ -49,7 +51,8 @@ namespace Guru { try { - return JsonMapper.ToObject(jsonStr); + // return JsonMapper.ToObject(jsonStr); + return JsonConvert.DeserializeObject(jsonStr); } catch (Exception e) { @@ -69,6 +72,7 @@ namespace Guru { try { + /* if (!prettyFormat) { return JsonMapper.ToJson(obj); @@ -83,7 +87,10 @@ namespace Guru JsonMapper.ToJson(obj, writer); return writer.ToString(); } + */ + var formatting = prettyFormat ? Formatting.Indented : Formatting.None; + return JsonConvert.SerializeObject(obj, formatting); } catch (Exception e) {