From c6a7ac3739907e8bb7c751d408e227e19f246f49 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 08 五月 2026 17:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Qunying/QYFighterCell.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Main/System/Qunying/QYFighterCell.cs b/Main/System/Qunying/QYFighterCell.cs
index 0911893..7758943 100644
--- a/Main/System/Qunying/QYFighterCell.cs
+++ b/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))
--
Gitblit v1.8.0