From 655c2fe07f94c58f1f42a7e34fa0d479420cb655 Mon Sep 17 00:00:00 2001 From: walon Date: Sat, 28 Jun 2025 20:38:27 +0800 Subject: [PATCH] =?UTF-8?q?`ObfuzSettings.enable`=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=A7=BB=E5=88=B0`BuildPipelineSettings`=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/ObfusPasses/ControlFlowObfus/DefaultObfuscator.cs | 2 +- Editor/Settings/BuildPipelineSettings.cs | 3 +++ Editor/Settings/ObfuzSettings.cs | 3 --- Editor/Settings/ObfuzSettingsProvider.cs | 3 --- Editor/Unity/ObfuscationProcess.cs | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Editor/ObfusPasses/ControlFlowObfus/DefaultObfuscator.cs b/Editor/ObfusPasses/ControlFlowObfus/DefaultObfuscator.cs index 59aca82..9bd216a 100644 --- a/Editor/ObfusPasses/ControlFlowObfus/DefaultObfuscator.cs +++ b/Editor/ObfusPasses/ControlFlowObfus/DefaultObfuscator.cs @@ -11,7 +11,7 @@ namespace Obfuz.ObfusPasses.ControlFlowObfus var mcfc = new MethodControlFlowCalculator(method, ctx.CreateRandom(), ctx.constFieldAllocator, ctx.minInstructionCountOfBasicBlockToObfuscate); if (!mcfc.TryObfus()) { - Debug.LogWarning($"not obfuscate method: {method.FullName}"); + //Debug.LogWarning($"not obfuscate method: {method.FullName}"); return false; } return true; diff --git a/Editor/Settings/BuildPipelineSettings.cs b/Editor/Settings/BuildPipelineSettings.cs index 67777aa..8d167fa 100644 --- a/Editor/Settings/BuildPipelineSettings.cs +++ b/Editor/Settings/BuildPipelineSettings.cs @@ -6,6 +6,9 @@ namespace Obfuz.Settings [Serializable] public class BuildPipelineSettings { + [Tooltip("enable Obfuz")] + public bool enable = true; + [Tooltip("callback order of LinkXmlProcessor")] public int linkXmlProcessCallbackOrder = 10000; diff --git a/Editor/Settings/ObfuzSettings.cs b/Editor/Settings/ObfuzSettings.cs index 1169c0f..7ee3af8 100644 --- a/Editor/Settings/ObfuzSettings.cs +++ b/Editor/Settings/ObfuzSettings.cs @@ -8,9 +8,6 @@ namespace Obfuz.Settings public class ObfuzSettings : ScriptableObject { - [Tooltip("enable Obfuz")] - public bool enable = true; - [Tooltip("build pipeline settings")] public BuildPipelineSettings buildPipelineSettings; diff --git a/Editor/Settings/ObfuzSettingsProvider.cs b/Editor/Settings/ObfuzSettingsProvider.cs index 2c75757..c101aba 100644 --- a/Editor/Settings/ObfuzSettingsProvider.cs +++ b/Editor/Settings/ObfuzSettingsProvider.cs @@ -24,7 +24,6 @@ namespace Obfuz.Settings private SerializedObject _serializedObject; - private SerializedProperty _enable; private SerializedProperty _buildPipelineSettings; private SerializedProperty _assemblySettings; @@ -62,7 +61,6 @@ namespace Obfuz.Settings var setting = ObfuzSettings.Instance; _serializedObject?.Dispose(); _serializedObject = new SerializedObject(setting); - _enable = _serializedObject.FindProperty("enable"); _buildPipelineSettings = _serializedObject.FindProperty("buildPipelineSettings"); _assemblySettings = _serializedObject.FindProperty("assemblySettings"); @@ -91,7 +89,6 @@ namespace Obfuz.Settings _serializedObject.Update(); EditorGUI.BeginChangeCheck(); - EditorGUILayout.PropertyField(_enable); EditorGUILayout.PropertyField(_buildPipelineSettings); EditorGUILayout.PropertyField(_assemblySettings); diff --git a/Editor/Unity/ObfuscationProcess.cs b/Editor/Unity/ObfuscationProcess.cs index b3e375d..8dd48a3 100644 --- a/Editor/Unity/ObfuscationProcess.cs +++ b/Editor/Unity/ObfuscationProcess.cs @@ -70,7 +70,7 @@ namespace Obfuz.Unity private static void RunObfuscate(BuildFile[] files) { ObfuzSettings settings = ObfuzSettings.Instance; - if (!settings.enable) + if (!settings.buildPipelineSettings.enable) { Debug.Log("Obfuscation is disabled."); return;