修复了PEPack不受enable开关控制的bug,向上适配了Unity2022

Ether2023 · Jan 3, 2023 · 8cd2116 · 8cd2116
1 parent dfec971
commit 8cd2116
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 65 deletions.
diff --git a/Unity Project/O&Z_2019_4_32_f1/Assets/O&ZProtector/Config.asset b/Unity Project/O&Z_2019_4_32_f1/Assets/O&ZProtector/Config.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7c8233b3054f50b469533bcaf15c8469, type: 3}
   m_Name: Config
   m_EditorClassIdentifier: 
-  Enable: 0
+  Enable: 1
   key: 114514
   Version: 0
   Obfus:

diff --git a/Unity Project/O&Z_2019_4_32_f1/Assets/O&ZProtector/Editor/ObfusDLLs.cs b/Unity Project/O&Z_2019_4_32_f1/Assets/O&ZProtector/Editor/ObfusDLLs.cs
@@ -6,61 +6,18 @@
 using UnityEditor;
 using UnityEditor.Il2Cpp;
 using UnityEditor.Callbacks;
-using OZ_Obfuscator.Ofbuscators;
-using OZ_Obfus;
-using OZ_Obfus.obfuscators;
+using OZ_Obfuscator.Obfuscators;
 using System.IO;
 using O_Z_IL2CPP_Security.LitJson;
 using System;
 using System.Text.RegularExpressions;
