Added compatibility with Unity 2017+

nansofting · Joy-less · commit 76e5c38595b4 · 2023-08-10T20:17:11.000+01:00
diff --git a/src/MoonSharp.Interpreter/Loaders/UnityAssetsScriptLoader.cs b/src/MoonSharp.Interpreter/Loaders/UnityAssetsScriptLoader.cs
@@ -31,7 +31,7 @@ public class UnityAssetsScriptLoader : ScriptLoaderBase
 		public UnityAssetsScriptLoader(string assetsPath = null)
 		{
 			assetsPath = assetsPath ?? DEFAULT_PATH;
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
             LoadResourcesUnityNative(assetsPath);
 #else
 			LoadResourcesWithReflection(assetsPath);
@@ -48,7 +48,7 @@ public UnityAssetsScriptLoader(Dictionary<string, string> scriptToCodeMap)
 			m_Resources = scriptToCodeMap;
 		}
 
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
         void LoadResourcesUnityNative(string assetsPath)
         {
             try
diff --git a/src/MoonSharp.Interpreter/Platforms/PlatformAutoDetector.cs b/src/MoonSharp.Interpreter/Platforms/PlatformAutoDetector.cs
@@ -84,7 +84,7 @@ private static void AutoDetectPlatformFlags()
 			IsUnityNative = true;
 #endif
 #else
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
 			IsRunningOnUnity = true;
 			IsUnityNative = true;
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class UnityAssetsScriptLoader : ScriptLoaderBase`
`31`	`31`	`public UnityAssetsScriptLoader(string assetsPath = null)`
`32`	`32`	`{`
`33`	`33`	`assetsPath = assetsPath ?? DEFAULT_PATH;`
`34`		`-#if UNITY_5`
	`34`	`+#if UNITY_5 \|\| UNITY_2017_1_OR_NEWER`
`35`	`35`	`LoadResourcesUnityNative(assetsPath);`
`36`	`36`	`#else`
`37`	`37`	`LoadResourcesWithReflection(assetsPath);`
`@@ -48,7 +48,7 @@ public UnityAssetsScriptLoader(Dictionary<string, string> scriptToCodeMap)`
`48`	`48`	`m_Resources = scriptToCodeMap;`
`49`	`49`	`}`
`50`	`50`
`51`		`-#if UNITY_5`
	`51`	`+#if UNITY_5 \|\| UNITY_2017_1_OR_NEWER`
`52`	`52`	`void LoadResourcesUnityNative(string assetsPath)`
`53`	`53`	`{`
`54`	`54`	`try`