Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-08-14 5dee7cecd70159342e6cb13360a7ee7d9c22a8d7

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -67,6 +67,7 @@
            TimeUtility.OnServerOpenDayRefresh += OnStepServerDayEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent;

            OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;

            OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;

            for (int i = 0; i < m_SortArray.Count; i++)

            {

                m_ActivitySpreadDict[m_SortArray[i]] = false;

@@ -119,6 +120,7 @@
            TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;

            OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;

            OperationTimeHepler.Instance.operationAdvanceEvent -= OperationAdvanceEvent;

            CloseOtherWin();

            WindowCenter.Instance.Open<MainInterfaceWin>();

            impactRankModel.gotoImpactRankType = 0;

@@ -595,6 +597,18 @@
                    break;

            }

        }



        private void OperationAdvanceEvent(Operation type)

        {

            if (type == Operation.FlashSale)

            {

                if (!alreadyOpenActivitys.Contains(4))

                {

                    alreadyOpenActivitys.Add(4);

                    UpdateFunctionBtns();

                }

            }

        }

    }

}