From 5927cbc6a514576e5758cd166678805bb8ecb143 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 13 八月 2018 21:07:01 +0800
Subject: [PATCH] 2453 【前端】充值、福利、活动界面整合2
---
System/OpenServerActivity/ImpactRankModel.cs | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index b2be60b..44a9b2e 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -355,11 +355,9 @@
#endregion
public event Action OnSelectRankTypeEvent;
private int m_PresentSelectType = 0;
- public int presentSelectType
- {
+ public int presentSelectType {
get { return m_PresentSelectType; }
- set
- {
+ set {
m_PresentSelectType = value;
if (OnSelectRankTypeEvent != null)
{
@@ -398,11 +396,9 @@
}
private PlayerRankData.RankType m_PresentBillRankType = PlayerRankData.RankType.OpenServerStrengthen;
- public PlayerRankData.RankType presentBillRankType
- {
+ public PlayerRankData.RankType presentBillRankType {
get { return m_PresentBillRankType; }
- set
- {
+ set {
m_PresentBillRankType = value;
if (CoroutineMgr.Instance.CanBegRank((int)m_PresentBillRankType))
{
@@ -636,6 +632,7 @@
ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }
MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }
+ BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }
MultipleRealmPointModel multipleRealmModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }
@@ -729,6 +726,12 @@
_functionOrder = 8;
return true;
}
+
+ if (IsBossRebornOpen())
+ {
+ _functionOrder = 9;
+ return true;
+ }
return false;
}
@@ -784,6 +787,12 @@
{
SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
}
+
+ public bool IsBossRebornOpen()
+ {
+ return bossRebornModel.IsOpen();
+ }
+
}
}
--
Gitblit v1.8.0