diff --git a/Assets/DataGenerateTools/src/JsonGenerate/JsonFileLoaderEditor.cs b/Assets/DataGenerateTools/src/JsonGenerate/JsonFileLoaderEditor.cs index af264df..5b942e4 100644 --- a/Assets/DataGenerateTools/src/JsonGenerate/JsonFileLoaderEditor.cs +++ b/Assets/DataGenerateTools/src/JsonGenerate/JsonFileLoaderEditor.cs @@ -11,7 +11,9 @@ namespace JXSoft { { public TextAsset JsonFile; AnimBool m_ShowExtraFields; - public Dictionary keyValuePairs; + private JsonReader reader; + public Dictionary keyValuePairs = new Dictionary(); + [MenuItem("JXSoft/Loader/JsonFileLoader")] static void Init() @@ -30,17 +32,24 @@ namespace JXSoft { JsonFile = (TextAsset)EditorGUILayout.ObjectField("JsonFile", JsonFile, typeof(TextAsset), true); if (GUILayout.Button("AnalyzeJsonFile")) { - if (JsonFile != null) + + } + if (GUILayout.Button("Clear")) { + keyValuePairs.Clear(); + } + if (JsonFile != null) { + reader = new JsonReader(JsonFile.text); + /* + while (reader.Read()) { - JsonData jsonData = JsonMapper.ToObject(JsonFile.text); - foreach (string key in jsonData.Keys) - { - Debug.Log(jsonData[key].GetJsonType()); - for (int i = 0; i < jsonData[key].Count; i++) { - Debug.Log(jsonData[key][i].GetJsonType()); - } - } - } + string type = reader.Value != null ? reader.Value.GetType().ToString() : ""; + string value = reader.Value != null ? reader.Value.ToString() : ""; + EditorGUILayout.BeginHorizontal("Label"); + EditorGUILayout.TextField("Type", type); + EditorGUILayout.TextField("Token", reader.Token.ToString()); + EditorGUILayout.TextField("Value", value); + EditorGUILayout.EndHorizontal(); + }*/ } } } diff --git a/Assets/JsonIOTools/src.meta b/Assets/JsonIOTools/src.meta new file mode 100644 index 0000000..5a31cb0 --- /dev/null +++ b/Assets/JsonIOTools/src.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14a068b61b6865f4ab64901c885086d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JsonIOTools/JsonIOUtility.cs b/Assets/JsonIOTools/src/JsonIOUtility.cs similarity index 100% rename from Assets/JsonIOTools/JsonIOUtility.cs rename to Assets/JsonIOTools/src/JsonIOUtility.cs diff --git a/Assets/JsonIOTools/JsonIOUtility.cs.meta b/Assets/JsonIOTools/src/JsonIOUtility.cs.meta similarity index 100% rename from Assets/JsonIOTools/JsonIOUtility.cs.meta rename to Assets/JsonIOTools/src/JsonIOUtility.cs.meta