From 07517d8c316fa2992c87d3561fffe90236a87f80 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 28 一月 2019 14:43:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 1e16364..c700ff2 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -119,7 +119,7 @@
private void operationEndEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.FairyCeremony)
+ if (arg1 == Operation.FairyCeremony || arg1== Operation.NewYearFairyCeremony)
{
Classify();
}
@@ -127,7 +127,7 @@
private void operationStartEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.FairyCeremony)
+ if (arg1 == Operation.FairyCeremony || arg1 == Operation.NewYearFairyCeremony)
{
Classify();
}
@@ -582,9 +582,30 @@
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
}
-
}
else if (IndexOf == 1)
+ {
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.NewYearFairyCeremony))//绮剧伒鐩涘吀
+ {
+ 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 == 2)
{
var _funcOrder = 0;
if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//绮惧僵娲诲姩
@@ -609,9 +630,8 @@
}
}
}
-
}
- else if (IndexOf == 2)
+ else if (IndexOf == 3)
{
bool Isopen = impactRankModel.IsInImpactRank;
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//鍏ㄦ皯鍐叉
@@ -634,7 +654,7 @@
}
}
}
- else if (IndexOf == 3)
+ else if (IndexOf == 4)
{
bool Isopen = OpenServerModel.IsOpen;
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7澶╁绀�
@@ -656,10 +676,8 @@
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
}
-
-
}
- else if (IndexOf == 4)
+ else if (IndexOf == 5)
{
bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(14);
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鎶㈣喘
@@ -681,10 +699,8 @@
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
}
-
-
}
- else if (IndexOf == 5)
+ else if (IndexOf == 6)
{
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//闄愭椂绀煎寘
{
@@ -704,11 +720,9 @@
selectCaseRequest.Index = highBtnRecord.Index;
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
-
}
-
}
- else if (IndexOf == 6)
+ else if (IndexOf == 7)
{
bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4);
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鐗规儬
@@ -731,10 +745,6 @@
}
}
}
- //else if (IndexOf == 7)
- //{
-
- //}
}
}
}
--
Gitblit v1.8.0