From c083e4ada4418fd9a82761bca580662632f11849 Mon Sep 17 00:00:00 2001
From: walon <walon@focus-creative-games.com>
Date: Sun, 23 Apr 2023 12:20:56 +0800
Subject: [PATCH] =?UTF-8?q?[opt]=20=E4=BC=98=E5=8C=96Resolve=20Assembly?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Editor/Meta/AssemblyResolverBase.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Editor/Meta/AssemblyResolverBase.cs b/Editor/Meta/AssemblyResolverBase.cs
index d7089f7..b59d793 100644
--- a/Editor/Meta/AssemblyResolverBase.cs
+++ b/Editor/Meta/AssemblyResolverBase.cs
@@ -16,11 +16,14 @@ namespace HybridCLR.Editor.Meta
             }
             if (throwExIfNotFind)
             {
-#if UNITY_2021_1_OR_NEWER && UNITY_IOS
-                throw new Exception($"resolve assembly:{assemblyName} 失败! 请按照Install文档正确替换了UnityEditor.CoreModule.dll或者升级hybridclr_unity到2.0.1及更高版本");
-#else
-                throw new Exception($"resolve assembly:{assemblyName} 失败! 请参阅常见错误文档");
-#endif
+                if (SettingsUtil.HotUpdateAssemblyNamesIncludePreserved.Contains(assemblyName))
+                {
+                    throw new Exception($"resolve 热更新 dll:{assemblyName} 失败！请确保已经编译了热更新dll或者外部热更新路径中配置了正确的值。更多请参阅常见错误文档");
+                }
+                else
+                {
+                    throw new Exception($"resolve AOT dll:{assemblyName} 失败! 请确保主工程已经引用了该dll并且正确生成了裁剪后的AOT dll。更多请参阅常见错误文档");
+                }
             }
             return null;
         }