Merge pull request #57 from VirtueSky/dev

VirtueSky · web-flow · commit a89ec417c51a · 2025-05-04T22:32:06.000+07:00
Dev
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@
 ### 1: Download the repository and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.3.4`
+for version `3.3.5`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.3.4",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.3.5",
 ```
 
 ## Includes modules
diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "3.3.4";
+        public const string VersionSunflower = "3.3.5";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";
@@ -20,7 +20,7 @@ public class ConstantPackage
         public const string PackageNameAdmob = "com.google.ads.mobile";
 
         public const string VersionAdmob =
-            "https://github.com/googleads/googleads-mobile-unity.git?path=packages/com.google.ads.mobile#v10.0.0";
+            "https://github.com/googleads/googleads-mobile-unity.git?path=packages/com.google.ads.mobile#v10.1.0";
 
         #region Google Unity
 
@@ -94,12 +94,12 @@ public class ConstantPackage
         public const string PackageNameAppFlyer = "appsflyer-unity-plugin";
 
         public const string MaxVersionAppFlyer =
-            "https://github.com/AppsFlyerSDK/appsflyer-unity-plugin.git#v6.16.21";
+            "https://github.com/AppsFlyerSDK/appsflyer-unity-plugin.git?path=Assets/AppsFlyer#v6.16.21";
 
         public const string PackageNameCoffeeUIEffect = "com.coffee.ui-effect";
 
         public const string MaxVersionCoffeeUIEffect =
-            "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.8.1";
+            "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.8.4";
 
         public const string PackageNameCoffeeUIParticle = "com.coffee.ui-particle";
 
diff --git a/VirtueSky/Iap/Editor/IapSettingEditor.cs b/VirtueSky/Iap/Editor/IapSettingEditor.cs
@@ -14,6 +14,7 @@ public class IapSettingEditor : Editor
         private SerializedProperty _skusData;
         private SerializedProperty _products;
         private SerializedProperty _isValidatePurchase;
+        private SerializedProperty _isCustomValidatePurchase;
         private SerializedProperty _googlePlayStoreKey;
 
         void Initialize()
@@ -22,6 +23,7 @@ void Initialize()
             _skusData = serializedObject.FindProperty("skusData");
             _products = serializedObject.FindProperty("products");
             _isValidatePurchase = serializedObject.FindProperty("isValidatePurchase");
+            _isCustomValidatePurchase = serializedObject.FindProperty("isCustomValidatePurchase");
             _googlePlayStoreKey = serializedObject.FindProperty("googlePlayStoreKey");
         }
 
@@ -39,6 +41,7 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(_isValidatePurchase);
             if (_isValidatePurchase.boolValue)
             {
+                EditorGUILayout.PropertyField(_isCustomValidatePurchase);
                 EditorGUILayout.PropertyField(_googlePlayStoreKey);
                 if (GUILayout.Button("Obfuscator Key"))
                 {
@@ -55,7 +58,9 @@ void GenerateProduct()
             for (int i = 0; i < _iapSetting.SkusData.Count; i++)
             {
                 string itemName = _iapSetting.SkusData[i].id.Split('.').Last();
-                var itemDataVariable = CreateAsset.CreateAndGetScriptableAssetByName<IapDataVariable>("/Iap/Products", $"iap_{itemName.ToLower()}");
+                var itemDataVariable =
+                    CreateAsset.CreateAndGetScriptableAssetByName<IapDataVariable>("/Iap/Products",
+                        $"iap_{itemName.ToLower()}");
                 itemDataVariable.id = _iapSetting.SkusData[i].id;
                 itemDataVariable.productType = _iapSetting.SkusData[i].productType;
                 _iapSetting.Products.Add(itemDataVariable);
diff --git a/VirtueSky/Iap/Runtime/IapManager.cs b/VirtueSky/Iap/Runtime/IapManager.cs
@@ -27,6 +27,7 @@ public class IapManager : BaseMono, IDetailedStoreListener
         private IStoreController _controller;
         private IExtensionProvider _extensionProvider;
         private static event Action RestoreEvent;
+        public static event Func<bool> CustomValidatePurchaseEvent;
         public static bool IsInitialized { get; private set; }
         public static void Restore() => RestoreEvent?.Invoke();
 
@@ -92,7 +93,8 @@ internal Product GetProduct(IapDataVariable product)
 
         internal SubscriptionInfo GetSubscriptionInfo(IapDataVariable product)
         {
-            if (_controller == null || product.productType != ProductType.Subscription || !_controller.products.WithID(product.id).hasReceipt) return null;
+            if (_controller == null || product.productType != ProductType.Subscription ||
+                !_controller.products.WithID(product.id).hasReceipt) return null;
             var subscriptionManager = new SubscriptionManager(GetProduct(product), null);
             var subscriptionInfo = subscriptionManager.getSubscriptionInfo();
             return subscriptionInfo;
@@ -106,26 +108,35 @@ public PurchaseProcessingResult ProcessPurchase(PurchaseEventArgs purchaseEvent)
         {
             if (iapSetting.IsValidatePurchase)
             {
-                bool validatedPurchase = true;
+                if (iapSetting.IsCustomValidatePurchase)
+                {
+                    if ((bool)CustomValidatePurchaseEvent?.Invoke()) PurchaseVerified(purchaseEvent);
+                }
+                else
+                {
+                    bool validatedPurchase = true;
 #if (UNITY_ANDROID || UNITY_IOS || UNITY_STANDALONE_OSX) && !UNITY_EDITOR
-            var validator =
-                new UnityEngine.Purchasing.Security.CrossPlatformValidator(UnityEngine.Purchasing.Security.GooglePlayTangle.Data(),
-                    UnityEngine.Purchasing.Security.AppleTangle.Data(), Application.identifier);
+                    var validator =
+                        new UnityEngine.Purchasing.Security.CrossPlatformValidator(
+                            UnityEngine.Purchasing.Security.GooglePlayTangle.Data(),
+                            UnityEngine.Purchasing.Security.AppleTangle.Data(), Application.identifier);
+
+                    try
+                    {
+                        // On Google Play, result has a single product ID.
+                        // On Apple stores, receipts contain multiple products.
+                        var result = validator.Validate(purchaseEvent.purchasedProduct.receipt);
+                        Debug.Log("Receipt is valid");
+                    }
+                    catch (UnityEngine.Purchasing.Security.IAPSecurityException)
+                    {
+                        Debug.Log("Invalid receipt, not unlocking content");
+                        validatedPurchase = false;
+                    }
 
-            try
-            {
-                // On Google Play, result has a single product ID.
-                // On Apple stores, receipts contain multiple products.
-                var result = validator.Validate(purchaseEvent.purchasedProduct.receipt);
-                Debug.Log("Receipt is valid");
-            }
-            catch (UnityEngine.Purchasing.Security.IAPSecurityException)
-            {
-                Debug.Log("Invalid receipt, not unlocking content");
-                validatedPurchase = false;
-            }
 #endif
-                if (validatedPurchase) PurchaseVerified(purchaseEvent);
+                    if (validatedPurchase) PurchaseVerified(purchaseEvent);
+                }
             }
             else
             {
diff --git a/VirtueSky/Iap/Runtime/IapSetting.cs b/VirtueSky/Iap/Runtime/IapSetting.cs
@@ -14,6 +14,7 @@ public class IapSetting : ScriptableObject
         [SerializeField] private List<IapDataVariable> products = new List<IapDataVariable>();
 
         [Space, SerializeField] private bool isValidatePurchase;
+        [SerializeField] private bool isCustomValidatePurchase;
 #if UNITY_EDITOR
         //[ShowIf(nameof(isValidatePurchase), true)] 
         [SerializeField, TextArea] private string googlePlayStoreKey;
@@ -22,6 +23,7 @@ public class IapSetting : ScriptableObject
         public List<IapData> SkusData => skusData;
         public List<IapDataVariable> Products => products;
         public bool IsValidatePurchase => isValidatePurchase;
+        public bool IsCustomValidatePurchase => isCustomValidatePurchase;
     }
 
     [Serializable]
diff --git a/VirtueSky/Utils/Editor/UnityPackage/.DS_Store b/VirtueSky/Utils/Editor/UnityPackage/.DS_Store
diff --git a/VirtueSky/Utils/Editor/UnityPackage/Note_Package.txt b/VirtueSky/Utils/Editor/UnityPackage/Note_Package.txt
@@ -1,2 +1,2 @@
-- Version Max Sdk: 8.2.0
+- Version Max Sdk: 8.2.2
 - Version Google Game Play Service: v2.0.0
diff --git a/VirtueSky/Utils/Editor/UnityPackage/max-sdk.unitypackage b/VirtueSky/Utils/Editor/UnityPackage/max-sdk.unitypackage
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.virtuesky.sunflower",
   "displayName": "Sunflower",
   "description": "Core ScriptableObject Architecture for building Unity games",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "unity": "2022.3",
   "category": "virtuesky",
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-- Version Max Sdk: 8.2.0`
	`1`	`+- Version Max Sdk: 8.2.2`
`2`	`2`	`- Version Google Game Play Service: v2.0.0`