Compare commits
No commits in common. "11002aaccda373d665c7cd14ed37d9737c5a44ad" and "15aa840061aed7b3d3f26509b14ab49bacb195bf" have entirely different histories.
11002aaccd
...
15aa840061
|
|
@ -1,6 +1,3 @@
|
|||
using System.Collections.Generic;
|
||||
using NUnit.Framework;
|
||||
|
||||
#if UNITY_ANDROID
|
||||
namespace Guru
|
||||
{
|
||||
|
|
@ -16,8 +13,7 @@ namespace Guru
|
|||
/// Android混淆器内容填充
|
||||
/// 于应用构建前执行
|
||||
/// </summary>
|
||||
// public class UserProguardHelper: IPreprocessBuildWithReport
|
||||
public class UserProguardHelper
|
||||
public class UserProguardHelper: IPreprocessBuildWithReport
|
||||
{
|
||||
public int callbackOrder { get; } = 0;
|
||||
public void OnPreprocessBuild(BuildReport report)
|
||||
|
|
@ -31,6 +27,7 @@ namespace Guru
|
|||
string proguardPath = $"{Application.dataPath}/Plugins/Android/proguard-user.txt";
|
||||
if (File.Exists(proguardPath))
|
||||
{
|
||||
List<string> keeps = new List<string>();
|
||||
DirectoryInfo dir = new DirectoryInfo(Application.dataPath);
|
||||
string raw = File.ReadAllText(proguardPath);
|
||||
|
||||
|
|
@ -44,40 +41,36 @@ namespace Guru
|
|||
}
|
||||
|
||||
// Debug.Log($"--- Proguard Files: {files.Length}");
|
||||
|
||||
ProguardItemBuilder builder = new ProguardItemBuilder();
|
||||
|
||||
var allItems = new List<ProguardItem>(30);
|
||||
|
||||
string[] lines = null;
|
||||
string[] lens = null;
|
||||
string l = "";
|
||||
for (int i = 0; i < files.Count; i++)
|
||||
{
|
||||
lines = File.ReadAllLines(files[i].FullName);
|
||||
var items = builder.BuildItemsFormLines(lines);
|
||||
if(items != null && items.Count > 0) allItems.AddRange(items);
|
||||
lens = File.ReadAllLines(files[i].FullName);
|
||||
foreach (var s in lens)
|
||||
{
|
||||
l = s.TrimStart();
|
||||
if(string.IsNullOrEmpty(l)) continue;
|
||||
if(raw.Contains(l)) continue;
|
||||
keeps.Add(l);
|
||||
Debug.Log($"--- ✏️ Apply: [ {l} ]");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
List<string> finalLines = new List<string>(50);
|
||||
foreach (var item in allItems)
|
||||
{
|
||||
finalLines.AddRange(item.lines);
|
||||
}
|
||||
|
||||
File.WriteAllLines(proguardPath, finalLines.ToArray());
|
||||
Debug.Log($"--- Update proguard-user.txt done! ☀️ ---");
|
||||
}
|
||||
|
||||
if (keeps.Count == 0) return; // 无注入文件则退出
|
||||
|
||||
List<string> lines = File.ReadAllLines(proguardPath).ToList();
|
||||
lines.Add("");
|
||||
lines.AddRange(keeps);
|
||||
|
||||
File.WriteAllLines(proguardPath, lines.ToArray());
|
||||
Debug.Log($"--- Update proguard-user.txt done! ☀️ ---");
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
[MenuItem("Tools/Android/Add proguard-user")]
|
||||
private static void EditorAddProguardUser()
|
||||
{
|
||||
|
|
@ -85,67 +78,6 @@ namespace Guru
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
internal class ProguardItemBuilder
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public List<ProguardItem> BuildItemsFormLines(string[] lines)
|
||||
{
|
||||
List<ProguardItem> items = new List<ProguardItem>(30);
|
||||
|
||||
string line = "";
|
||||
ProguardItem curItem = null;
|
||||
|
||||
for(int i =0; i < lines.Length; i++)
|
||||
{
|
||||
line = lines[i];
|
||||
|
||||
if(string.IsNullOrEmpty(line)) continue;
|
||||
|
||||
if (curItem == null)
|
||||
{
|
||||
curItem = new ProguardItem();
|
||||
}
|
||||
|
||||
curItem.Append(line);
|
||||
|
||||
if(line.Contains("}"))
|
||||
{
|
||||
items.Add(curItem);
|
||||
curItem = null;
|
||||
}
|
||||
}
|
||||
|
||||
return items;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
internal class ProguardItem
|
||||
{
|
||||
public List<string> lines = new List<string>();
|
||||
public string key = "";
|
||||
|
||||
public void Append(string line)
|
||||
{
|
||||
if (string.IsNullOrEmpty(key) &&
|
||||
line.StartsWith("-"))
|
||||
{
|
||||
key = line;
|
||||
}
|
||||
|
||||
if (lines == null) lines = new List<string>(5);
|
||||
lines.Add(line);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -7,9 +7,7 @@ namespace Guru.Editor
|
|||
using UnityEditor.Callbacks;
|
||||
using UnityEditor.iOS.Xcode;
|
||||
using UnityEngine;
|
||||
|
||||
// ----------- SKAdNetwork 更新版本日志： 2024-06-27 --------------------
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SKAdNetwork 注入逻辑
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -596,10 +596,6 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>k6y4y55b64.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>6yxyv74ff7.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>t6d3zquu66.skadnetwork</string>
|
||||
|
|
@ -612,10 +608,6 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>h65wbv5k3f.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>tvvz7th9br.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>bvpn9ufa9b.skadnetwork</string>
|
||||
|
|
@ -624,93 +616,33 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>hjevpa356n.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>6yxyv74ff7.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>mqn7fxpca7.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>vhf287vqwu.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>g6gcrrvk4p.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>ce8ybjwass.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>jk2fsx2rgz.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>z959bm4gru.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>dt3cjx1a9i.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>z4gj7hsk7h.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>ln5gz23vtd.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>pu4na253f3.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>6rd35atwn8.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>gvmwg8q7h5.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>fz2k2k5tej.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>7953jerfzd.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>577p5t736z.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>tmhh9296z4.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>7fbxrn65az.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>r8lj5b58b5.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>qu637u8glc.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>7bxrt786m8.skadnetwork</string>
|
||||
<string>g6gcrrvk4p.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>xga6mpmplv.skadnetwork</string>
|
||||
<string>ln5gz23vtd.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>55644vm79v.skadnetwork</string>
|
||||
<string>z959bm4gru.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
|
|
@ -718,7 +650,23 @@
|
|||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>mj797d8u6f.skadnetwork</string>
|
||||
<string>gvmwg8q7h5.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>pu4na253f3.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>yrqqpx2mcb.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>z4gj7hsk7h.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>bd757ywx3.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
|
|
@ -730,11 +678,11 @@
|
|||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>qwpu75vrh2.skadnetwork</string>
|
||||
<string>633vhxswh4.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>633vhxswh4.skadnetwork</string>
|
||||
<string>tmhh9296z4.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
|
|
@ -784,6 +732,10 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>899vrgt9g8.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>mj797d8u6f.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>88k8774x49.skadnetwork</string>
|
||||
|
|
@ -816,6 +768,10 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>t7ky8fmwkd.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>fz2k2k5tej.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>w28pnjg2k4.skadnetwork</string>
|
||||
|
|
@ -868,6 +824,10 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>dmv22haz9p.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>7fbxrn65az.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>b55w3d8y8z.skadnetwork</string>
|
||||
|
|
@ -960,18 +920,6 @@
|
|||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>x2jnk7ly8j.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>yrqqpx2mcb.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>bd757ywx3.skadnetwork</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>SKAdNetworkIdentifier</key>
|
||||
<string>w7jznl3r6g.skadnetwork</string>
|
||||
</dict>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -71,7 +71,7 @@ PluginImporter:
|
|||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
AddToEmbeddedBinaries: true
|
||||
AddToEmbeddedBinaries: false
|
||||
CPU: AnyCPU
|
||||
CompileFlags:
|
||||
FrameworkDependencies:
|
||||
|
|
|
|||
Loading…
Reference in New Issue