From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

---
 Main/Utility/UIHelper.cs |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/Main/Utility/UIHelper.cs b/Main/Utility/UIHelper.cs
index 34ba248..c0dd2b0 100644
--- a/Main/Utility/UIHelper.cs
+++ b/Main/Utility/UIHelper.cs
@@ -1050,6 +1050,8 @@
         {53, PlayerDataType.ChallengeVoucher},
         {54, PlayerDataType.DailySpecials},
         {55, PlayerDataType.OSGalaScore},
+        {57, PlayerDataType.QYScore},
+        {58, PlayerDataType.heroSkin},
         {99, PlayerDataType.ExAttr11},
     };
 
@@ -1208,6 +1210,21 @@
                     //寮�鏈嶅簡鍏哥Н鍒�
                     return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.OSGalaScore);
                 }
+            case 56:
+                {
+                    //缇よ嫳鎸戞垬浠�
+                    return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.QunyingWDL);
+                }
+            case 57:
+                {
+                    //缇よ嫳绉垎
+                    return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.QYScore);
+                }
+            case 58:
+                {
+                    //鏃惰璐у竵
+                    return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.heroSkin);
+                }
             case 98:
                 {
                     //杩囨湡鍨嬩唬閲戝埜
@@ -1275,6 +1292,34 @@
         return isEnough;
     }
 
+    /// <param name="needTips">0 涓嶅搷搴� 1 寮规彁绀� 2 寮硅幏鍙栭�斿緞tips</param>
+    public static bool CheckItemCount(int itemId, long needCount, int needTips = 0)
+    {
+        if (needCount <= 0)
+        {
+            return true;
+        }
+        long haveCount = PackManager.Instance.GetItemCountByID(PackType.Item, itemId);
+        bool isEnough = haveCount >= needCount;
+
+        if (!isEnough)
+        {
+            if (needTips == 1)
+            {
+                ItemConfig itemConfig = ItemConfig.Get(itemId);
+                if (itemConfig != null)
+                {
+                    SysNotifyMgr.Instance.ShowTip("LackItem", itemConfig.ItemName);
+                }
+            }
+            else if (needTips == 2)
+            {
+                ItemTipUtility.Show(itemId, true);
+            }
+        }
+
+        return isEnough;
+    }
 
     #endregion
 

--
Gitblit v1.8.0