- fix api and dependency

Author: DucNV2000

Editor/IapSettingsEditor.cs

@@ -64,6 +64,7 @@ void GenerateProductImpl()
             {
                 Directory.CreateDirectory(pathDefaultScript);
             }
+
             var productImplPath = $"{pathDefaultScript}/IapProduct.cs";
             var str = "namespace VirtueSky.Iap\n{";
             str += "\n\tpublic struct IapProduct\n\t{";
@@ -79,15 +80,15 @@ void GenerateProductImpl()
                     $"\n\t\tpublic static IapDataProduct Purchase{CultureInfo.CurrentCulture.TextInfo.ToTitleCase(itemName)}()";
                 str += "\n\t\t{";
                 str +=
-                    $"\n\t\t\treturn IapManager.Instance.PurchaseProduct(IapSettings.Instance.IapDataProducts[{i}]);";
+                    $"\n\t\t\treturn IapManager.PurchaseProduct(IapSettings.Instance.IapDataProducts[{i}]);";
                 str += "\n\t\t}";
                 str += "\n";
 
                 str +=
                     $"\n\t\tpublic static bool IsPurchased{CultureInfo.CurrentCulture.TextInfo.ToTitleCase(itemName)}()";
                 str += "\n\t\t{";
                 str +=
-                    $"\n\t\t\treturn IapManager.Instance.IsPurchasedProduct(IapSettings.Instance.IapDataProducts[{i}]);";
+                    $"\n\t\t\treturn IapManager.IsPurchasedProduct(IapSettings.Instance.IapDataProducts[{i}]);";
                 str += "\n\t\t}";
 
                 str += "\n";
@@ -96,7 +97,7 @@ void GenerateProductImpl()
                     $"\n\t\tpublic static string LocalizedPrice{CultureInfo.CurrentCulture.TextInfo.ToTitleCase(itemName)}()";
                 str += "\n\t\t{";
                 str +=
-                    $"\n\t\t\treturn IapManager.Instance.LocalizedPriceProduct(IapSettings.Instance.IapDataProducts[{i}]);";
+                    $"\n\t\t\treturn IapManager.LocalizedPriceProduct(IapSettings.Instance.IapDataProducts[{i}]);";
                 str += "\n\t\t}";
                 str += "\n";
             }
@@ -153,7 +154,8 @@ void GuiLine(int i_height = 1)
 
             EditorGUI.DrawRect(rect, new Color32(0, 0, 0, 255));
         }
-         string GetPathInCurrentEnvironent(string fullRelativePath)
+
+        string GetPathInCurrentEnvironent(string fullRelativePath)
         {
             var upmPath = $"Packages/com.wolf-package.in-app-purchasing/{fullRelativePath}";
             var normalPath = $"Assets/in-app-purchasing/{fullRelativePath}";

Runtime/IapManager.cs

@@ -12,7 +12,7 @@ namespace VirtueSky.Iap
     public class IapManager : MonoBehaviour, IDetailedStoreListener
     {
         public bool dontDestroyOnLoad = true;
-        public static IapManager Instance;
+        private static IapManager _instance;
         public static event Action<string> OnPurchaseSucceedEvent;
         public static event Action<string> OnPurchaseFailedEvent;
         public static event Action<Product> OnIapTrackingRevenueEvent;
@@ -30,9 +30,9 @@ private void Awake()
                 DontDestroyOnLoad(this.gameObject);
             }
 
-            if (Instance == null)
+            if (_instance == null)
             {
-                Instance = this;
+                _instance = this;
             }
             else
             {
@@ -42,7 +42,7 @@ private void Awake()
 
         private void OnDestroy()
         {
-            if (Instance == this) Instance = null;
+            if (_instance == this) _instance = null;
         }
 
         private void Start()
@@ -249,50 +249,67 @@ private static void AutoInitialize()
             }
         }
 
-        #region API
+        #region Internal API
 
-        public IapDataProduct PurchaseProduct(string id)
+        private IapDataProduct InternalPurchaseProduct(string id)
         {
             OnShowIapNativePopupEvent?.Invoke(true);
             var product = iapSettings.GetIapProduct(id);
             PurchaseProductInternal(product);
             return product;
         }
 
-        public IapDataProduct PurchaseProduct(IapDataProduct product)
+        private IapDataProduct InternalPurchaseProduct(IapDataProduct product)
         {
             OnShowIapNativePopupEvent?.Invoke(true);
             PurchaseProductInternal(product);
             return product;
         }
 
-        public bool IsPurchasedProduct(IapDataProduct product)
+        private bool InternalIsPurchasedProduct(IapDataProduct product)
         {
             if (_controller == null) return false;
             return ConvertProductType(product.iapProductType) == ProductType.NonConsumable &&
                    _controller.products.WithID(product.Id).hasReceipt;
         }
 
-        public bool IsPurchasedProduct(string id)
+        private bool InternalIsPurchasedProduct(string id)
         {
             if (_controller == null) return false;
             return ConvertProductType(iapSettings.GetIapProduct(id).iapProductType) == ProductType.NonConsumable &&
                    _controller.products.WithID(id).hasReceipt;
         }
 
-        public string LocalizedPriceProduct(IapDataProduct product)
+        private string InternalLocalizedPriceProduct(IapDataProduct product)
         {
             if (_controller == null) return "";
             return _controller.products.WithID(product.Id).metadata.localizedPriceString;
         }
 
-        public string LocalizedPriceProduct(string id)
+        private string InternalLocalizedPriceProduct(string id)
         {
             if (_controller == null) return "";
             return _controller.products.WithID(id).metadata.localizedPriceString;
         }
 
         #endregion
+
+        #region Public API
+
+        public static IapDataProduct PurchaseProduct(string id) => _instance.InternalPurchaseProduct(id);
+
+        public static IapDataProduct PurchaseProduct(IapDataProduct product) =>
+            _instance.InternalPurchaseProduct(product);
+
+        public static bool IsPurchasedProduct(IapDataProduct product) => _instance.InternalIsPurchasedProduct(product);
+        public static bool IsPurchasedProduct(string id) => _instance.InternalIsPurchasedProduct(id);
+
+        public static string LocalizedPriceProduct(IapDataProduct product) =>
+            _instance.InternalLocalizedPriceProduct(product);
+
+        public static string LocalizedPriceProduct(string id) => _instance.InternalLocalizedPriceProduct(id);
+
+        #endregion
     }
 }
 

Runtime/UnityCommon.IAP.asmdef

@@ -8,7 +8,7 @@
         "GUID:08d1c582746949b40ba6a45cdb776bdf",
         "GUID:fe25561d224ed4743af4c60938a59d0b",
         "GUID:70ea675efa2644cef98c7ece24158333",
-        "GUID:928509ee676cc2e439010e69f455e144"
+        "GUID:5a4d3c3ff86da0f459ebef74b42549cd"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],