- add: type runtime auto init

Author: DucNV2000

Editor/IapSettingsEditor.cs

@@ -11,6 +11,7 @@ public class IapSettingsEditor : Editor
     {
         private IapSettings _iapSettings;
         private SerializedProperty _runtimeAutoInit;
+        private SerializedProperty _runtimeAutoInitType;
         private SerializedProperty _iapDataProducts;
         private SerializedProperty _isValidatePurchase;
         private SerializedProperty _googlePlayStoreKey;
@@ -19,6 +20,7 @@ void Init()
         {
             _iapSettings = target as IapSettings;
             _runtimeAutoInit = serializedObject.FindProperty("runtimeAutoInit");
+            _runtimeAutoInitType = serializedObject.FindProperty("runtimeAutoInitType");
             _iapDataProducts = serializedObject.FindProperty("iapDataProducts");
             _isValidatePurchase = serializedObject.FindProperty("isValidatePurchase");
             _googlePlayStoreKey = serializedObject.FindProperty("googlePlayStoreKey");
@@ -32,6 +34,12 @@ public override void OnInspectorGUI()
             GuiLine(2);
             GUILayout.Space(10);
             EditorGUILayout.PropertyField(_runtimeAutoInit);
+            if (_runtimeAutoInit.boolValue)
+            {
+                EditorGUILayout.PropertyField(_runtimeAutoInitType);
+            }
+
+            GUILayout.Space(10);
             EditorGUILayout.PropertyField(_iapDataProducts);
             GUILayout.Space(10);
             if (GUILayout.Button("Generate Product"))
@@ -128,7 +136,8 @@ void ObfuscatorKeyImpl()
             var asmdef = (TextAsset)AssetDatabase.LoadAssetAtPath(pathAsmdef, typeof(TextAsset));
             var meta = (TextAsset)AssetDatabase.LoadAssetAtPath(pathAsmdefMeta, typeof(TextAsset));
             string path = Path.Combine(TangleFileConsts.k_OutputPath, "UnityCommon.Purchasing.Generate.asmdef");
-            string pathMeta = Path.Combine(TangleFileConsts.k_OutputPath, "UnityCommon.Purchasing.Generate.asmdef.meta");
+            string pathMeta =
+                Path.Combine(TangleFileConsts.k_OutputPath, "UnityCommon.Purchasing.Generate.asmdef.meta");
             if (!File.Exists(path))
             {
                 var writer = new StreamWriter(path, false);

Runtime/IapManager.cs

@@ -237,18 +237,6 @@ ProductType ConvertProductType(IapProductType iapProductType)
             return ProductType.Consumable;
         }
 
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
-        private static void AutoInitialize()
-        {
-            if (IapSettings.Instance == null) return;
-            if (IapSettings.Instance.RuntimeAutoInit)
-            {
-                var iapManager = new GameObject("IapManager");
-                iapManager.AddComponent<IapManager>();
-                DontDestroyOnLoad(iapManager);
-            }
-        }
-
         #region Internal API
 
         private IapDataProduct InternalPurchaseProduct(string id)

Runtime/IapSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using VirtueSky.Core;
 
 namespace VirtueSky.Iap
 {
@@ -22,13 +23,15 @@ public static IapSettings Instance
         }
 
         [SerializeField] private bool runtimeAutoInit = true;
+        [SerializeField] private CoreEnum.RuntimeAutoInitType runtimeAutoInitType;
         [SerializeField] private List<IapDataProduct> iapDataProducts = new List<IapDataProduct>();
         [SerializeField] private bool isValidatePurchase = true;
 #if UNITY_EDITOR
         [SerializeField, TextArea] private string googlePlayStoreKey;
         public string GooglePlayStoreKey => googlePlayStoreKey;
 #endif
         public bool RuntimeAutoInit => runtimeAutoInit;
+        public CoreEnum.RuntimeAutoInitType RuntimeAutoInitType => runtimeAutoInitType;
         public List<IapDataProduct> IapDataProducts => iapDataProducts;
         public bool IsValidatePurchase => isValidatePurchase;
 

Runtime/IapStatic.cs

@@ -1,10 +1,35 @@
 using System;
+using UnityEngine;
+using VirtueSky.Core;
 
 
 namespace VirtueSky.Iap
 {
     public static class IapStatic
     {
+#if VIRTUESKY_IAP
+        [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 iapRuntimeAutoInitType)
+        {
+            if (IapSettings.Instance == null) return;
+            if (!IapSettings.Instance.RuntimeAutoInit) return;
+            if (IapSettings.Instance.RuntimeAutoInitType != iapRuntimeAutoInitType) return;
+            var iapManager = new GameObject("IapManager");
+            iapManager.AddComponent<IapManager>();
+            UnityEngine.Object.DontDestroyOnLoad(iapManager);
+        }
+#endif
         public static IapDataProduct OnCompleted(this IapDataProduct product, Action onComplete)
         {
             product.purchaseSuccessCallback = onComplete;

Runtime/UnityCommon.IAP.asmdef

@@ -1,30 +1,31 @@
 {
-    "name": "UnityCommon.IAP",
-    "rootNamespace": "",
-    "references": [
-        "GUID:60bfecf5cb232594891bc622f40d6bed",
-        "GUID:94e1de2458b07d0bf1e9f13e6ae06443",
-        "GUID:e63a64384cc3ef04cac761c1ce76e9c2",
-        "GUID:d0bf1e9f644394e1de13e6ae02458b07",
-        "GUID:08d1c582746949b40ba6a45cdb776bdf",
-        "GUID:fe25561d224ed4743af4c60938a59d0b",
-        "GUID:70ea675efa2644cef98c7ece24158333",
-        "GUID:5a4d3c3ff86da0f459ebef74b42549cd",
-        "GUID:ae6fee6164ec0134e9a5b8094e226755"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "com.unity.purchasing",
-            "expression": "4.11.0",
-            "define": "VIRTUESKY_IAP"
-        }
-    ],
-    "noEngineReferences": false
+  "name": "UnityCommon.IAP",
+  "rootNamespace": "",
+  "references": [
+    "GUID:60bfecf5cb232594891bc622f40d6bed",
+    "GUID:94e1de2458b07d0bf1e9f13e6ae06443",
+    "GUID:e63a64384cc3ef04cac761c1ce76e9c2",
+    "GUID:d0bf1e9f644394e1de13e6ae02458b07",
+    "GUID:08d1c582746949b40ba6a45cdb776bdf",
+    "GUID:fe25561d224ed4743af4c60938a59d0b",
+    "GUID:70ea675efa2644cef98c7ece24158333",
+    "GUID:5a4d3c3ff86da0f459ebef74b42549cd",
+    "GUID:ae6fee6164ec0134e9a5b8094e226755",
+    "GUID:7be4b92359ce2d8459bbb5183b835c1a"
+  ],
+  "includePlatforms": [],
+  "excludePlatforms": [],
+  "allowUnsafeCode": false,
+  "overrideReferences": false,
+  "precompiledReferences": [],
+  "autoReferenced": true,
+  "defineConstraints": [],
+  "versionDefines": [
+    {
+      "name": "com.unity.purchasing",
+      "expression": "4.11.0",
+      "define": "VIRTUESKY_IAP"
+    }
+  ],
+  "noEngineReferences": false
 }