From 12bafb897feb73b3f78aa1b0848ce2331a364dee Mon Sep 17 00:00:00 2001
From: walon <walon@code-philosophy.com>
Date: Mon, 8 Apr 2024 22:25:48 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=9B=A2=E7=BB=93?=
 =?UTF-8?q?=E5=BC=95=E6=93=8E1.1.0=E8=B5=B7=E5=88=A0=E9=99=A4TUANJIE=5F202?=
 =?UTF-8?q?2=E5=AE=8F=E5=AF=BC=E8=87=B4=E6=B2=A1=E6=9C=89=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E8=A3=81=E5=89=AA=E5=90=8E=E7=9A=84AOT=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E9=9B=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HybridCLRHooks/PatchScriptingAssembliesJsonHook.cs |  4 ++--
 Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs    |  2 +-
 Editor/Commands/StripAOTDllCommand.cs                  | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Editor/3rds/UnityHook/HybridCLRHooks/PatchScriptingAssembliesJsonHook.cs b/Editor/3rds/UnityHook/HybridCLRHooks/PatchScriptingAssembliesJsonHook.cs
index 4ba6b6c..8b41cbc 100644
--- a/Editor/3rds/UnityHook/HybridCLRHooks/PatchScriptingAssembliesJsonHook.cs
+++ b/Editor/3rds/UnityHook/HybridCLRHooks/PatchScriptingAssembliesJsonHook.cs
@@ -12,7 +12,7 @@ using System.IO;
 
 namespace HybridCLR.MonoHook
 {
-#if (UNITY_2021_1_OR_NEWER && UNITY_WEBGL) || TUANJIE_2022
+#if (UNITY_2021_1_OR_NEWER && UNITY_WEBGL) || TUANJIE_2022_3_OR_NEWER
     [InitializeOnLoad]
     public class PatchScriptingAssembliesJsonHook
     {
@@ -36,7 +36,7 @@ namespace HybridCLR.MonoHook
         private static string BuildMainWindowTitle()
         {
             string tempJsonPath = $"{Application.dataPath}/../Library/PlayerDataCache/WebGL/Data/ScriptingAssemblies.json";
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
             if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.WeixinMiniGame)
             {
                 tempJsonPath = $"{Application.dataPath}/../Library/PlayerDataCache/WeixinMiniGame/Data/ScriptingAssemblies.json";
diff --git a/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs b/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
index f530c41..407b44f 100644
--- a/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
+++ b/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
@@ -45,7 +45,7 @@ namespace HybridCLR.Editor.BuildProcessors
                     return $"{projectDir}/Library/Bee/artifacts/PS4PlayerBuildProgram/ManagedStripped";
                 case BuildTarget.PS5:
                     return $"{projectDir}/Library/Bee/artifacts/PS5PlayerBuildProgram/ManagedStripped";
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
                 case BuildTarget.WeixinMiniGame:
                     return $"{projectDir}/Library/Bee/artifacts/WeixinMiniGame/ManagedStripped";
                 case BuildTarget.OpenHarmony:
diff --git a/Editor/Commands/StripAOTDllCommand.cs b/Editor/Commands/StripAOTDllCommand.cs
index 517f64a..460c3d4 100644
--- a/Editor/Commands/StripAOTDllCommand.cs
+++ b/Editor/Commands/StripAOTDllCommand.cs
@@ -81,7 +81,7 @@ namespace HybridCLR.Editor.Commands
 #elif UNITY_EDITOR_WIN
             bool oldCreateSolution = UnityEditor.WindowsStandalone.UserBuildSettings.createSolution;
 #endif
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
             bool oldOpenHarmonyProj = EditorUserBuildSettings.exportAsOpenHarmonyProject;
 #endif
             bool oldBuildScriptsOnly = EditorUserBuildSettings.buildScriptsOnly;
@@ -108,7 +108,7 @@ namespace HybridCLR.Editor.Commands
 #endif
                     break;
                 }
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
                 case BuildTarget.HMIAndroid:
 #endif
                 case BuildTarget.Android:
@@ -116,7 +116,7 @@ namespace HybridCLR.Editor.Commands
                     EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
                     break;
                 }
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
                 case BuildTarget.OpenHarmony:
                 {
                     EditorUserBuildSettings.exportAsOpenHarmonyProject = true;
@@ -158,7 +158,7 @@ namespace HybridCLR.Editor.Commands
 #endif
                         break;
                     }
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
                 case BuildTarget.HMIAndroid:
 #endif
                 case BuildTarget.Android:
@@ -166,7 +166,7 @@ namespace HybridCLR.Editor.Commands
                     EditorUserBuildSettings.exportAsGoogleAndroidProject = oldExportAndroidProj;
                     break;
                 }
-#if TUANJIE_2022
+#if TUANJIE_2022_3_OR_NEWER
                 case BuildTarget.OpenHarmony:
                 {
                     EditorUserBuildSettings.exportAsOpenHarmonyProject = oldOpenHarmonyProj;