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;