diff --git a/Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs b/Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs index ee51bbc8c..a27c4a4d2 100644 --- a/Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs +++ b/Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs @@ -45,7 +45,7 @@ namespace UniJSON { var mi = s.GetType().GetMethod("Get"); var func = GenericInvokeCallFactory.OpenFunc(mi); - var value = func(s, 1); + /*var value =*/ func(s, 1); Assert.AreEqual(1, s.Value); } diff --git a/Assets/VRM/UniJSON/Scripts/ConcreteCast.cs b/Assets/VRM/UniJSON/Scripts/ConcreteCast.cs index 1bbdd996d..641e4ebf1 100644 --- a/Assets/VRM/UniJSON/Scripts/ConcreteCast.cs +++ b/Assets/VRM/UniJSON/Scripts/ConcreteCast.cs @@ -43,7 +43,7 @@ namespace UniJSON typeof(double), }; - [MenuItem(UniGLTF.UniGLTFVersion.MENU + "/Generate ConcreteCast")] + [MenuItem("VRM/UniJSON/Generate ConcreteCast")] public static void GenerateGenericCast() { var s = new StringBuilder(); diff --git a/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.cs b/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.cs index fa8fd8b1f..d644936e1 100644 --- a/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.cs +++ b/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; #if UNITY_EDITOR using UnityEditor; +using UnityEngine; #endif @@ -14,7 +15,7 @@ namespace UniJSON #if UNITY_EDITOR && VRM_DEVELOP const int NET35MAX = 4; const int ARGS = 6; - const string GENERATE_PATH = "Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.g.cs"; + const string GENERATE_PATH = "/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.g.cs"; static System.Collections.Generic.IEnumerable GetArgs(string prefix, int n) { @@ -24,7 +25,7 @@ namespace UniJSON } } - [MenuItem(VRM.VRMVersion.MENU + "/Generate GenericExpressionCallFactory")] + [MenuItem("VRM/UniJSON/Generate GenericExpressionCallFactory")] static void Generate() { var sb = new StringBuilder(); @@ -110,9 +111,8 @@ namespace UniJSON "); } - var path = UniGLTF.UnityPath.FromUnityPath(GENERATE_PATH); - File.WriteAllText(path.FullPath, sb.ToString().Replace("\r\n", "\n")); - path.ImportAsset(); + var path = Path.GetFullPath(Application.dataPath + GENERATE_PATH).Replace("\\", "/"); + File.WriteAllText(path, sb.ToString().Replace("\r\n", "\n")); } #endif } diff --git a/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.cs b/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.cs index 4a543029f..c5022bb95 100644 --- a/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.cs +++ b/Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.cs @@ -1,5 +1,6 @@ using System; using System.Reflection; +using UnityEngine; #if UNITY_EDITOR && VRM_DEVELOP using System.IO; using System.Linq; @@ -23,7 +24,7 @@ namespace UniJSON #if UNITY_EDITOR && VRM_DEVELOP const int NET35MAX = 4; const int ARGS = 6; - const string GENERATE_PATH = "Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.g.cs"; + const string GENERATE_PATH = "/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.g.cs"; static System.Collections.Generic.IEnumerable GetArgs(string prefix, int n) { @@ -33,7 +34,7 @@ namespace UniJSON } } - [MenuItem(VRM.VRMVersion.MENU + "/Generate GenericInvokeCallFactory")] + [MenuItem("VRM/UniJSON/Generate GenericInvokeCallFactory")] static void Generate() { var sb = new StringBuilder(); @@ -195,9 +196,8 @@ namespace UniJSON "); } - var path = UniGLTF.UnityPath.FromUnityPath(GENERATE_PATH); - File.WriteAllText(path.FullPath, sb.ToString().Replace("\r\n", "\n")); - path.ImportAsset(); + var path = Path.GetFullPath(Application.dataPath + GENERATE_PATH).Replace("\\", "/"); + File.WriteAllText(path, sb.ToString().Replace("\r\n", "\n")); } #endif