From 498ec5c5d03765bbd87c3f75cbe68dd0d413baf9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 13 八月 2018 15:27:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/ImpactRankModel.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 0db6864..79d3a83 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -635,6 +635,8 @@
ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }
+ MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }
+
public event Action openServerActivityStateChange;
public OpenServerActivityCenter()
@@ -715,6 +717,11 @@
_functionOrder = 4;
return true;
}
+ if (IsMultipleExpOpen())
+ {
+ _functionOrder = 5;
+ return true;
+ }
return false;
}
@@ -756,6 +763,11 @@
return consumeRebateModel.IsOpen;
}
+ public bool IsMultipleExpOpen()
+ {
+ return multipleExpModel.Open();
+ }
+
public void ProcessErrorTip()
{
SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
--
Gitblit v1.8.0