From 53e8e14f53ad83005d5b382b82e238392b3a07cc Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 14 八月 2018 11:10:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/ImpactRankModel.cs | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 79d3a83..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,9 @@
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>(); } }
public event Action openServerActivityStateChange;
@@ -722,6 +721,17 @@
_functionOrder = 5;
return true;
}
+ if (IsMultipleRealmOpen())
+ {
+ _functionOrder = 8;
+ return true;
+ }
+
+ if (IsBossRebornOpen())
+ {
+ _functionOrder = 9;
+ return true;
+ }
return false;
}
@@ -768,10 +778,21 @@
return multipleExpModel.Open();
}
+ public bool IsMultipleRealmOpen()
+ {
+ return multipleRealmModel.IsOpen;
+ }
+
public void ProcessErrorTip()
{
SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
}
+
+ public bool IsBossRebornOpen()
+ {
+ return bossRebornModel.IsOpen();
+ }
+
}
}
--
Gitblit v1.8.0