Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-10 20:53:31 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #177 from dwango/fix_adf_error_VRM_DEVELOP

Browse Source 
Fix adf error
This commit is contained in:
yutopp 2019-02-05 17:16:37 +09:00 committed by GitHub
commit 17426ab64a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs
View File

@ -45,7 +45,7 @@ namespace UniJSON
{
var mi = s.GetType().GetMethod("Get");
var func = GenericInvokeCallFactory.OpenFunc<Sample, int, int>(mi);
var value = func(s, 1);
/*var value =*/ func(s, 1);
Assert.AreEqual(1, s.Value);
}

2
Assets/VRM/UniJSON/Scripts/ConcreteCast.cs
View File

@ -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();

10
Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.cs
View File

@ -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<string> 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
}

10
Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.cs
View File

@ -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<string> 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