merge

2 years ago · 5ab90c2232
2 changed files with 1 additions and 9 deletions
--- a/Assets/JsonIOTools/Example/Script/JsonIOExample.cs
+++ b/Assets/JsonIOTools/Example/Script/JsonIOExample.cs
@ -9,7 +9,7 @@ public class JsonIOExample : MonoBehaviour
				@@ -9,7 +9,7 @@ public class JsonIOExample : MonoBehaviour
    void Start()
    {
        JsonIOUtility jsonData = new JsonIOUtility();
-        jsonData.setData(new MyItemData(1,"破碎的宝剑"));
+        jsonData.setData(new MyItemData(1,"Sword"));
        jsonData.SaveToJsonFile();
    }

--- a/Assets/TCPClient/Script/Source/Interface.meta
+++ b/Assets/TCPClient/Script/Source/Interface.meta
@ -1,8 +0,0 @@
				@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 101c42156fd689742b9050456e2ab289
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: