From bd6f9a734277e57efe5abc8c32a85d5de27cdc03 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 14 三月 2026 00:18:49 +0800
Subject: [PATCH] 555 子 【付费功能】皮肤商店 / 【付费功能】时装商店-客户端

---
 Main/System/ItemTip/BoxGetItemModel.cs |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Main/System/ItemTip/BoxGetItemModel.cs b/Main/System/ItemTip/BoxGetItemModel.cs
index f044c67..b4fc9ec 100644
--- a/Main/System/ItemTip/BoxGetItemModel.cs
+++ b/Main/System/ItemTip/BoxGetItemModel.cs
@@ -39,21 +39,39 @@
             long expValue = netPack.Exp + netPack.ExpPoint * Constants.ExpPointValue;
             showItems.Add(new Item(GeneralDefine.expDisplayId, expValue));
         }
+
+        bool isMergeItem = true; //鍚屾牱鐨勭墿鍝佹槸鍚﹀悎骞舵樉绀猴紝姣斿棰濆鑾峰緱鍋氳〃鐜板垎寮�鏄剧ず
+
+        //鐗规畩澶勭悊锛屾椂瑁呮湁琚垎瑙f垚璐у竵鐨勬儏鍐碉紝闇�瑕佸悎骞跺悗鍘婚櫎鍘熸椂瑁呯殑鏄剧ず
+        List<int> deleteItemIDs = new List<int>();
         if (netPack.MoneyList.Length != 0)
         {
             for (int i = 0; i < netPack.MoneyLen; i++)
             {
                 var moneyType = netPack.MoneyList[i].MoneyType;
+                if (moneyType == 58 && !string.IsNullOrEmpty(netPack.DataEx))
+                {
+                    //鏃惰璐у竵
+                    int deleteID;
+                    int.TryParse(netPack.DataEx, out deleteID);
+                    if (deleteID != 0)
+                    {
+                        deleteItemIDs.Add(int.Parse(netPack.DataEx));
+                    }
+                }
                 if (GeneralDefine.MoneyDisplayModel.ContainsKey(moneyType) && netPack.MoneyList[i].MoneyValue != 0)
                 {
-                    showItems.Add(new Item(GeneralDefine.MoneyDisplayModel[moneyType], netPack.MoneyList[i].MoneyValue));
+                    showItems.Add(new Item(GeneralDefine.MoneyDisplayModel[moneyType], netPack.MoneyList[i].MoneyValue, netPack.MoneyList[i].IsBind));
+                    if (netPack.MoneyList[i].IsBind >= 10)
+                    {
+                        isMergeItem = false;
+                    }
                 }
-
             }
         }
 
-        bool isMergeItem = true;
-        //绾﹀畾IsBind=10 涓哄彜瀹濋澶栧鍔�
+        
+        //绾﹀畾IsBind 涓鸿鏍囩殑鐗规畩鏄剧ず 鍙傝�僆tem鐨剈seType瀹氫箟
         if (netPack.ItemList.Length != 0)
         {
             for (int i = 0; i < netPack.ItemLen; i++)
@@ -76,7 +94,7 @@
         if (showItems.Count == 0)
             return;
 
-        ItemLogicUtility.Instance.ShowGetItem(showItems, eventName, isMergeItem:isMergeItem);
+        ItemLogicUtility.Instance.ShowGetItem(showItems, eventName, isMergeItem:isMergeItem, deleteItemIDs:deleteItemIDs);
     }
 
 

--
Gitblit v1.8.0