Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 System/MainInterfacePanel/ChatFrame.cs

@@ -34,7 +34,6 @@
        [SerializeField] RedpointBehaviour m_RealmRed;

        [SerializeField] UIEffect m_RealmSfx;



        [SerializeField] FairyFeastBehaviour m_FairyFeast;

        List<int> OneKeyList = new List<int>();

        TeamModel m_Model;

        TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }

@@ -60,7 +59,6 @@
            _TeamChatBtn.voiceRecordSuccessEvent += OnVoiceRecordTeamSuccessEvent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)

            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

            m_FairyFeast.Init();

            _MailBtn.onClick.AddListener(MailButton);

            _OneKeyBtn.onClick.AddListener(OneKeyButton);

            _AutoBtn.onClick.AddListener(AutoButton);

@@ -242,7 +240,6 @@
            MailAllModel.Instance.DeleteMailEvent -= MailCountChange;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            m_FairyFeast.UnInit();

            m_RealmBtn.RemoveAllListeners();

            _MailBtn.onClick.RemoveAllListeners();

            _OneKeyBtn.onClick.RemoveAllListeners();