From 0648c3994e75e469ee10ea71ef8f9d0010bb8811 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 02 二月 2026 19:06:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/ItemTip/BoxGetItemModel.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Main/System/ItemTip/BoxGetItemModel.cs b/Main/System/ItemTip/BoxGetItemModel.cs
index 522b6af..a508a9f 100644
--- a/Main/System/ItemTip/BoxGetItemModel.cs
+++ b/Main/System/ItemTip/BoxGetItemModel.cs
@@ -97,14 +97,16 @@
for (int i = 0; i < netPack.MoneyLen; i++)
{
var moneyType = netPack.MoneyList[i].MoneyType;
- if (GeneralDefine.moneyDisplayIds.ContainsKey(moneyType) && netPack.MoneyList[i].MoneyValue != 0)
+ if (GeneralDefine.MoneyDisplayModel.ContainsKey(moneyType) && netPack.MoneyList[i].MoneyValue != 0)
{
- showItems.Add(new Item(GeneralDefine.moneyDisplayIds[moneyType], netPack.MoneyList[i].MoneyValue));
+ showItems.Add(new Item(GeneralDefine.MoneyDisplayModel[moneyType], netPack.MoneyList[i].MoneyValue));
}
}
}
+ bool isMergeItem = true;
+ //绾﹀畾IsBind=10 涓哄彜瀹濋澶栧鍔�
if (netPack.ItemList.Length != 0)
{
for (int i = 0; i < netPack.ItemLen; i++)
@@ -112,6 +114,10 @@
showItems.Add(new Item((int)netPack.ItemList[i].ItemID,
netPack.ItemList[i].Count + netPack.ItemList[i].CountEx * Constants.ExpPointValue,
netPack.ItemList[i].IsBind));
+ if (isMergeItem && netPack.ItemList[i].IsBind >= 10)
+ {
+ isMergeItem = false;
+ }
}
}
@@ -123,7 +129,7 @@
if (showItems.Count == 0)
return;
- ItemLogicUtility.Instance.ShowGetItem(showItems, eventName);
+ ItemLogicUtility.Instance.ShowGetItem(showItems, eventName, isMergeItem:isMergeItem);
}
// public int GetUseCntByID(int itemId)
--
Gitblit v1.8.0