[revert] 回滚版本"6909c32a0c8fcf11d4b573af890a0232c1525afe [new] 支持 2021 WebGL资源上挂载脚本" 引入的MonoHook的bug

Editor/3rds/UnityHook/LDasm.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.InteropServices;
 
 namespace DotNetDetour
 {
@@ -641,15 +642,8 @@ namespace DotNetDetour
             if(s_isArm.HasValue)
                 return s_isArm.Value;
 
-            string processorType = UnityEngine.SystemInfo.processorType;
+            var arch = RuntimeInformation.ProcessArchitecture;
-
+            s_isArm = arch == Architecture.Arm || arch == Architecture.Arm64;
-            /*
-             * appple M 系列
-             * SystemInfo.processorType 返回值为: Apple M1 Max, Apple M2 等
-             * SystemInfo.operatingSystem 返回值为: Mac OS X xx.x.x
-             * 
-             */
-            s_isArm = processorType.Contains("ARM") || processorType.Contains("Apple M");
 
             return s_isArm.Value;
         }

Editor/3rds/UnityHook/MethodHook.cs

@@ -362,11 +362,17 @@ namespace MonoHook
         private void OnEditorUpdate()
         {
             if (s_fi_GUISkin_current.GetValue(null) != null)
+            {
+                try
                 {
                     DoInstall();
+                }
+                finally
+                {
                     EditorApplication.update -= OnEditorUpdate;
                 }
             }
+        }
 #endif
 
         #endregion