Merge pull request loongly#7 from loongly/dev1

merge Dev1

Author: loongly

BindGenerater/Generater/AOTGenerater.cs

@@ -19,6 +19,7 @@ public static class AOTGenerater
         static string WorkDir;
         static string ManagedDir;
         static string AotDir;
+        static bool needAOT;
         public static void Init(string workDir, Dictionary<string, List<string>> stripDic)
         {
             WorkDir = workDir;
@@ -30,6 +31,8 @@ public static void Init(string workDir, Dictionary<string, List<string>> stripDi
             NinjaWriter._eol = "";
             AotDir = Path.Combine(workDir, "aot");
             ModuleRegisterWriter = new CodeWriter(File.CreateText(Path.Combine(workDir, "generated", "aot_module_register.c")));
+
+            needAOT = !Utils.IsWin32();
         }
         public static void AddAOTAssembly(string file)
         {
@@ -40,28 +43,32 @@ public static void AddAOTAssembly(string file)
 
             AOTDic[Path.GetFileName(file)] = assembly.Name.Name.Replace(".","_").Replace("-","_");
 
-            var fName = Path.GetFileName(file);
-            if(StrpDic.TryGetValue(fName,out var sList))
+            if (needAOT)
             {
-                foreach(var strips in sList)
+                var fName = Path.GetFileName(file);
+                if (StrpDic.TryGetValue(fName, out var sList))
                 {
-                    var info = strips.Split(':');
-                    var type = assembly.MainModule.GetType(info[0]);
-                    var method = type?.Methods.FirstOrDefault(m => m.Name == info[1]);
-                    if (method != null)
-                        type?.Methods.Remove(method);
-                }
+                    foreach (var strips in sList)
+                    {
+                        var info = strips.Split(':');
+                        var type = assembly.MainModule.GetType(info[0]);
+                        var method = type?.Methods.FirstOrDefault(m => m.Name == info[1]);
+                        if (method != null)
+                            type?.Methods.Remove(method);
+                    }
 
-                assembly.Write(tmp);
-            }
+                    assembly.Write(tmp);
+                }
 
-            assembly.Dispose();
+                assembly.Dispose();
 
-            if (File.Exists(tmp))
-            {
-                File.Copy(tmp, file, true);
-                File.Delete(tmp);
+                if (File.Exists(tmp))
+                {
+                    File.Copy(tmp, file, true);
+                    File.Delete(tmp);
+                }
             }
+                
         }
 
         public static void End()
@@ -100,7 +107,7 @@ public static void End()
                 CS.Writer.EndAll();
             }
 
-            if(!Utils.IsWin32())
+            if(needAOT)
             {
                 var res = Utils.RunCMD("ninja", new string[] { }, ManagedDir);
                 if (res != 0)

BindGenerater/Generater/C/EventGenerater.cs

@@ -99,6 +99,23 @@ private static void ImplementEventMethod(MethodDefinition method,int index)
             }
 
             CS.Writer.Write("&exc);");
+
+            //call orign
+            CS.Writer.WriteLine("methods[index].orign(",false);
+            if (!method.IsStatic)
+            {
+                CS.Writer.Write("thiz");
+                //if (method.Parameters.Count > 0)
+                CS.Writer.Write(",");
+            }
+            foreach (var p in method.Parameters)
+            {
+                CS.Writer.Write(p.Name);
+                //if (lastP != p)
+                CS.Writer.Write(",");
+            }
+            CS.Writer.Write("imethod);");
+
             CS.Writer.WriteLine("check_mono_exception(exc)");
             if (!method.ReturnType.IsVoid())
             {

DemoProject/Assets/Resources/test/Image.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Image
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 3178975913713135997}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &3178975913713135997
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 9215579063062795260}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 9215579063062795260}
+--- !u!1102 &9215579063062795260
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: test
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 52f0d025a52e34cf28b3d53b9953df3b, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: