- add: type runtime auto init

Author: DucNV2000

Editor/AdSettingsEditor.cs

@@ -8,6 +8,7 @@ public class AdSettingsEditor : Editor
     {
         private AdSettings _adSettings;
         private SerializedProperty _runtimeAutoInit;
+        private SerializedProperty _runtimeAutoInitType;
         private SerializedProperty _adCheckingInterval;
         private SerializedProperty _adLoadingInterval;
         private SerializedProperty _adNetwork;
@@ -41,6 +42,7 @@ void Initialize()
         {
             _adSettings = target as AdSettings;
             _runtimeAutoInit = serializedObject.FindProperty("runtimeAutoInit");
+            _runtimeAutoInitType = serializedObject.FindProperty("runtimeAutoInitType");
             _adCheckingInterval = serializedObject.FindProperty("adCheckingInterval");
             _adLoadingInterval = serializedObject.FindProperty("adLoadingInterval");
             _adNetwork = serializedObject.FindProperty("adNetwork");
@@ -76,6 +78,12 @@ public override void OnInspectorGUI()
             GuiLine(2);
             GUILayout.Space(10);
             EditorGUILayout.PropertyField(_runtimeAutoInit);
+            if (_runtimeAutoInit.boolValue)
+            {
+                EditorGUILayout.PropertyField(_runtimeAutoInitType);
+            }
+
+            GUILayout.Space(10);
             EditorGUILayout.PropertyField(_adCheckingInterval);
             EditorGUILayout.PropertyField(_adLoadingInterval);
             EditorGUILayout.PropertyField(_adNetwork);

Runtime/General/AdSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using VirtueSky.Core;
 
 namespace VirtueSky.Ads
 {
@@ -22,6 +23,7 @@ public static AdSettings Instance
         }
 
         [SerializeField] private bool runtimeAutoInit = true;
+        [SerializeField] private CoreEnum.RuntimeAutoInitType runtimeAutoInitType;
         [Range(5, 100), SerializeField] private float adCheckingInterval = 8f;
         [Range(5, 100), SerializeField] private float adLoadingInterval = 15f;
         [SerializeField] private AdNetwork adNetwork = AdNetwork.Max;
@@ -126,6 +128,7 @@ public string AppKey
 
 
         public bool RuntimeAutoInit => runtimeAutoInit;
+        public CoreEnum.RuntimeAutoInitType RuntimeAutoInitType => runtimeAutoInitType;
         public float AdCheckingInterval => adCheckingInterval;
         public float AdLoadingInterval => adLoadingInterval;
 

Runtime/General/AdStatic.cs

@@ -1,10 +1,35 @@
 using System;
 using UnityEngine;
+using VirtueSky.Core;
 
 namespace VirtueSky.Ads
 {
     public static class AdStatic
     {
+#if VIRTUESKY_ADS
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+        private static void RuntimeBeforeSceneLoad()
+        {
+            AutoInitialize(CoreEnum.RuntimeAutoInitType.BeforeSceneLoad);
+        }
+
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
+        private static void RuntimeAfterSceneLoad()
+        {
+            AutoInitialize(CoreEnum.RuntimeAutoInitType.AfterSceneLoad);
+        }
+
+        private static void AutoInitialize(CoreEnum.RuntimeAutoInitType adsRuntimeAutoInitType)
+        {
+            if (AdSettings.Instance == null) return;
+            if (!AdSettings.Instance.RuntimeAutoInit) return;
+            if (AdSettings.Instance.RuntimeAutoInitType != adsRuntimeAutoInitType) return;
+            var ads = new GameObject("Advertising");
+            ads.AddComponent<Advertising>();
+            UnityEngine.Object.DontDestroyOnLoad(ads);
+        }
+
+#endif
         public static bool IsRemoveAd
         {
 #if VIRTUESKY_DATA

Runtime/General/Advertising.cs

@@ -49,7 +49,7 @@ private void Start()
             if (adSettings.EnableGDPR)
             {
 #if VIRTUESKY_ADMOB
-                InitGDPR();
+                InitGdpr();
 #endif
             }
             else
@@ -143,9 +143,11 @@ void AutoLoadAppOpenAds()
         #region Admob GDPR
 
 #if VIRTUESKY_ADMOB
-        private void InitGDPR()
+        private void InitGdpr()
         {
-#if !UNITY_EDITOR
+#if UNITY_EDITOR
+            InitAdClient();
+#else
             string deviceID = SystemInfo.deviceUniqueIdentifier;
             string deviceIDUpperCase = deviceID.ToUpper();
 
@@ -236,20 +238,6 @@ private void ShowPrivacyOptionsForm()
 
         #endregion
 
-#if VIRTUESKY_ADS
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
-        private static void AutoInitialize()
-        {
-            if (AdSettings.Instance == null) return;
-            if (AdSettings.Instance.RuntimeAutoInit)
-            {
-                var ads = new GameObject("Advertising");
-                ads.AddComponent<Advertising>();
-                DontDestroyOnLoad(ads);
-            }
-        }
-#endif
-
 
         #region Public API