+using OZ_Obfuscator;
 
 public class ObfusDLLs : IPostBuildPlayerScriptDLLs, IPreprocessBuildWithReport , IPostprocessBuildWithReport
 {
     private static _OZ_Obfuscator _OZ = new _OZ_Obfuscator();
     private static OZ_Config config;
     public int callbackOrder { get { return 0; } }
-    /*
-    public void OnBeforeConvertRun(BuildReport report, Il2CppBuildPipelineData data)
-    {
-        if (!File.Exists(Application.dataPath + "/Assets/O&ZProtector/Config.asset"))
-            Debug.LogError("Config Exists!");
-        else
-        {
-            OZ_Config _Config = ScriptableObject.CreateInstance<OZ_Config>();
-            AssetDatabase.CreateAsset(_Config, "Assets/O&ZProtector/Config.asset");
-            Debug.LogError("Not Found Confgi,New Config Generated!Please reconfigure the Config ");
-            return;
-        }
-        OZ_Config config = AssetDatabase.LoadAssetAtPath<OZ_Config>("Assets/O&ZProtector/Config.asset");
-        AssemblyLoader loader = new AssemblyLoader(data.inputDirectory+ "\\Assembly-CSharp.dll");
-        OZ_Obfus.OZ_Obfuscator obfuscator = new OZ_Obfus.OZ_Obfuscator(loader.Module,config.Obfus, config.Keyfunc);
-        if (config.Obfus.ControlFlow)
-        {
-            obfuscator.controlFlow.Execute();
-        }
-        if (config.Obfus.Obfusfunc)
-        {
-            obfuscator.obfusFunc.Excute();
-        }
-        if (config.Obfus.NumObfus)
-        {
-            obfuscator.numObfus.Execute();
-        }
-        if (config.Obfus.LocalVariables2Field)
-        {
-            obfuscator.localVariables2Field.Execute();
-        }
-        if (config.Obfus.StrCrypter)
-        {
-            obfuscator.strCrypter.Execute();
-        }
-        loader.Save();
-        File.Delete(data.inputDirectory + "\\Assembly-CSharp.dll");
-        File.Move(data.inputDirectory + "\\Assembly-CSharp.dllProtected", data.inputDirectory + "\\Assembly-CSharp.dll");
-        Debug.Log("Protected Assembly-CSharp.dll Obfuscated!");
-        Debug.Log("Obfuscation Done!");
-    }
-*/
     public void OnPreprocessBuild(BuildReport report)
     {
         config = AssetDatabase.LoadAssetAtPath<OZ_Config>("Assets/O&ZProtector/Config.asset");
@@ -106,7 +63,7 @@ public void OnPostprocessBuild (BuildReport report)
         {
             if (config.Enable)
             {
-                Debug.Log(report.summary.outputPath);
+                //Debug.Log(report.summary.outputPath);
                 string path = Path.GetDirectoryName(report.summary.outputPath)+"\\";
                 path = path + Path.GetFileNameWithoutExtension(report.summary.outputPath) + "_Data\\Managed\\Assembly-CSharp.dll";
 
@@ -165,36 +122,43 @@ public void Obfusdll()
 
         }
         AssemblyLoader loader = new AssemblyLoader(File.ReadAllBytes(asmpath));
-        OZ_Obfus.OZ_Obfuscator obfuscator = new OZ_Obfus.OZ_Obfuscator(loader.Module, config.Obfus, config.Keyfunc);
+        List<Obfuscator> obfuscators = new List<Obfuscator>();
         if (config.Obfus.ControlFlow)
         {
-            obfuscator.controlFlow.Execute();
+            obfuscators.Add(new ControlFlow(loader.Module, config.Obfus.ignore_ControlFlow_Method));
         }
         if (config.Obfus.Obfusfunc)
         {
-            obfuscator.obfusFunc.Excute();
+            obfuscators.Add(new ObfusFunc(loader.Module));
         }
         if (config.Obfus.NumObfus)
         {
-            obfuscator.numObfus.Execute();
+            obfuscators.Add(new NumObfus(loader.Module));
         }
         if (config.Obfus.LocalVariables2Field)
         {
-            obfuscator.localVariables2Field.Execute();
+            obfuscators.Add(new LocalVariables2Field(loader.Module));
         }
         if (config.Obfus.StrCrypter)
         {
-            obfuscator.strCrypter.Execute();
+            obfuscators.Add(new StrCrypter(loader.Module));
         }
         if (config.Obfus.AntiDe4dot)
         {
-            obfuscator.antide4dot.Execute();
+            obfuscators.Add(new Antide4dot(loader.Module));
         }
         if (config.Obfus.FuckILdasm)
         {
-            obfuscator.fuckILdasm.Execute();
+            obfuscators.Add(new FuckILdasm(loader.Module));
+        }
+        foreach (var obfuscator in obfuscators)
+        {
+            string outstr = obfuscator.ToString();
+            int i = outstr.IndexOf("Obfuscators.");
+            outstr = outstr.Substring(i + 12, outstr.Length - i - 12);
+            Debug.Log(outstr + " Executing...");
+            obfuscator.Execute();
         }
-        //File.Delete(asmpath);
         loader.Save(asmpath);
         IsSuccess = true;
         Obfuscated = true;

diff --git a/Unity Project/O&Z_2019_4_32_f1/Assets/O&ZProtector/Plugins/OZ_Obfuscator.dll b/Unity Project/O&Z_2019_4_32_f1/Assets/O&ZProtector/Plugins/OZ_Obfuscator.dll
diff --git a/Unity Project/O&Z_2019_4_32_f1/NavMeshComponents.csproj b/Unity Project/O&Z_2019_4_32_f1/NavMeshComponents.csproj
@@ -638,12 +638,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>C:\Program Files\Unity 2019.4.32f1\Editor\Data\MonoBleedingEdge\lib\mono\unityscript\Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>

diff --git a/Unity Project/O&Z_2019_4_32_f1/NavMeshComponentsEditor.csproj b/Unity Project/O&Z_2019_4_32_f1/NavMeshComponentsEditor.csproj
@@ -643,12 +643,12 @@
     <Reference Include="Boo.Lang">
       <HintPath>C:\Program Files\Unity 2019.4.32f1\Editor\Data\MonoBleedingEdge\lib\mono\unityscript\Boo.Lang.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEditor.TestRunner">
       <HintPath>Library\ScriptAssemblies\UnityEditor.TestRunner.dll</HintPath>
     </Reference>

diff --git a/Unity Project/O&Z_2019_4_32_f1/Unity.2DPlatformer.Tutorials.csproj b/Unity Project/O&Z_2019_4_32_f1/Unity.2DPlatformer.Tutorials.csproj
@@ -641,12 +641,12 @@
     <Reference Include="Unity.Connect.Share.Editor">
       <HintPath>Library\ScriptAssemblies\Unity.Connect.Share.Editor.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEditor.TestRunner">
       <HintPath>Library\ScriptAssemblies\UnityEditor.TestRunner.dll</HintPath>
     </Reference>