From e0032a384fea347809bb45a4ddb6548694675e41 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 15 一月 2019 23:50:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 219 ++++++++++++++++++++++++++----------------------------
1 files changed, 107 insertions(+), 112 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 16d247a..1e16364 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -436,19 +436,32 @@
}
else
{
- //if (GroupTopIndexList.Contains(highBtnRecord.Index))
- //{
- // if (ModelCenter.Instance.GetModel<OSGiftModel>().activate)//瓒呭�肩ぜ鍖�
- // {
- // if (!AnimationFadeOutDicTop.ContainsKey(highBtnRecord.Index))
- // {
- // SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
- // selectCaseRequest.Tran = m_GroupIndex_Top.GetChild(i);
- // selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
- // AnimationFadeOutDicTop.Add(highBtnRecord.Index, selectCaseRequest);
- // }
- // }
- //}
+ if (GroupTopIndexList.Contains(highBtnRecord.Index))
+ {
+ int IndexOf = GroupTopIndexList.IndexOf(highBtnRecord.Index);
+ if (IndexOf == 0)
+ {
+ if (crossServerRewardModel.IsShowCrossServerOneVsOne())//璺ㄦ湇
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Top.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicTop.Add(highBtnRecord.Index, selectCaseRequest);
+
+ }
+ }
+ // if (ModelCenter.Instance.GetModel<OSGiftModel>().activate)//瓒呭�肩ぜ鍖�
+ //{
+ // if (!AnimationFadeOutDicTop.ContainsKey(highBtnRecord.Index))
+ // {
+ // SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ // selectCaseRequest.Tran = m_GroupIndex_Top.GetChild(i);
+ // selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ // AnimationFadeOutDicTop.Add(highBtnRecord.Index, selectCaseRequest);
+ // }
+ //}
+ }
}
}
}
@@ -569,7 +582,7 @@
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
}
-
+
}
else if (IndexOf == 1)
{
@@ -596,105 +609,9 @@
}
}
}
-
+
}
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)//------绗簩灞�
- {
- 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(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 == 5)
- {
- 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 == 6)
{
bool Isopen = impactRankModel.IsInImpactRank;
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//鍏ㄦ皯鍐叉
@@ -717,7 +634,7 @@
}
}
}
- else if (IndexOf == 7)
+ else if (IndexOf == 3)
{
bool Isopen = OpenServerModel.IsOpen;
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7澶╁绀�
@@ -739,7 +656,85 @@
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)
+ //{
+
+ //}
}
}
}
--
Gitblit v1.8.0