Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

 System/MainInterfacePanel/ChatFrame.cs

@@ -20,7 +20,6 @@
        [SerializeField] Button _MailBtn;//邮件按钮

        [SerializeField] Button _OneKeyBtn;//地图挂机

        [SerializeField] Button _AutoBtn;//自动挂机  

        [SerializeField] Button _FriendsBtn;//好友按钮

        [SerializeField] Button _BackPack1Btn;//背包按钮

        [SerializeField] Button _SetupBtn;



@@ -28,20 +27,13 @@
        [SerializeField] GameObject AutoImg;//原地挂机



        [SerializeField] Button m_TaskBtn;//任务按钮

        [SerializeField] Button m_SocialBtn;//社交按钮

        [SerializeField] Button m_TeamBtn;//队伍按钮

        [SerializeField] Button m_RealmBtn;//境界按钮

        [SerializeField] Image m_RealmLV;//境界等级

        [SerializeField] RedpointBehaviour m_RealmRed;

        [SerializeField] UIEffect m_RealmSfx;



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

        TeamModel m_Model;

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

        RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }

        CoinTaskTipModel m_CoinTaskTip;

        CoinTaskTipModel coinTaskTip { get { return m_CoinTaskTip ?? (m_CoinTaskTip = ModelCenter.Instance.GetModel<CoinTaskTipModel>()); } }



        CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }

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

        CoinTaskTipModel coinTaskTip { get { return ModelCenter.Instance.GetModel<CoinTaskTipModel>(); } }



        public void Init()

        {

@@ -60,22 +52,18 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            _TongVoiceBtn.voiceRecordSuccessEvent += OnVoiceRecordFairySuccessEvent;

            _TeamChatBtn.voiceRecordSuccessEvent += OnVoiceRecordTeamSuccessEvent;

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

            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

            _MailBtn.onClick.AddListener(MailButton);

            _OneKeyBtn.onClick.AddListener(OneKeyButton);

            _AutoBtn.onClick.AddListener(AutoButton);

            _FriendsBtn.onClick.AddListener(TeamBtn);

            _BackPack1Btn.onClick.AddListener(BackPack1Buton);

            _SetupBtn.onClick.AddListener(OnSetBtn);

            m_TaskBtn.AddListener(TaskButton);

            m_TeamBtn.AddListener(FriendsButton);

            m_RealmBtn.AddListener(OnRealmButton);

            _MailBtn.SetListener(MailButton);

            _OneKeyBtn.SetListener(OneKeyButton);

            _AutoBtn.SetListener(AutoButton);

            _BackPack1Btn.SetListener(BackPack1Buton);

            _SetupBtn.SetListener(OnSetBtn);

            m_TaskBtn.SetListener(TaskButton);

            m_SocialBtn.SetListener(FriendsButton);

            m_TeamBtn.SetListener(OpenTeam);

            myTeamRefreshEvent();

            OnRefreshFairyInfo();

            CheckRealmSfx();

            MailCountChange();

            GetRealmLevel();



            if (PlayerDatas.Instance.hero != null)

            {

                if (PlayerDatas.Instance.hero.aiHandler.IsAuto())

@@ -83,8 +71,6 @@
                    OnHeroHandupAIStopPassive();

                }

            }



            _FriendsBtn.gameObject.SetActive(!CrossServerUtility.IsCrossServerOneVsOne());

        }



        public void OnAfterOpen()

@@ -126,10 +112,6 @@
                OnRefreshFairyInfo();

                myTeamRefreshEvent();

            }

            if ((FuncOpenEnum)_type == FuncOpenEnum.Realm)

            {

                GetRealmLevel();

            }

        }



        private void MailCountChange()

@@ -168,55 +150,14 @@
            _MailBtn.gameObject.SetActive(isShowMail);

        }



        private void GetRealmLevel()//关于境界

        {

            int realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var realmConfig = RealmConfig.Get(realmLevel);

            if (FuncOpen.Instance.IsFuncOpen(12))

            {

                if (realmConfig != null && realmConfig.Lv > 0)

                {

                    m_RealmLV.SetSprite(realmConfig.Img);

                }

                else

                {

                    m_RealmLV.SetSprite("NoRealm");

                }

            }

            else

            {

                m_RealmLV.SetSprite("NoRealm");

            }



        }



        public void CheckRealmSfx()

        {

            var _model = ModelCenter.Instance.GetModel<RealmModel>();

            if (realmModel.levelUpRedpoint.state == RedPointState.Simple)

            {

                m_RealmRed.gameObject.SetActive(false);

                if (!m_RealmSfx.IsPlaying)

                {

                    m_RealmSfx.Play();

                }

            }

            else

            {

                m_RealmRed.gameObject.SetActive(true);

            }

        }



        private void OnSetBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();



            WindowCenter.Instance.Open<SettingUpWin>(false, 3);

        }



        private void TaskButton()

        {



            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<TaskWin>();

            if (coinTaskTip.IsPopup)

@@ -225,10 +166,9 @@
            }

        }



        private void TeamBtn()

        private void OpenTeam()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();



            if (model.myTeam.inTeam)

            {

                WindowCenter.Instance.Open<TeamFrameWin>(false, 1);

@@ -237,8 +177,8 @@
            {

                WindowCenter.Instance.Open<TeamFrameWin>(false, 0);

            }



        }



        public void UnInit()

        {

            _TongVoiceBtn.voiceRecordSuccessEvent -= OnVoiceRecordFairySuccessEvent;

@@ -249,26 +189,6 @@
            HeroBehaviour.OnStopHandupAI -= OnHeroHandupAIStopPassive;

            HeroBehaviour.OnStartHandupAI -= OnHeroHandupAIStarted;

            MailAllModel.Instance.DeleteMailEvent -= MailCountChange;

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

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            m_RealmBtn.RemoveAllListeners();

            _MailBtn.onClick.RemoveAllListeners();

            _OneKeyBtn.onClick.RemoveAllListeners();

            _AutoBtn.onClick.RemoveAllListeners();

            _FriendsBtn.onClick.RemoveAllListeners();

            _BackPack1Btn.onClick.RemoveAllListeners();

            _SetupBtn.onClick.RemoveAllListeners();

            m_TeamBtn.RemoveAllListeners();

            m_TaskBtn.RemoveAllListeners();



        }



        private void RedpointValueChangeEvent(int _id)

        {

            if (_id == realmModel.levelUpRedpoint.id)

            {

                CheckRealmSfx();

            }

        }



        private void OnRefreshFairyInfo()

@@ -312,9 +232,6 @@


        void FriendsButton()

        {

            //MainRedDot.Instance.redPointFriendChat.state = RedPointState.None;

            //ChatCtrl.Inst.presentChatType = ChatInfoType.Friend;

            //WindowCenter.Instance.Open<ChatWin>();

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<SocialWin>();

        }

@@ -327,11 +244,6 @@
        void TongVoiceButton()

        {

            SysNotifyMgr.Instance.ShowTip("UnopenedFunction");

        }

        private void OnRealmButton()

        {

            WindowCenter.Instance.Open<RealmTransitionWin>();

            //WindowCenter.Instance.Close<MainInterfaceWin>();

        }



        void MailButton()//邮件按钮

@@ -472,6 +384,7 @@
                AutoImg.SetActive(false);

            }

        }



        private bool IsDungeon()//判断是否再副本中

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

@@ -479,15 +392,6 @@
            return mapConfig != null && mapConfig.MapFBType != 0;

        }



        void Updatefighting(PlayerDataType _tCDBPlayerRefresh)//数据的刷新

        {

            switch (_tCDBPlayerRefresh)

            {

                case PlayerDataType.RealmLevel:

                    GetRealmLevel();

                    break;

            }

        }

    }