少年修仙传客户端代码仓库
Client_PangDeRong
2018-08-13 c318e59ba400c57fbb27ebca0110fce540d660d1
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
61 ■■■■■ 已修改文件
System/MainInterfacePanel/HighSettingTip.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityWin.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/HighSettingTip.cs
@@ -197,7 +197,7 @@
        {
            int _order = 0;
            m_OpenService.gameObject.SetActive(OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _order));
            m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");
            //m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");
        }
        private void OnMainHighTipCdTime()
System/OpenServerActivity/OpenServerActivityWin.cs
@@ -51,6 +51,7 @@
        List<int> openActivitys = new List<int>();
        List<int> activityReds = new List<int>();
        List<int> alreadyOpenActivitys = new List<int>();
        protected override void BindController()
        {
@@ -74,6 +75,7 @@
            impactRankModel.presentSelectType = impactRankModel.GetDefaultSelectType();
            impactRankModel.gotoImpactRankType = 0;
            envelopeModel.selectType = 1;
            CheckAlreadyOpen();
            UpdateFunctionBtns();
        }
@@ -198,6 +200,35 @@
            }
        }
        void CheckAlreadyOpen()
        {
            alreadyOpenActivitys.Clear();
            if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())
            {
                alreadyOpenActivitys.Add(3);
            }
            if (OpenServerActivityCenter.Instance.IsFlashSaleOpen())
            {
                alreadyOpenActivitys.Add(4);
            }
            if (OpenServerActivityCenter.Instance.IsImpactRankOpen())
            {
                alreadyOpenActivitys.Add(0);
            }
            if (OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())
            {
                alreadyOpenActivitys.Add(2);
            }
            if (OpenServerActivityCenter.Instance.IsConsumeRebateOpen())
            {
                alreadyOpenActivitys.Add(1);
            }
            if (OpenServerActivityCenter.Instance.IsMultipleExpOpen())
            {
                alreadyOpenActivitys.Add(5);
            }
        }
        private void OnOpenServerActivityRefresh(ScrollerDataType type, CellView cell)
        {
            switch (type)
@@ -273,13 +304,13 @@
            for (int i = 0; i < m_SortArray.Count; i++)
            {
                var sort = m_SortArray[i];
                switch (sort)
                {
                    case 0:
                        if (!OpenServerActivityCenter.Instance.IsImpactRankOpen())
                if (!alreadyOpenActivitys.Contains(sort))
                        {
                            continue;
                        }
                switch (sort)
                {
                    case 0:
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                        if (functionOrder != sort)
                        {
@@ -295,17 +326,9 @@
                        }
                        break;
                    case 1:
                        if (!OpenServerActivityCenter.Instance.IsConsumeRebateOpen())
                        {
                            continue;
                        }
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                        continue;
                    case 2:
                        if (!OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())
                        {
                            continue;
                        }
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                        if (!m_ActivitySpreadDict[sort])
                        {
@@ -315,24 +338,12 @@
                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);
                        break;
                    case 3:
                        if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())
                        {
                            continue;
                        }
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                        break;
                    case 4:
                        if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen())
                        {
                            continue;
                        }
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                        break;
                    case 5:
                        if (!OpenServerActivityCenter.Instance.IsMultipleExpOpen())
                        {
                            continue;
                        }
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                        break;
                }