Merge pull request #42 from VirtueSky/dev

Dev
VirtueSky · Dec 12, 2024 · 66f70be · 66f70be
2 parents c3d1542 + 30188fd
commit 66f70be
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 281 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@
 ### 1: Download the repo and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.2.1`
+for version `3.2.2`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.2.1",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.2.2",
 ```
 
 ## Includes modules

diff --git a/VirtueSky/ControlPanel/CPIapDrawer.cs b/VirtueSky/ControlPanel/CPIapDrawer.cs
@@ -71,44 +71,14 @@ public static void OnDrawIap(Rect position)
                 MessageType.Warning);
 #endif
             GUILayout.Space(10);
-            // Handles.DrawAAPolyLine(3, new Vector3(210, GUILayoutUtility.GetLastRect().y + 10),
-            //     new Vector3(position.width, GUILayoutUtility.GetLastRect().y + 10));
             CPUtility.GuiLine(2);
-            GUILayout.Space(10);
-
-            if (GUILayout.Button("Create Iap Purchase Product Event"))
-            {
-#if VIRTUESKY_IAP
-                IapWindowEditor.CreateIapProductEvent();
-
-#else
-                Debug.LogError("Add scripting define symbols ( VIRTUESKY_IAP ) to use IAP");
-#endif
-            }
-
-            if (GUILayout.Button("Create Iap Is Purchase Product Event"))
-            {
-#if VIRTUESKY_IAP
-                IapWindowEditor.CreateIsPurchaseProductEvent();
 
-#else
-                Debug.LogError("Add scripting define symbols ( VIRTUESKY_IAP ) to use IAP");
-#endif
-            }
-
-
-            GUILayout.Space(10);
-            // Handles.DrawAAPolyLine(3, new Vector3(210, GUILayoutUtility.GetLastRect().y + 10),
-            //     new Vector3(position.width, GUILayoutUtility.GetLastRect().y + 10));
-            CPUtility.GuiLine(2);
             GUILayout.Space(10);
             CPUtility.DrawHeader("Install Sdk");
             GUILayout.Space(10);
             CPUtility.DrawButtonInstallPackage("Install In App Purchasing", "Remove In App Purchasing",
                 ConstantPackage.PackageNameInAppPurchase, ConstantPackage.MaxVersionInAppPurchase);
             GUILayout.Space(10);
-            // Handles.DrawAAPolyLine(3, new Vector3(210, GUILayoutUtility.GetLastRect().y + 10),
-            //     new Vector3(position.width, GUILayoutUtility.GetLastRect().y + 10));
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
             CPUtility.DrawHeader("Define Symbols");
@@ -123,8 +93,6 @@ public static void OnDrawIap(Rect position)
             CPUtility.DrawButtonAddDefineSymbols(ConstantDefineSymbols.VIRTUESKY_IAP);
 #if VIRTUESKY_IAP
             GUILayout.Space(10);
-            // Handles.DrawAAPolyLine(3, new Vector3(210, GUILayoutUtility.GetLastRect().y + 10),
-            //     new Vector3(position.width, GUILayoutUtility.GetLastRect().y + 10));
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
             GUILayout.Label("Ping Iap Settings", EditorStyles.boldLabel);

diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "3.2.1";
+        public const string VersionSunflower = "3.2.2";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";

diff --git a/VirtueSky/Iap/Editor/IapSettingEditor.cs b/VirtueSky/Iap/Editor/IapSettingEditor.cs
@@ -49,29 +49,16 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
 
-        private string path = CreateAsset.DefaultPath("/Iap/Products");
-
         void GenerateProduct()
         {
             _iapSetting.Products.Clear();
             for (int i = 0; i < _iapSetting.SkusData.Count; i++)
             {
                 string itemName = _iapSetting.SkusData[i].id.Split('.').Last();
-                //  Debug.Log(itemName);
-                AssetDatabase.DeleteAsset($"{path}/iap_{itemName.ToLower()}.asset");
-                var itemDataVariable = CreateInstance<IapDataVariable>();
+                var itemDataVariable = CreateAsset.CreateAndGetScriptableAssetByName<IapDataVariable>("/Iap/Products", $"iap_{itemName.ToLower()}");
                 itemDataVariable.id = _iapSetting.SkusData[i].id;
                 itemDataVariable.productType = _iapSetting.SkusData[i].productType;
-                itemDataVariable.eventPurchaseProduct = CreateAsset.CreateAndGetScriptableAsset<VirtueSky.Iap.EventPurchaseProduct>("/Iap",
-                    "iap_purchase_product_event");
-                itemDataVariable.eventIsPurchaseProduct = CreateAsset.CreateAndGetScriptableAsset<VirtueSky.Iap.EventIsPurchaseProduct>("/Iap",
-                    "iap_is_purchase_product_event");
                 _iapSetting.Products.Add(itemDataVariable);
-                AssetDatabase.CreateAsset(itemDataVariable, $"{path}/iap_{itemName.ToLower()}.asset");
-                AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
-
-                //  Selection.activeObject = itemDataVariable;
             }
 
             serializedObject.ApplyModifiedProperties();

diff --git a/VirtueSky/Iap/Editor/IapWindowEditor.cs b/VirtueSky/Iap/Editor/IapWindowEditor.cs
diff --git a/VirtueSky/Iap/Editor/IapWindowEditor.cs.meta b/VirtueSky/Iap/Editor/IapWindowEditor.cs.meta
diff --git a/VirtueSky/Iap/Runtime/Event.meta b/VirtueSky/Iap/Runtime/Event.meta
diff --git a/VirtueSky/Iap/Runtime/Event/.DS_Store b/VirtueSky/Iap/Runtime/Event/.DS_Store
diff --git a/VirtueSky/Iap/Runtime/Event/EventIapProductListener.cs b/VirtueSky/Iap/Runtime/Event/EventIapProductListener.cs
diff --git a/VirtueSky/Iap/Runtime/Event/EventIapProductListener.cs.meta b/VirtueSky/Iap/Runtime/Event/EventIapProductListener.cs.meta
diff --git a/VirtueSky/Iap/Runtime/Event/EventIsPurchaseProduct.cs b/VirtueSky/Iap/Runtime/Event/EventIsPurchaseProduct.cs
diff --git a/VirtueSky/Iap/Runtime/Event/EventIsPurchaseProduct.cs.meta b/VirtueSky/Iap/Runtime/Event/EventIsPurchaseProduct.cs.meta
diff --git a/VirtueSky/Iap/Runtime/Event/EventPurchaseProduct.cs b/VirtueSky/Iap/Runtime/Event/EventPurchaseProduct.cs
diff --git a/VirtueSky/Iap/Runtime/Event/EventPurchaseProduct.cs.meta b/VirtueSky/Iap/Runtime/Event/EventPurchaseProduct.cs.meta
diff --git a/VirtueSky/Iap/Runtime/IapDataVariable.cs b/VirtueSky/Iap/Runtime/IapDataVariable.cs
@@ -12,8 +12,6 @@ public class IapDataVariable : ScriptableObject
     {
         [ReadOnly] public string id;
         [ReadOnly] public ProductType productType;
-        [ReadOnly] public EventPurchaseProduct eventPurchaseProduct;
-        [ReadOnly] public EventIsPurchaseProduct eventIsPurchaseProduct;
 
         [Space] public float price;
         [SerializeField] private IapPurchaseSuccess onPurchaseSuccess;
@@ -30,14 +28,21 @@ public class IapDataVariable : ScriptableObject
         public Product Product => product;
         public SubscriptionInfo SubscriptionInfo => subscriptionInfo;
 
+        private IapManager iapManager;
+
+        internal void InitIapManager(IapManager _iapManager)
+        {
+            iapManager = _iapManager;
+        }
+
         public void Purchase()
         {
-            eventPurchaseProduct.Raise(this);
+            iapManager.PurchaseProduct(this);
         }
 
         public bool IsPurchased()
         {
-            return eventIsPurchaseProduct.Raise(this);
+            return iapManager.IsPurchasedProduct(this);
         }
     }
 }