From 5a013c8de1078aca92a6a301f403e8ca78eeef3b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 10 一月 2019 17:57:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index a22e234..5a0ef83 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -54,6 +54,7 @@
ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
CrossServerOneVsOneRewardModel m_CrossServerRewardModel;
CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }
+ OpenServiceAchievementModel OpenServerModel { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }
public void Init()
{
if (LatencyTimeList.Count <= 0)
@@ -81,6 +82,7 @@
OperationTimeHepler.Instance.operationEndEvent += operationEndEvent;
limitedTimePackageItemModel.UpdateLimitedTimePackageItem += UpdateLimitedTimePackageItem;
impactRankModel.inImpactRankUpdate += InImpactRankUpdate;
+ OpenServerModel.IsOpenEvent += IsOpenEvent;
}
public void Unit()
@@ -95,6 +97,12 @@
OperationTimeHepler.Instance.operationEndEvent -= operationEndEvent;
limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem;
impactRankModel.inImpactRankUpdate -= InImpactRankUpdate;
+ OpenServerModel.IsOpenEvent -= IsOpenEvent;
+ }
+
+ private void IsOpenEvent()
+ {
+ Classify();
}
private void InImpactRankUpdate()
@@ -707,6 +715,29 @@
}
}
}
+ else if (IndexOf == 7)
+ {
+ bool Isopen = OpenServerModel.IsOpen;
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7澶╁绀�
+ {
+ if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ else//------绗笁灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ }
+ }
}
}
}
--
Gitblit v1.8.0