From ec534cbd3d6b33e9ac7e1ae75448237de5f72a7d Mon Sep 17 00:00:00 2001 From: HuYufei Date: Wed, 27 Dec 2023 20:22:14 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0iOS=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Adjust/Editor/AdjustSettings.cs | 4 +-- Editor/CodeMods/AdjustMod.cs | 19 ++++++++++++++- Editor/GuruEditorAdjust/GuruAdjustSdkAPI.cs | 27 +++++++++++---------- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Adjust/Editor/AdjustSettings.cs b/Adjust/Editor/AdjustSettings.cs index ed46907..eb23e12 100644 --- a/Adjust/Editor/AdjustSettings.cs +++ b/Adjust/Editor/AdjustSettings.cs @@ -11,9 +11,9 @@ public class AdjustSettings : ScriptableObject [SerializeField] private bool _iOSFrameworkAdSupport = true; [SerializeField] - private bool _iOSFrameworkAdServices = false; + private bool _iOSFrameworkAdServices = true; [SerializeField] - private bool _iOSFrameworkAppTrackingTransparency = false; + private bool _iOSFrameworkAppTrackingTransparency = true; [SerializeField] private bool _iOSFrameworkStoreKit = false; [SerializeField] diff --git a/Editor/CodeMods/AdjustMod.cs b/Editor/CodeMods/AdjustMod.cs index 99765aa..67b3adc 100644 --- a/Editor/CodeMods/AdjustMod.cs +++ b/Editor/CodeMods/AdjustMod.cs @@ -12,7 +12,9 @@ namespace Guru.Editor.Adjust private static string CodeReplaceSample = "AssetDatabase.GUIDToAssetPath(guids[0]).Replace(\"AdjustSettings.cs\", \"AdjustSettings.asset\")"; - + + private static string CodeIOSFrameworkAdServices = "private bool _iOSFrameworkAdServices"; + private static string CodeIOSFrameworkATT = "private bool _iOSFrameworkAppTrackingTransparency"; @@ -74,6 +76,21 @@ namespace Guru.Editor.Adjust for (int i = 0; i < lines.Count; i++) { line = lines[i]; + if (line.Contains(CodeIOSFrameworkAdServices) && line.Contains("false")) + { + lines[i] = line.Replace("false", "true"); // 允许引入AdService + isDirty = true; + continue; + } + + if (line.Contains(CodeIOSFrameworkATT) && line.Contains("false")) + { + lines[i] = line.Replace("false", "true"); // 允许引入AdService + isDirty = true; + continue; + + } + if (line.Contains(CodeReplaceSample) && !line.Contains("//")) { lines[i] = $"//{line}"; diff --git a/Editor/GuruEditorAdjust/GuruAdjustSdkAPI.cs b/Editor/GuruEditorAdjust/GuruAdjustSdkAPI.cs index b052cb7..535c240 100644 --- a/Editor/GuruEditorAdjust/GuruAdjustSdkAPI.cs +++ b/Editor/GuruEditorAdjust/GuruAdjustSdkAPI.cs @@ -1,10 +1,9 @@ -using System.IO; -using UnityEditor; -using UnityEngine; - namespace Guru.Editor.Adjust { - + using System.IO; + using UnityEditor; + using UnityEngine; + /// /// 修改器API /// @@ -24,7 +23,7 @@ namespace Guru.Editor.Adjust get { #if GURU_SDK_DEV - return $"__upm/{PackageName}/Adjust/Editor"; + return $"__packages/{PackageName}/Adjust/Editor"; #endif return $"Packages/{PackageName}/Adjust/Editor"; } @@ -85,23 +84,25 @@ namespace Guru.Editor.Adjust // Make a new one var settings = ScriptableObject.CreateInstance(); + SerializedObject so = new SerializedObject(settings); + SerializedProperty p; + p = so.FindProperty("m_EditorClassIdentifier._iOSFrameworkAdSupport"); // 引入 AdSupport + if (p != null) p.boolValue = true; + p = so.FindProperty("m_EditorClassIdentifier._iOSFrameworkAdServices"); // 引入 AdServices + if (p != null) p.boolValue = true; + so.ApplyModifiedProperties(); AssetDatabase.CreateAsset(settings, AdjustSettingsAssetPath); AssetDatabase.SaveAssetIfDirty(settings); AssetDatabase.Refresh(); - Debug.Log($"[Guru] --- Create AdjustSettings at: \n{AdjustSettingsAssetPath}"); - return settings; } #endregion - - - public static void ApllyMods() + + public static void ApplyMods() { } - - } } \ No newline at end of file