From 590505195e0a6305397dcc7e68bcda2a5d4310d2 Mon Sep 17 00:00:00 2001
From: walon <walon@focus-creative-games.com>
Date: Thu, 22 Sep 2022 11:20:47 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=81=B6=E7=84=B6?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8Bbuild=20apk=E5=8C=85=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8CPatchScriptingAssemblyList=20=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BAapk=E8=B7=AF=E5=BE=84=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4patch=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/iOSBuild/build.meta                            |  8 --------
 .../BuildProcessors/PatchScriptingAssemblyList.cs   | 13 +++++++++----
 Tests/Editor.meta                                   |  8 --------
 3 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 Data/iOSBuild/build.meta
 delete mode 100644 Tests/Editor.meta

diff --git a/Data/iOSBuild/build.meta b/Data/iOSBuild/build.meta
deleted file mode 100644
index 35d8f2a..0000000
--- a/Data/iOSBuild/build.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 94c0855e86b12b64b8c1d29c51ac795d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Editor/BuildProcessors/PatchScriptingAssemblyList.cs b/Editor/BuildProcessors/PatchScriptingAssemblyList.cs
index 2d2192d..107cc8d 100644
--- a/Editor/BuildProcessors/PatchScriptingAssemblyList.cs
+++ b/Editor/BuildProcessors/PatchScriptingAssemblyList.cs
@@ -24,14 +24,19 @@ namespace HybridCLR.Editor.BuildProcessors
     {
         public int callbackOrder => 0;
 
-
-
-
         public void OnPostGenerateGradleAndroidProject(string path)
         {
             // 如果直接打包apk，没有机会在PostprocessBuild中修改ScriptingAssemblies.json。
             // 因此需要在这个时机处理
-            PathScriptingAssembilesFile(path);
+            // Unity有bug，偶然情况下会传入apk的路径，导致替换失败
+            if (Directory.Exists(path))
+            {
+                PathScriptingAssembilesFile(path);
+            }
+            else
+            {
+                PathScriptingAssembilesFile($"{SettingsUtil.ProjectDir}/Library");
+            }
         }
 
         public void OnPostprocessBuild(BuildReport report)
diff --git a/Tests/Editor.meta b/Tests/Editor.meta
deleted file mode 100644
index 5ee36ac..0000000
--- a/Tests/Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c7268273c19288b44a2ac493c8db07cd
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: