2453【前端】【前端】充值、福利、活动界面整合

client_linchunjie

2018-08-14 f811afb62fa90055d0b7ed02f640d141f2bcfc97

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -283,9 +283,6 @@
                            m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + _type);

                        }

                        break;

                    case 1:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        continue;

                    case 2:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        if (!m_ActivitySpreadDict[sort])

@@ -295,11 +292,7 @@
                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 1);

                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);

                        break;

                    case 3:

                    case 4:

                    case 5:

                    case 8:

                    case 9:

                    default:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        break;

                }

@@ -391,6 +384,16 @@
                        WindowCenter.Instance.Open<MultipleExpWin>(true);

                    }

                    break;

                case 6:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<OpenServerGiftWin>();

                    }

                    else

                    {

                        WindowCenter.Instance.Open<OpenServerGiftWin>(true);

                    }

                    break;

                case 8:

                    if (windowState == WindowState.Opened)

                    {

@@ -441,6 +444,7 @@
            WindowCenter.Instance.CloseImmediately<MultipleExpWin>();

            WindowCenter.Instance.CloseImmediately<NPracticePointWin>();

            WindowCenter.Instance.CloseImmediately<BossRebornWin>();

            WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>();

        }



        private int Compare(int x, int y)