From 292ef44badac36fc11fa25577fa723c6fdefd10b Mon Sep 17 00:00:00 2001 From: huyufei Date: Mon, 18 Mar 2024 16:52:38 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=20SKADNetwork=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE,=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IOS_POST_AD/IOSPostBuild_SKAdNetwork.cs | 40 ++++++++++++++----- .../IOS_POST_AD/SKADNetwork.plist | 28 ++++++------- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Editor/GuruBuildSuit/IOS_POST_AD/IOSPostBuild_SKAdNetwork.cs b/Editor/GuruBuildSuit/IOS_POST_AD/IOSPostBuild_SKAdNetwork.cs index d27c34f..6a2e010 100644 --- a/Editor/GuruBuildSuit/IOS_POST_AD/IOSPostBuild_SKAdNetwork.cs +++ b/Editor/GuruBuildSuit/IOS_POST_AD/IOSPostBuild_SKAdNetwork.cs @@ -18,6 +18,7 @@ namespace Guru.Editor private static readonly char DIR_CHAR = Path.DirectorySeparatorChar; public static readonly string OS_PLATFORM_LOCATION = $"Assets/Guru/GuruBuildTool/Editor/IOS_POST_AD/"; + public static readonly string SKADNetworkName = "SKADNetwork.plist"; [PostProcessBuild(10)] private static void OnPostProcessBuild(BuildTarget buildTarget, string path) @@ -40,19 +41,27 @@ namespace Guru.Editor public static void ReadSKADNetworkPlistFile() { - string plistPath = $"{Application.dataPath}/../{OS_PLATFORM_LOCATION}/SKADNetwork.plist"; - var plist = new PlistDocument(); - plist.ReadFromFile(plistPath); - var skADNetworksArr = plist.root["SKAdNetworkItems"].AsArray(); - if (skADNetworksArr != null) + string plistPath = Path.Combine(GetToolRootDir(), SKADNetworkName); + if (File.Exists(plistPath)) { - foreach (var plistElement in skADNetworksArr.values) + var plist = new PlistDocument(); + plist.ReadFromFile(plistPath); + var skADNetworksArr = plist.root["SKAdNetworkItems"].AsArray(); + if (skADNetworksArr != null) { - var adNetworkValue = plistElement.AsDict()[SKADNetworkIdentifier].AsString(); - if(!NETWORK_IDENTIFIER_ARRAY.Contains(adNetworkValue)) - NETWORK_IDENTIFIER_ARRAY.Add(adNetworkValue); + foreach (var plistElement in skADNetworksArr.values) + { + var adNetworkValue = plistElement.AsDict()[SKADNetworkIdentifier].AsString(); + if(!NETWORK_IDENTIFIER_ARRAY.Contains(adNetworkValue)) + NETWORK_IDENTIFIER_ARRAY.Add(adNetworkValue); + } } } + else + { + Debug.Log($"[POST] --- Inject SKADNetwork Failed: {plistPath}"); + } + } private static void AddPlatformADNetworkIdentifier(PlistElementArray plistElementArray, List arrays) @@ -67,6 +76,19 @@ namespace Guru.Editor { plistElementArray.AddDict().SetString(SKADNetworkIdentifier, value); } + + + private static string GetToolRootDir() + { + var guids = AssetDatabase.FindAssets($"{nameof(IOSPostBuild_SKAdNetwork)}"); + if (guids.Length > 0) + { + var path = Directory.GetParent(AssetDatabase.GUIDToAssetPath(guids[0])).FullName; + return path; + } + return $"{Application.dataPath.Replace("Assets", "Packages")}/com.guru.unity.sdk.core/Editor/GuruBuildSuit/IOS_POST_AD"; + } + } } diff --git a/Editor/GuruBuildSuit/IOS_POST_AD/SKADNetwork.plist b/Editor/GuruBuildSuit/IOS_POST_AD/SKADNetwork.plist index 50309fe..9b575a9 100644 --- a/Editor/GuruBuildSuit/IOS_POST_AD/SKADNetwork.plist +++ b/Editor/GuruBuildSuit/IOS_POST_AD/SKADNetwork.plist @@ -584,10 +584,18 @@ SKAdNetworkIdentifier y45688jllp.skadnetwork + + SKAdNetworkIdentifier + z24wtl6j62.skadnetwork + SKAdNetworkIdentifier zmvfpc5aq8.skadnetwork + + SKAdNetworkIdentifier + k6y4y55b64.skadnetwork + SKAdNetworkIdentifier t6d3zquu66.skadnetwork @@ -600,10 +608,6 @@ SKAdNetworkIdentifier h65wbv5k3f.skadnetwork - - SKAdNetworkIdentifier - gvn48r87g.skadnetwork - SKAdNetworkIdentifier bvpn9ufa9b.skadnetwork @@ -634,11 +638,15 @@ SKAdNetworkIdentifier - nu4557a4je.skadnetwork + ln5gz23vtd.skadnetwork SKAdNetworkIdentifier - cj5566h2ga.skadnetwork + z959bm4gru.skadnetwork + + + SKAdNetworkIdentifier + nu4557a4je.skadnetwork SKAdNetworkIdentifier @@ -656,10 +664,6 @@ SKAdNetworkIdentifier z4gj7hsk7h.skadnetwork - - SKAdNetworkIdentifier - z959bm4gru.skadnetwork - SKAdNetworkIdentifier bd757ywx3.skadnetwork @@ -912,10 +916,6 @@ SKAdNetworkIdentifier 5mv394q32t.skadnetwork - - SKAdNetworkIdentifier - ln5gz23vtd.skadnetwork - SKAdNetworkIdentifier x2jnk7ly8j.skadnetwork