Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -55,7 +55,12 @@
            {

                m_ActivitySpreadDict[m_SortArray[i]] = false;

            }

            impactRankModel.presentSelectType = impactRankModel.GetDefaultSelectType();

            var impactDefaultType= impactRankModel.GetDefaultSelectType();

            if (impactRankModel.IsLock(impactDefaultType))

            {

                impactDefaultType = impactRankModel.billRankCfgDict.Keys.First();

            }

            impactRankModel.presentSelectType = impactDefaultType;

            impactRankModel.gotoImpactRankType = 0;

            envelopeModel.selectType = 1;

            CheckAlreadyOpen();

@@ -116,13 +121,15 @@
            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;

            OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;

            CloseOtherWin();

            WindowCenter.Instance.Open<MainInterfaceWin>();

            impactRankModel.gotoImpactRankType = 0;

        }



        protected override void OnAfterClose()

        {



            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }



        int GetDefaultSelect()

@@ -241,7 +248,8 @@


        private void OnStepServerDayEvent()

        {

            m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();

            //m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();

            UpdateFunctionBtns();

        }



        private void RefreshActivityTypeCell(OpenActivityRankTypeCell _cell)

@@ -292,6 +300,10 @@
                        }

                        foreach (var _type in impactRankModel.billRankCfgDict.Keys)

                        {

                            if (impactRankModel.IsLock(_type))

                            {

                                continue;

                            }

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

                        }

                        break;