From 6defca440e8cead0874a45030869b532b1116ae3 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 13 九月 2018 16:49:43 +0800
Subject: [PATCH] 3534 【前端】【1.0.15】【主干】精彩活动放首充下方(第二排第一个位置)

---
 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index dc9d114..3acb6fe 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -538,32 +538,8 @@
                         int IndexOf = GroupLowIndexList.IndexOf(highBtnRecord.Index);
                         if (IndexOf == 0)
                         {
-                            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 == 1)
-                        {
                             var _funcOrder = 0;
-                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//寮�鏈嶆椿鍔�
+                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//绮惧僵娲诲姩
                             {
                                 if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))
                                 {
@@ -586,6 +562,30 @@
                                 }
                             }
 
+
+                        }
+                        else if (IndexOf == 1)
+                        {                          
+                            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 == 2)
                         {

--
Gitblit v1.8.0