From 62bcd8df69515c6a8076f145a788bc7f36fdcde9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 29 九月 2018 20:59:48 +0800
Subject: [PATCH] 3980 测试】【1.0.18】【主干】仙界盛典开启时，主界面仙界盛典按钮放在第二排第一个，不随按钮伸缩
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 5367881..177fd5c 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -538,6 +538,29 @@
int IndexOf = GroupLowIndexList.IndexOf(highBtnRecord.Index);
if (IndexOf == 0)
{
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.FairyCeremony))//绮剧伒鐩涘吀
+ {
+ 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 == 1)
+ {
var _funcOrder = 0;
if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//绮惧僵娲诲姩
{
@@ -561,11 +584,10 @@
}
}
}
-
-
+
}
- else if (IndexOf == 1)
- {
+ else if (IndexOf == 2)
+ {
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//闄愭椂绀煎寘
{
if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
@@ -586,8 +608,9 @@
}
}
+
}
- else if (IndexOf == 2)
+ else if (IndexOf == 3)
{
bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4);
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鐗规儬
@@ -609,33 +632,12 @@
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
}
- }
- else if (IndexOf == 3)
- {
- bool Isopen = impactRankModel.IsInImpactRank;
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//鍏ㄦ皯鍐叉
- {
- 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 == 4)
{
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))//绮剧伒鐩涘吀
+ bool Isopen = impactRankModel.IsInImpactRank;
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//鍏ㄦ皯鍐叉
{
if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
{
--
Gitblit v1.8.0