From cdf379be1014e8d539750594240f8a2648b23731 Mon Sep 17 00:00:00 2001
From: huyufei <yufei.hu@castbox.fm>
Date: Wed, 10 Apr 2024 16:01:00 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=20=E7=BB=8F?=
 =?UTF-8?q?=E6=B5=8E=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Runtime/Code/SDK/GuruSDK.Analytics.cs | 43 +++++++++++++++++----------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/Runtime/Code/SDK/GuruSDK.Analytics.cs b/Runtime/Code/SDK/GuruSDK.Analytics.cs
index 4cf7f36..8c08eea 100644
--- a/Runtime/Code/SDK/GuruSDK.Analytics.cs
+++ b/Runtime/Code/SDK/GuruSDK.Analytics.cs
@@ -374,7 +374,7 @@ namespace Guru
             //---- Currency -----
             if (value > 0)
             {
-                EarnVirtualCurrency(currencyName, value, balance, category, itemName,levelName,  scene);
+                EarnVirtualCurrency(currencyName, value, balance, category, itemName, levelName,  scene);
             }
             //---- Props --------
             if (null != props)
@@ -382,7 +382,7 @@ namespace Guru
                 int i = 0;
                 while (i < props.Length)
                 {
-                    EarnVirtualCurrency(props[i], 1, 0, category, itemName,levelName,  scene);
+                    EarnVirtualCurrency(props[i], 1, 0, category, itemName, levelName, scene);
                     i++;
                 }
             }
@@ -417,18 +417,19 @@ namespace Guru
         /// <li>特殊类型: Coin + Props (道具列表) </li>
         /// <li>特殊类型: Props (道具列表) </li> 
         /// </summary>
-        /// <param name="currencyName">货币名称</param>
+        /// <param name="currencyName">IAP 道具名称</param>
+        /// <param name="productId">IAP 道具商品 ID </param>
         /// <param name="value">赚取金额</param>
         /// <param name="balance">货币总量(累加后)</param>
         /// <param name="levelName">当前关卡名称</param>
         /// <param name="scene">应用场景</param>
         /// <param name="props">获取的道具名称列表</param>
-        public static void EarnVirtualCurrencyByIAP(string currencyName, 
+        public static void EarnVirtualCurrencyByIAP(string currencyName, string productId, 
             int value = 0, int balance = 0, string levelName = "", 
             string scene = "store", string[] props = null)
         {
             string category = Consts.CurrencyCategoryIAP;
-            string itemName = "sku";
+            string itemName = productId;
             EarnVirtualCurrencyAndProps(currencyName, value, balance, category, itemName, levelName, scene, props);
         }
 
@@ -518,18 +519,17 @@ namespace Guru
         /// 通过道具交换/合成或得了其他道具
         /// </summary>
         /// <param name="propName"></param>
-        /// <param name="otherPropName"></param>
+        /// <param name="otherName"></param>
         /// <param name="scene"></param>
         /// <param name="value"></param>
         /// <param name="balance"></param>
         /// <param name="levelName"></param>
-        public static void EarnPropsByExchange(string propName, string otherPropName,
+        public static void EarnPropByProp(string propName, string otherName,
             string scene = Consts.ParameterDefaultScene,
             int value = 1, int balance = 0, string levelName = "")
         {
             string category = Consts.CurrencyCategoryIGB;
-            string itemName = otherPropName;
-            EarnVirtualCurrency(propName, value, balance, category, itemName, levelName, scene);
+            EarnVirtualCurrency(propName, value, balance, category, otherName, levelName, scene);
         }
         
         
@@ -608,15 +608,13 @@ namespace Guru
             int value, int balance, 
             string levelName = "", string scene = "")
         {
-            string itemName = "";
             string category = Consts.CurrencyCategoryProp;
             if (props != null && props.Length > 0)
             {
                 int i = 0;
                 while (i < props.Length)
                 {
-                    itemName = props[i];
-                    SpendVirtualCurrency(currencyName, value, balance, category, itemName, levelName, scene); 
+                    SpendVirtualCurrency(currencyName, value, balance, category, props[i], levelName, scene); 
                     i++;
                 }
             }
@@ -651,19 +649,34 @@ namespace Guru
             int value, int balance, 
             string levelName = "", string scene = "")
         {
-            string itemName = "";
             string category = Consts.CurrencyCategoryBundle;
             if (bundles != null && bundles.Length > 0)
             {
                 int i = 0;
                 while (i < bundles.Length)
                 {
-                    itemName = bundles[i];
-                    SpendVirtualCurrency(currencyName, value, balance, category, itemName, levelName, scene); 
+                    SpendVirtualCurrency(currencyName, value, balance, category, bundles[i], levelName, scene); 
                     i++;
                 }
             }
         }
+        
+        /// <summary>
+        /// 消耗物品, 交换其他物品
+        /// </summary>
+        /// <param name="currencyName"></param>
+        /// <param name="bundles"></param>
+        /// <param name="value"></param>
+        /// <param name="balance"></param>
+        /// <param name="levelName"></param>
+        /// <param name="scene"></param>
+        public static void SpendPropWithProp(string propName, string otherName,
+            int value, int balance, 
+            string levelName = "", string scene = "", string extraCategory = "")
+        {
+            string category = string.IsNullOrEmpty(extraCategory) ? Consts.CurrencyCategoryProp : extraCategory;
+            SpendVirtualCurrency(propName, value, balance, category, otherName, levelName, scene); 
+        }
 
 
         #endregion