fix some errors for UWP project (Tencent#222)

benbon · Oct 16, 2017 · 4f63d2a · 4f63d2a
1 parent 9f8023e
commit 4f63d2a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/Assets/XLua/Src/ObjectTranslator.cs b/Assets/XLua/Src/ObjectTranslator.cs
@@ -355,15 +355,19 @@ Delegate getDelegate(DelegateBridgeBase bridge, Type delegateType)
             {
                 return null;
             }
-            
+
             // get by parameters
             MethodInfo delegateMethod = delegateType.GetMethod("Invoke");
             var methods = bridge.GetType().GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
-            for(int i = 0; i < methods.Length; i++)
+            for (int i = 0; i < methods.Length; i++)
             {
                 if (!methods[i].IsConstructor && Utils.IsParamsMatch(delegateMethod, methods[i]))
                 {
+#if UNITY_EDITOR || XLUA_GENERAL
                     return Delegate.CreateDelegate(delegateType, bridge, methods[i]);
+#else
+                    return methods[i].CreateDelegate(delegateType, bridge);
+#endif
                 }
             }
 

diff --git a/Assets/XLua/Src/TypeExtensions.cs b/Assets/XLua/Src/TypeExtensions.cs
@@ -113,5 +113,22 @@ public static Type[] GetGenericParameterConstraints(this Type type)
         }
 #endif
 
+        public static bool IsNestedPublic(this Type type)
+        {
+#if !UNITY_WSA || UNITY_EDITOR
+            return type.IsNestedPublic;
+#else
+            return type.GetTypeInfo().IsNestedPublic;
+#endif        
+        }
+
+        public static bool IsPublic(this Type type)
+        {
+#if !UNITY_WSA || UNITY_EDITOR
+            return type.IsPublic;
+#else
+            return type.GetTypeInfo().IsPublic;
+#endif        
+        }
     }
 }
diff --git a/Assets/XLua/Src/Utils.cs b/Assets/XLua/Src/Utils.cs
@@ -1584,10 +1584,10 @@ public static bool IsPublic(Type type)
         {
             if (type.IsNested)
             {
-                if (!type.IsNestedPublic) return false;
+                if (!type.IsNestedPublic()) return false;
                 return IsPublic(type.DeclaringType);
             }
-            return type.IsPublic;
+            return type.IsPublic();
         }
     }
 }