Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/OSActivity/OSRankHeroCallGiftCell.cs

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.UI;

@@ -49,7 +50,7 @@
                    itemCell.SetActive(true);
                    int itemID = ctgConfig.GainItemList[i][0];
                    itemCell.Init(new ItemCellModel(itemID, true, ctgConfig.GainItemList[i][1]));
                    itemCell.button.SetListener(() => ItemTipUtility.Show(itemID));
                    itemCell.SetClickListener(() => ItemTipUtility.Show(itemID));
                }
                else
                {
@@ -78,13 +79,13 @@
                    if (ctgConfig.VipLevel == 1 && !InvestModel.Instance.IsInvested(InvestModel.monthCardType))
                    {
                        SysNotifyMgr.Instance.ShowTip("MinggeAuto5");
                        UIManager.Instance.OpenWindow<PrivilegeCardWin>();
                        UIManager.Instance.OpenWindowAsync<PrivilegeCardWin>().Forget();
                        return;
                    }
                    if (ctgConfig.VipLevel == 2 && !InvestModel.Instance.IsInvested(InvestModel.foreverCardType))
                    {
                        SysNotifyMgr.Instance.ShowTip("MinggeAuto7");
                        UIManager.Instance.OpenWindow<PrivilegeCardWin>();
                        UIManager.Instance.OpenWindowAsync<PrivilegeCardWin>().Forget();
                        return;
                    }

@@ -122,7 +123,7 @@
                    itemCell.SetActive(true);
                    int itemID = awards[i][0];
                    itemCell.Init(new ItemCellModel(itemID, true, awards[i][1]));
                    itemCell.button.SetListener(() => ItemTipUtility.Show(itemID));
                    itemCell.SetClickListener(() => ItemTipUtility.Show(itemID));
                }
                else
                {