From 1fdef60f2611d01bf658e8a2e4f69bfa251de95b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 17 十二月 2025 21:17:13 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/BaseBattleWin.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index c8e3f4a..7e7a8ee 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -192,13 +192,20 @@
/// </summary>
protected virtual void OnClickPass()
{
- if (null == battleField)
+ if (!IsPass())
return;
+ battleField.ForceFinish();
+ }
+
+ public bool IsPass()
+ {
+ if (null == battleField)
+ return false;
// 妫�鏌ユ槸鍚︿负姘镐箙鐗规潈鍗＄帺瀹�
bool hasForeverPrivilege = InvestModel.Instance.IsInvested(InvestModel.foreverCardType);
if (!hasForeverPrivilege && !FuncOpen.Instance.IsFuncOpen(BattleManager.Instance.passFuncId, true))
- return;
+ return false;
int passRound = BattleManager.Instance.defaultPassRound;
var name = battleField.ToString();
@@ -243,18 +250,16 @@
if (passRound != 0)
{
- int nowRound = battleField.round;
+ int nowRound = battleField.round;
int realPassRound = passRound + 1; // 閰嶇疆鏄秴杩噚鍥炲悎鍙互璺�,鎰忓懗鐫�x+1鍥炲悎鍙互璺�
if (nowRound < realPassRound)
{
SysNotifyMgr.Instance.ShowTip("BattlePass", realPassRound - nowRound);
- return;
+ return false;
}
}
- battleField.ForceFinish();
+ return true;
}
-
-
/// <summary>
--
Gitblit v1.8.0