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

yyl

2026-05-08 c6a7ac3739907e8bb7c751d408e227e19f246f49

 Main/System/Qunying/QYFighterCell.cs

@@ -31,6 +31,12 @@
        {
            if (matchInfo == null)
                return;

            if (QunyingManager.Instance.IsCrossGrouping())
            {
                SysNotifyMgr.Instance.ShowTip("QYCrossFightError");
                return;
            }
            if (!UIHelper.CheckMoneyCount(QunyingManager.challengeMoneyType, 1, 1))
            {
                StoreModel.Instance.ShowBuyItem(QunyingManager.challengeShopID, -1);
@@ -44,13 +50,19 @@
        queryPlayerBtn.AddListener(() =>
        {
            if (GeneralDefine.IsRobot((int)matchInfo.PlayerID)) return;
            AvatarHelper.TryViewOtherPlayerInfo((int)matchInfo.PlayerID, viewPlayerLineupType: (int)BattlePreSetType.Qunying);
            AvatarHelper.TryViewOtherPlayerInfo((int)matchInfo.PlayerID, (int)matchInfo.ServerID, viewPlayerLineupType: (int)BattlePreSetType.Qunying);
        });

        quickChallengeBtn.AddListener(() =>
        {
            if (matchInfo == null)
                return;
            if (QunyingManager.Instance.IsCrossGrouping())
            {
                SysNotifyMgr.Instance.ShowTip("QYCrossFightError");
                return;
            }

            if (!UIHelper.CheckMoneyCount(QunyingManager.challengeMoneyType, 1, 1))
            {
                StoreModel.Instance.ShowBuyItem(QunyingManager.challengeShopID, -1);
@@ -64,7 +76,12 @@
        {
            if (matchInfo == null)
                return;

                
            if (QunyingManager.Instance.IsCrossGrouping())
            {
                SysNotifyMgr.Instance.ShowTip("QYCrossFightError");
                return;
            }
            //最低显示两次，但可以最低挑战1次
            var cnt = Math.Max(1, Math.Min(5, UIHelper.GetMoneyCnt(QunyingManager.challengeMoneyType)));
            if (!UIHelper.CheckMoneyCount(QunyingManager.challengeMoneyType, cnt, 1))