From 568150682019c8e13cb72210066548e2c90c2dd0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 29 一月 2019 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into FestivalRedpack
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 299 ++++++++++++++++++-----------------------------------------
1 files changed, 91 insertions(+), 208 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 1e16364..7d3d449 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)
@@ -84,6 +85,7 @@
impactRankModel.inImpactRankUpdate += InImpactRankUpdate;
OpenServerModel.IsOpenEvent += IsOpenEvent;
OpenServerModel.IsPreviewTimeUpdate += IsOpenEvent;
+ OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;
}
public void Unit()
@@ -100,6 +102,12 @@
impactRankModel.inImpactRankUpdate -= InImpactRankUpdate;
OpenServerModel.IsOpenEvent -= IsOpenEvent;
OpenServerModel.IsPreviewTimeUpdate -= IsOpenEvent;
+ OperationTimeHepler.Instance.operationAdvanceEvent -= OperationAdvanceEvent;
+ }
+
+ private void OperationAdvanceEvent(Operation obj)
+ {
+ Classify();
}
private void IsOpenEvent()
@@ -119,18 +127,13 @@
private void operationEndEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.FairyCeremony)
- {
- Classify();
- }
+ Classify();
}
private void operationStartEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.FairyCeremony)
- {
- Classify();
- }
+ Classify();
+
}
private void UpdateRedpoint(int redPointID)
@@ -493,22 +496,7 @@
highBtnRecord.IsNagaaki = false;
}
}
- 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);
- }
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
}
}
else
@@ -536,23 +524,7 @@
highBtnRecord.IsNagaaki = false;
}
}
- 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);
- }
-
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
}
}
}
@@ -561,186 +533,97 @@
if (GroupLowIndexList.Contains(highBtnRecord.Index))
{
int IndexOf = GroupLowIndexList.IndexOf(highBtnRecord.Index);
- if (IndexOf == 0)
+ switch (IndexOf)
{
- 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))//绮惧僵娲诲姩
- {
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))
+ case 0:
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.FairyCeremony))//绮剧伒鐩涘吀
{
- if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 1:
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.NewYearFairyCeremony))//绮剧伒鐩涘吀
+ {
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 2:
+ var _funcOrder = 0;
+ if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//绮惧僵娲诲姩
+ {
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))
{
- 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);
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
}
}
- }
-
+ break;
+ case 3:
+ bool Isopen = impactRankModel.IsInImpactRank;
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//鍏ㄦ皯鍐叉
+ {
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 4:
+ bool Is_open = OpenServerModel.IsOpenFeatures();
+ bool _isOpen = springFestival.IsOpenFeatures();
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && (Is_open || _isOpen))//7澶╁绀�
+ {
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 5:
+ bool Isopen5 = OpenServerActivityCenter.Instance.IsActivityOpen(14);
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen5)//闄愭椂鎶㈣喘
+ {
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 6:
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//闄愭椂绀煎寘
+ {
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 7:
+ bool Isopen7 = OpenServerActivityCenter.Instance.IsActivityOpen(4);
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen7)//闄愭椂鐗规儬
+ {
+ SetTranInBox(m_GroupIndex_Low.GetChild(i), highBtnRecord);
+ }
+ break;
+ case 8:
+ break;
+ default:
+ break;
}
- else if (IndexOf == 2)
- {
- 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 == 3)
- {
- 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);
- }
- }
-
-
- }
- else if (IndexOf == 4)
- {
- bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(14);
- 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 == 5)
- {
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//闄愭椂绀煎寘
- {
- 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 == 6)
- {
- bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4);
- 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 == 7)
- //{
-
- //}
}
}
}
}
+ private void SetTranInBox(Transform tran, HighBtnRecord highBtnRecord)//涓嬪眰鎸夐挳璁剧疆灞傛暟
+ {
+ if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = tran;
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ else//------绗笁灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = tran;
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ }
+
private void PositionReduction()//杩樺師浣嶇疆锛堟妸鐩掑瓙涓殑浣嶇疆鍏ㄩ儴閲嶆柊鎷夊嚭鏉ワ級
{
if (AnimationFadeOutDicTop.Count > 0)//涓婂眰
--
Gitblit v1.8.0