From 04164dc33319572588d62c5d37341ca26b1a61e2 Mon Sep 17 00:00:00 2001 From: liutao <821580467@qq.com> Date: Thu, 12 Mar 2026 13:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=8D=E7=A0=B4=E8=A7=A3=E3=80=91Ob?= =?UTF-8?q?fuz/KedrExtension=20=E5=8A=A8=E6=80=81=E5=BC=80=E5=85=B3?= =?UTF-8?q?=EF=BC=9A=E5=B0=86=20KedrExtension=20=E7=A7=BB=E8=87=B3=20Tool/?= =?UTF-8?q?Obfuz=20=E5=A4=96=E9=83=A8=E7=9B=AE=E5=BD=95=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=97=B6=E7=94=B1=20setup=5Fobfuz.sh=20=E5=9C=A8=20Un?= =?UTF-8?q?ity=20=E5=90=AF=E5=8A=A8=E5=89=8D=E5=8A=A8=E6=80=81=E6=8B=B7?= =?UTF-8?q?=E5=85=A5/=E6=B8=85=E7=90=86=EF=BC=8CJenkins=20Obfuz=20?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E7=BB=9F=E4=B8=80=E6=8E=A7=E5=88=B6=E6=B7=B7?= =?UTF-8?q?=E6=B7=86=E3=80=81OpCode=20Shuffle=20=E5=92=8C=E5=A4=9A?= =?UTF-8?q?=E6=80=81=20DLL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made-with: Cursor --- .gitignore | 5 +++++ .../Editor/Common/BuildLauncherInEditor.cs | 19 ++++++++++++------- ProjectNLD/Assets/Editor/KedrExtension.meta | 3 --- ProjectNLD/Assets/PhxhSDK | 2 +- ProjectNLD/ProjectSettings/Obfuz.asset | 4 ++-- .../Editor/KedrExtension/HashUtil.cs | 0 .../Editor/KedrExtension/HashUtil.cs.meta | 0 .../Editor/KedrExtension/KedrExtensionMenu.cs | 0 .../KedrExtension/KedrExtensionMenu.cs.meta | 0 .../KedrExtension/KedrExtensionSettings.cs | 0 .../KedrExtensionSettings.cs.meta | 0 .../KedrExtension/OpCodeShuffleCommand.cs | 0 .../OpCodeShuffleCommand.cs.meta | 0 .../Editor/KedrExtension/Opcode.cs | 0 .../Editor/KedrExtension/Opcode.cs.meta | 0 .../Editor/KedrExtension/Patches.cs | 0 .../Editor/KedrExtension/Patches.cs.meta | 0 .../Editor/KedrExtension/RandomUtil.cs | 0 .../Editor/KedrExtension/RandomUtil.cs.meta | 0 .../Editor/KedrExtension/Templates.meta | 0 .../KedrExtension/Templates/Opcodes.cpp.tpl | 0 .../Templates/Opcodes.cpp.tpl.meta | 0 .../KedrExtension/Templates/Opcodes.h.tpl | 0 .../Templates/Opcodes.h.tpl.meta | 0 .../Editor/KedrExtension/ThirdParty.meta | 0 .../KedrExtension/ThirdParty/0Harmony.dll | 0 .../ThirdParty/0Harmony.dll.meta | 0 .../KedrExtensionSettings.asset | 0 Tool/build_tools | 2 +- 29 files changed, 21 insertions(+), 14 deletions(-) delete mode 100644 ProjectNLD/Assets/Editor/KedrExtension.meta rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/HashUtil.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/HashUtil.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/KedrExtensionMenu.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/KedrExtensionMenu.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/KedrExtensionSettings.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/KedrExtensionSettings.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/OpCodeShuffleCommand.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/OpCodeShuffleCommand.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Opcode.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Opcode.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Patches.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Patches.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/RandomUtil.cs (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/RandomUtil.cs.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Templates.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Templates/Opcodes.cpp.tpl (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Templates/Opcodes.cpp.tpl.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Templates/Opcodes.h.tpl (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/Templates/Opcodes.h.tpl.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/ThirdParty.meta (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/ThirdParty/0Harmony.dll (100%) rename {ProjectNLD/Assets => Tool/Obfuz/EditorAssets}/Editor/KedrExtension/ThirdParty/0Harmony.dll.meta (100%) rename {ProjectNLD => Tool/Obfuz}/ProjectSettings/KedrExtensionSettings.asset (100%) diff --git a/.gitignore b/.gitignore index 46151786d5d..21ee4252231 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,8 @@ ProjectNLD/Assets/Code/Scripts/GamePlay.meta ProjectNLD/Assets/Code/Scripts/GamePlay_Dll/GamePlay.dll.meta ProjectNLD/CLAUDE.md ProjectNLD/.claude + +# Obfuz/KedrExtension 动态拷入的文件（由 setup_obfuz.sh 管理） +ProjectNLD/Assets/Editor/KedrExtension/ +ProjectNLD/Assets/Editor/KedrExtension.meta +ProjectNLD/ProjectSettings/KedrExtensionSettings.asset diff --git a/ProjectNLD/Assets/Editor/Common/BuildLauncherInEditor.cs b/ProjectNLD/Assets/Editor/Common/BuildLauncherInEditor.cs index 08fb8cfd350..6fc6fe04413 100644 --- a/ProjectNLD/Assets/Editor/Common/BuildLauncherInEditor.cs +++ b/ProjectNLD/Assets/Editor/Common/BuildLauncherInEditor.cs @@ -73,20 +73,25 @@ class BuildLauncher if (ObfuzSettings.Instance.buildPipelineSettings.enable) { - // GenerateObfuzLinkXml(); ObfuzMenu.GenerateEncryptionVM(); ObfuzMenu.SaveSecretFile(); - // obfuz 的 generate all - // PrebuildCommandExt.GenerateAll(); - KedrExtensionMenu.GenerateAll(); - + var kedrType = Type.GetType("KedrExtensionMenu, Assembly-CSharp-Editor"); + if (kedrType != null) + { + var method = kedrType.GetMethod("GenerateAll", + BindingFlags.Public | BindingFlags.Static); + method?.Invoke(null, null); + } + else + { + Debug.LogWarning("[Obfuz] KedrExtensionMenu not found, falling back to PrebuildCommandExt"); + PrebuildCommandExt.GenerateAll(); + } } else { - // #region 未接入Obfuz PrebuildCommand.GenerateAll(); - // #endregion } HotUpadeEditorHelper.CopyHotUpdateDll(); diff --git a/ProjectNLD/Assets/Editor/KedrExtension.meta b/ProjectNLD/Assets/Editor/KedrExtension.meta deleted file mode 100644 index fb3ee5bfdf8..00000000000 --- a/ProjectNLD/Assets/Editor/KedrExtension.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2f924162a120446a945bec50417f2be6 -timeCreated: 1769251206 \ No newline at end of file diff --git a/ProjectNLD/Assets/PhxhSDK b/ProjectNLD/Assets/PhxhSDK index 0a421ace23a..e34df460b03 160000 --- a/ProjectNLD/Assets/PhxhSDK +++ b/ProjectNLD/Assets/PhxhSDK @@ -1 +1 @@ -Subproject commit 0a421ace23a885ad4c6102f1f92e81237cb73219 +Subproject commit e34df460b0329a2326e22193dbebada574037b78 diff --git a/ProjectNLD/ProjectSettings/Obfuz.asset b/ProjectNLD/ProjectSettings/Obfuz.asset index 41c62250ee1..440c0f1160f 100644 --- a/ProjectNLD/ProjectSettings/Obfuz.asset +++ b/ProjectNLD/ProjectSettings/Obfuz.asset @@ -90,6 +90,6 @@ MonoBehaviour: text: Obfuscated by Obfuz signatureLength: 256 polymorphicDllSettings: - enable: 1 + enable: 0 codeGenerationSecretKey: obfuz-phxh-polymorphic-check-dll - disableLoadStandardDll: 1 + disableLoadStandardDll: 0 diff --git a/ProjectNLD/Assets/Editor/KedrExtension/HashUtil.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/HashUtil.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/HashUtil.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/HashUtil.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/HashUtil.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/HashUtil.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/HashUtil.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/HashUtil.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionMenu.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionMenu.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionMenu.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionMenu.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionMenu.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionMenu.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionMenu.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionMenu.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionSettings.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionSettings.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionSettings.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionSettings.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionSettings.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionSettings.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/KedrExtensionSettings.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/KedrExtensionSettings.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/OpCodeShuffleCommand.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/OpCodeShuffleCommand.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/OpCodeShuffleCommand.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/OpCodeShuffleCommand.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/OpCodeShuffleCommand.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/OpCodeShuffleCommand.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/OpCodeShuffleCommand.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/OpCodeShuffleCommand.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Opcode.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Opcode.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Opcode.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Opcode.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Opcode.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Opcode.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Opcode.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Opcode.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Patches.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Patches.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Patches.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Patches.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Patches.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Patches.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Patches.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Patches.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/RandomUtil.cs b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/RandomUtil.cs similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/RandomUtil.cs rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/RandomUtil.cs diff --git a/ProjectNLD/Assets/Editor/KedrExtension/RandomUtil.cs.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/RandomUtil.cs.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/RandomUtil.cs.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/RandomUtil.cs.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Templates.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Templates.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.cpp.tpl.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.h.tpl b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.h.tpl similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.h.tpl rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.h.tpl diff --git a/ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.h.tpl.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.h.tpl.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/Templates/Opcodes.h.tpl.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/Templates/Opcodes.h.tpl.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/ThirdParty.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/ThirdParty.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/ThirdParty.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/ThirdParty.meta diff --git a/ProjectNLD/Assets/Editor/KedrExtension/ThirdParty/0Harmony.dll b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/ThirdParty/0Harmony.dll similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/ThirdParty/0Harmony.dll rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/ThirdParty/0Harmony.dll diff --git a/ProjectNLD/Assets/Editor/KedrExtension/ThirdParty/0Harmony.dll.meta b/Tool/Obfuz/EditorAssets/Editor/KedrExtension/ThirdParty/0Harmony.dll.meta similarity index 100% rename from ProjectNLD/Assets/Editor/KedrExtension/ThirdParty/0Harmony.dll.meta rename to Tool/Obfuz/EditorAssets/Editor/KedrExtension/ThirdParty/0Harmony.dll.meta diff --git a/ProjectNLD/ProjectSettings/KedrExtensionSettings.asset b/Tool/Obfuz/ProjectSettings/KedrExtensionSettings.asset similarity index 100% rename from ProjectNLD/ProjectSettings/KedrExtensionSettings.asset rename to Tool/Obfuz/ProjectSettings/KedrExtensionSettings.asset diff --git a/Tool/build_tools b/Tool/build_tools index a46840afd85..3db9a2dc871 160000 --- a/Tool/build_tools +++ b/Tool/build_tools @@ -1 +1 @@ -Subproject commit a46840afd8585396b02348436521c75e598c80db +Subproject commit 3db9a2dc871f4d33a07414e6d21da3fa1c66d89c