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

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/TimeRush/TimeRushGiftCell.cs

@@ -3,6 +3,11 @@

public class TimeRushGiftCell : MonoBehaviour
{
    [SerializeField] ImageEx vipImage;
    [SerializeField] TextEx vipText;
    [SerializeField] OutlineEx vipTextOutline;
    [SerializeField] ImageEx rateImage;
    [SerializeField] TextEx rateText;
    [SerializeField] TextEx titleText;
    [SerializeField] ItemCell[] itemCells;
    [SerializeField] ButtonEx buyButton;
@@ -34,6 +39,8 @@
        buyText.SetActive(true);
        buyText1.SetActive(false);
        moneyIconImage.SetActive(false);
        rateImage.SetActive(true);


        if (!RechargeManager.Instance.TryGetOrderInfo(ctgId, out var orderConfig))
            return;
@@ -46,15 +53,44 @@

        CTGConfig config = CTGConfig.Get(ctgId);

        vipImage.SetActive(config.VipLevel > 0);
        if (config.VipLevel > 0)
        {
            vipImage.SetSprite($"VipLevel{config.VipLevel}");
            vipText.text = Language.Get($"VipLevelInfo{config.VipLevel}");
            vipText.color = InvestModel.Instance.GetTextColor(config.VipLevel);
            vipTextOutline.OutlineColor = InvestModel.Instance.GetOutlineColor(config.VipLevel);
        }

        rateText.text = Language.Get("DailySpecials07", config.Percentage);

        bool isCanBuy = manager.IsCanBuyCTG(ctgId);
        titleText.text = config.Title;
        buyImage.SetSprite(isCanBuy ? "DailySpecialsBuy1" : "DailySpecialsBuy2");
        buyText.text = !isCanBuy ? Language.Get("storename11") : Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderConfig.PayRMBNum));
        buyText.text = !isCanBuy ? Language.Get("storename11") : Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(orderConfig.PayRMBNumOnSale));
        limitCountText.SetActive(true);
        limitCountText.text = Language.Get("TimeRush07", UIHelper.AppendColor(rechargeCount.totalCount >= config.TotalBuyCount ? TextColType.Red : TextColType.LightGreen, Mathf.Max(0, config.TotalBuyCount - rechargeCount.totalCount).ToString()));
        buyButton.interactable = isCanBuy;
        buyButton.SetListener(() =>
        {
            if (config.VipLevel > 0 && !FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.PrivilegeCard))
            {
                SysNotifyMgr.Instance.ShowTip("MinggeAuto8");
                return;
            }
            if (config.VipLevel == 1 && !InvestModel.Instance.IsInvested(InvestModel.monthCardType))
            {
                SysNotifyMgr.Instance.ShowTip("MinggeAuto5");
                UIManager.Instance.OpenWindow<PrivilegeCardWin>();
                return;
            }
            if (config.VipLevel == 2 && !InvestModel.Instance.IsInvested(InvestModel.foreverCardType))
            {
                SysNotifyMgr.Instance.ShowTip("MinggeAuto7");
                UIManager.Instance.OpenWindow<PrivilegeCardWin>();
                return;
            }

            RechargeManager.Instance.CTG(ctgId);
        });

@@ -80,6 +116,8 @@

    private void DisplayStore(int id)
    {
        rateImage.SetActive(false);
        vipImage.SetActive(false);
        if (!StoreConfig.HasKey(id))
            return;
        StoreConfig storeConfig = StoreConfig.Get(id);