`ObfuzSettings.enable`字段移到`BuildPipelineSettings`中
parent
02ed0608e4
commit
655c2fe07f
|
@ -11,7 +11,7 @@ namespace Obfuz.ObfusPasses.ControlFlowObfus
|
||||||
var mcfc = new MethodControlFlowCalculator(method, ctx.CreateRandom(), ctx.constFieldAllocator, ctx.minInstructionCountOfBasicBlockToObfuscate);
|
var mcfc = new MethodControlFlowCalculator(method, ctx.CreateRandom(), ctx.constFieldAllocator, ctx.minInstructionCountOfBasicBlockToObfuscate);
|
||||||
if (!mcfc.TryObfus())
|
if (!mcfc.TryObfus())
|
||||||
{
|
{
|
||||||
Debug.LogWarning($"not obfuscate method: {method.FullName}");
|
//Debug.LogWarning($"not obfuscate method: {method.FullName}");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -6,6 +6,9 @@ namespace Obfuz.Settings
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public class BuildPipelineSettings
|
public class BuildPipelineSettings
|
||||||
{
|
{
|
||||||
|
[Tooltip("enable Obfuz")]
|
||||||
|
public bool enable = true;
|
||||||
|
|
||||||
[Tooltip("callback order of LinkXmlProcessor")]
|
[Tooltip("callback order of LinkXmlProcessor")]
|
||||||
public int linkXmlProcessCallbackOrder = 10000;
|
public int linkXmlProcessCallbackOrder = 10000;
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,6 @@ namespace Obfuz.Settings
|
||||||
|
|
||||||
public class ObfuzSettings : ScriptableObject
|
public class ObfuzSettings : ScriptableObject
|
||||||
{
|
{
|
||||||
[Tooltip("enable Obfuz")]
|
|
||||||
public bool enable = true;
|
|
||||||
|
|
||||||
[Tooltip("build pipeline settings")]
|
[Tooltip("build pipeline settings")]
|
||||||
public BuildPipelineSettings buildPipelineSettings;
|
public BuildPipelineSettings buildPipelineSettings;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace Obfuz.Settings
|
||||||
|
|
||||||
|
|
||||||
private SerializedObject _serializedObject;
|
private SerializedObject _serializedObject;
|
||||||
private SerializedProperty _enable;
|
|
||||||
private SerializedProperty _buildPipelineSettings;
|
private SerializedProperty _buildPipelineSettings;
|
||||||
|
|
||||||
private SerializedProperty _assemblySettings;
|
private SerializedProperty _assemblySettings;
|
||||||
|
@ -62,7 +61,6 @@ namespace Obfuz.Settings
|
||||||
var setting = ObfuzSettings.Instance;
|
var setting = ObfuzSettings.Instance;
|
||||||
_serializedObject?.Dispose();
|
_serializedObject?.Dispose();
|
||||||
_serializedObject = new SerializedObject(setting);
|
_serializedObject = new SerializedObject(setting);
|
||||||
_enable = _serializedObject.FindProperty("enable");
|
|
||||||
_buildPipelineSettings = _serializedObject.FindProperty("buildPipelineSettings");
|
_buildPipelineSettings = _serializedObject.FindProperty("buildPipelineSettings");
|
||||||
|
|
||||||
_assemblySettings = _serializedObject.FindProperty("assemblySettings");
|
_assemblySettings = _serializedObject.FindProperty("assemblySettings");
|
||||||
|
@ -91,7 +89,6 @@ namespace Obfuz.Settings
|
||||||
_serializedObject.Update();
|
_serializedObject.Update();
|
||||||
EditorGUI.BeginChangeCheck();
|
EditorGUI.BeginChangeCheck();
|
||||||
|
|
||||||
EditorGUILayout.PropertyField(_enable);
|
|
||||||
EditorGUILayout.PropertyField(_buildPipelineSettings);
|
EditorGUILayout.PropertyField(_buildPipelineSettings);
|
||||||
|
|
||||||
EditorGUILayout.PropertyField(_assemblySettings);
|
EditorGUILayout.PropertyField(_assemblySettings);
|
||||||
|
|
|
@ -70,7 +70,7 @@ namespace Obfuz.Unity
|
||||||
private static void RunObfuscate(BuildFile[] files)
|
private static void RunObfuscate(BuildFile[] files)
|
||||||
{
|
{
|
||||||
ObfuzSettings settings = ObfuzSettings.Instance;
|
ObfuzSettings settings = ObfuzSettings.Instance;
|
||||||
if (!settings.enable)
|
if (!settings.buildPipelineSettings.enable)
|
||||||
{
|
{
|
||||||
Debug.Log("Obfuscation is disabled.");
|
Debug.Log("Obfuscation is disabled.");
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue