From 2453528ff86a98b161f2904b67c15bb270b7ca46 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 27 十二月 2018 16:29:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 0119aea..fa33b00 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -52,6 +52,8 @@
OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }
ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
+ CrossServerRewardModel m_CrossServerRewardModel;
+ CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }
public void Init()
{
if (LatencyTimeList.Count <= 0)
@@ -588,6 +590,30 @@
}
else if (IndexOf == 2)
{
+ if (crossServerRewardModel.IsShowCrossServerOneVsOne())//璺ㄦ湇
+ {
+ 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);
+ }
+
+ }
+
+ }
+ else if (IndexOf == 3)
+ {
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//闄愭椂绀煎寘
{
if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
@@ -610,7 +636,7 @@
}
}
- else if (IndexOf == 3)
+ else if (IndexOf == 4)
{
bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4);
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鐗规儬
@@ -634,7 +660,7 @@
}
}
- else if (IndexOf == 4)
+ else if (IndexOf == 5)
{
bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(14);
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鎶㈣喘
@@ -658,7 +684,7 @@
}
}
- else if (IndexOf == 5)
+ else if (IndexOf == 6)
{
bool Isopen = impactRankModel.IsInImpactRank;
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//鍏ㄦ皯鍐叉
--
Gitblit v1.8.0