From ae044ded41371ce2b90938509f09c8bd1309112c Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 16:05:49 +0800
Subject: [PATCH] 5927 【前端】【1.5.100】XX巡礼支持活动配置
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index c700ff2..0c62230 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -55,6 +55,7 @@
CrossServerOneVsOneRewardModel m_CrossServerRewardModel;
CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }
OpenServiceAchievementModel OpenServerModel { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }
+ SpringFestivalModel springFestival { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
public void Init()
{
if (LatencyTimeList.Count <= 0)
@@ -119,18 +120,13 @@
private void operationEndEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.FairyCeremony || arg1== Operation.NewYearFairyCeremony)
- {
- Classify();
- }
+ Classify();
}
private void operationStartEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.FairyCeremony || arg1 == Operation.NewYearFairyCeremony)
- {
- Classify();
- }
+ Classify();
+
}
private void UpdateRedpoint(int redPointID)
@@ -656,8 +652,9 @@
}
else if (IndexOf == 4)
{
- bool Isopen = OpenServerModel.IsOpen;
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7澶╁绀�
+ bool Isopen = OpenServerModel.IsOpenFeatures();
+ bool _isOpen = springFestival.IsOpenFeatures();
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && (Isopen || _isOpen))//7澶╁绀�
{
if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
{
--
Gitblit v1.8.0