PHXH
/
hybridclr_unity
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] 修复团结引擎1.1.0起删除TUANJIE_2022宏导致没有复制裁剪后的AOT程序集的bug

main
walon 2024-04-08 22:25:48 +08:00
parent a6befb1312
commit 12bafb897f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/3rds/UnityHook/HybridCLRHooks/PatchScriptingAssembliesJsonHook.cs
View File

@ -12,7 +12,7 @@ using System.IO;
namespace HybridCLR.MonoHook 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] [InitializeOnLoad]
public class PatchScriptingAssembliesJsonHook public class PatchScriptingAssembliesJsonHook
{ {
@ -36,7 +36,7 @@ namespace HybridCLR.MonoHook
private static string BuildMainWindowTitle() private static string BuildMainWindowTitle()
{ {
string tempJsonPath = $"{Application.dataPath}/../Library/PlayerDataCache/WebGL/Data/ScriptingAssemblies.json"; string tempJsonPath = $"{Application.dataPath}/../Library/PlayerDataCache/WebGL/Data/ScriptingAssemblies.json";
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.WeixinMiniGame) if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.WeixinMiniGame)
{ {
tempJsonPath = $"{Application.dataPath}/../Library/PlayerDataCache/WeixinMiniGame/Data/ScriptingAssemblies.json"; tempJsonPath = $"{Application.dataPath}/../Library/PlayerDataCache/WeixinMiniGame/Data/ScriptingAssemblies.json";

2
Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
View File

@ -45,7 +45,7 @@ namespace HybridCLR.Editor.BuildProcessors
return $"{projectDir}/Library/Bee/artifacts/PS4PlayerBuildProgram/ManagedStripped"; return $"{projectDir}/Library/Bee/artifacts/PS4PlayerBuildProgram/ManagedStripped";
case BuildTarget.PS5: case BuildTarget.PS5:
return $"{projectDir}/Library/Bee/artifacts/PS5PlayerBuildProgram/ManagedStripped"; return $"{projectDir}/Library/Bee/artifacts/PS5PlayerBuildProgram/ManagedStripped";
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
case BuildTarget.WeixinMiniGame: case BuildTarget.WeixinMiniGame:
return $"{projectDir}/Library/Bee/artifacts/WeixinMiniGame/ManagedStripped"; return $"{projectDir}/Library/Bee/artifacts/WeixinMiniGame/ManagedStripped";
case BuildTarget.OpenHarmony: case BuildTarget.OpenHarmony:

10
Editor/Commands/StripAOTDllCommand.cs
View File

@ -81,7 +81,7 @@ namespace HybridCLR.Editor.Commands
#elif UNITY_EDITOR_WIN #elif UNITY_EDITOR_WIN
bool oldCreateSolution = UnityEditor.WindowsStandalone.UserBuildSettings.createSolution; bool oldCreateSolution = UnityEditor.WindowsStandalone.UserBuildSettings.createSolution;
#endif #endif
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
bool oldOpenHarmonyProj = EditorUserBuildSettings.exportAsOpenHarmonyProject; bool oldOpenHarmonyProj = EditorUserBuildSettings.exportAsOpenHarmonyProject;
#endif #endif
bool oldBuildScriptsOnly = EditorUserBuildSettings.buildScriptsOnly; bool oldBuildScriptsOnly = EditorUserBuildSettings.buildScriptsOnly;
@ -108,7 +108,7 @@ namespace HybridCLR.Editor.Commands
#endif #endif
break; break;
} }
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
case BuildTarget.HMIAndroid: case BuildTarget.HMIAndroid:
#endif #endif
case BuildTarget.Android: case BuildTarget.Android:
@ -116,7 +116,7 @@ namespace HybridCLR.Editor.Commands
EditorUserBuildSettings.exportAsGoogleAndroidProject = true; EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
break; break;
} }
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
case BuildTarget.OpenHarmony: case BuildTarget.OpenHarmony:
{ {
EditorUserBuildSettings.exportAsOpenHarmonyProject = true; EditorUserBuildSettings.exportAsOpenHarmonyProject = true;
@ -158,7 +158,7 @@ namespace HybridCLR.Editor.Commands
#endif #endif
break; break;
} }
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
case BuildTarget.HMIAndroid: case BuildTarget.HMIAndroid:
#endif #endif
case BuildTarget.Android: case BuildTarget.Android:
@ -166,7 +166,7 @@ namespace HybridCLR.Editor.Commands
EditorUserBuildSettings.exportAsGoogleAndroidProject = oldExportAndroidProj; EditorUserBuildSettings.exportAsGoogleAndroidProject = oldExportAndroidProj;
break; break;
} }
#if TUANJIE_2022 #if TUANJIE_2022_3_OR_NEWER
case BuildTarget.OpenHarmony: case BuildTarget.OpenHarmony:
{ {
EditorUserBuildSettings.exportAsOpenHarmonyProject = oldOpenHarmonyProj; EditorUserBuildSettings.exportAsOpenHarmonyProject = oldOpenHarmonyProj;