Merge pull request #8 from loongly/dev1

Dev1 merge to master
loongly · Sep 11, 2021 · bb11c04 · bb11c04
2 parents a3be984 + 64e4e49
commit bb11c04
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/BindGenerater/Program.cs b/BindGenerater/Program.cs
@@ -148,7 +148,7 @@ public static void ReplaceMscorlib(string libDir, string outDir)
             foreach (var fi in dir.GetFiles())
             {
                 var tarPath = Path.Combine(outDir, fi.Name);
-                if (File.Exists(tarPath))
+                if (File.Exists(tarPath) || fi.Name == "netstandard.dll") // netstandard reserved for unity2020 build bug
                     File.Copy(Path.Combine(srcDir, fi.Name), tarPath, true);
             }
         }

diff --git a/ScriptEngine/Tools/Binder.exe b/ScriptEngine/Tools/Binder.exe
diff --git a/ScriptEngine/Tools/Binder.pdb b/ScriptEngine/Tools/Binder.pdb
diff --git a/ScriptEngine/Tools/lib/iOS/netstandard.dll b/ScriptEngine/Tools/lib/iOS/netstandard.dll
diff --git a/ScriptEngine/lib/libScriptEngine.a b/ScriptEngine/lib/libScriptEngine.a
diff --git a/ScriptEngine/main/Mediator.cpp b/ScriptEngine/main/Mediator.cpp
@@ -168,6 +168,8 @@ void* get_il2cpp_internal_ptr(Il2CppObject* obj)
 
 MonoString* get_mono_string(Il2CppString* str)
 {
+    if(str == NULL)
+        return NULL;
 	/*char* ptr = (char*)str;
 	int32_t* lenPtr = (int32_t*)(ptr + sizeof(void *) * 2);
 	int32_t len = *lenPtr;
@@ -180,6 +182,9 @@ MonoString* get_mono_string(Il2CppString* str)
 }
 Il2CppString* get_il2cpp_string(MonoString* str)
 {
+    if(str == NULL)
+        return NULL;
+
     int32_t len = mono_string_length(str);
     Il2CppChar* chars = (Il2CppChar* )mono_string_to_utf16(str);