From 364bb6a6623e49eec17075074a33121b6706fb31 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 19 十二月 2025 11:12:19 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/BaseBattleWin.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index 7e7a8ee..8d514ed 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -200,12 +200,24 @@
public bool IsPass()
{
if (null == battleField)
- return false;
+ return true;
// 妫�鏌ユ槸鍚︿负姘镐箙鐗规潈鍗＄帺瀹�
bool hasForeverPrivilege = InvestModel.Instance.IsInvested(InvestModel.foreverCardType);
- if (!hasForeverPrivilege && !FuncOpen.Instance.IsFuncOpen(BattleManager.Instance.passFuncId, true))
+ string battleFieldName = battleField.ToString();
+ if (!hasForeverPrivilege && !FuncOpen.Instance.IsFuncOpen(BattleManager.Instance.passFuncId))
+ {
+ if (battleFieldName != BattleConst.StoryBossBattleField)
+ {
+ //绛夌骇杈惧埌20绾у悗瑙ｉ攣鎴栧紑閫氱粓韬壒鏉冭В閿�
+ SysNotifyMgr.Instance.ShowTip("BattlePass2");
+ }
+ else
+ {
+ FuncOpen.Instance.ProcessorFuncErrorTip(BattleManager.Instance.passFuncId);
+ }
return false;
+ }
int passRound = BattleManager.Instance.defaultPassRound;
var name = battleField.ToString();
@@ -254,7 +266,16 @@
int realPassRound = passRound + 1; // 閰嶇疆鏄秴杩噚鍥炲悎鍙互璺�,鎰忓懗鐫�x+1鍥炲悎鍙互璺�
if (nowRound < realPassRound)
{
- SysNotifyMgr.Instance.ShowTip("BattlePass", realPassRound - nowRound);
+ if (battleFieldName != BattleConst.StoryBossBattleField)
+ {
+ //%s0鍥炲悎鍚庡彲璺宠繃锛屽紑閫氱粓韬壒鏉冪珛鍗宠烦杩�
+ SysNotifyMgr.Instance.ShowTip("BattlePass1", realPassRound - nowRound);
+ }
+ else
+ {
+ SysNotifyMgr.Instance.ShowTip("BattlePass", realPassRound - nowRound);
+ }
+
return false;
}
}
--
Gitblit v1.8.0