Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 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