Merge branch 'CrossServerBoss' of http://192.168.0.87:10010/r/snxxz_scripts...

client_Zxw

2019-01-05 46a48bbb9fa3f46163e7bba8a520ed29cbd16fb6

 System/MainInterfacePanel/ChatFrame.cs

@@ -40,6 +40,9 @@
        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>(); } }



        public void Init()

        {

            OneKeyList.Clear();

@@ -80,8 +83,8 @@
                    OnHeroHandupAIStopPassive();

                }

            }

          
          


            _FriendsBtn.gameObject.SetActive(crossServerBossModel.IsAtCrossServerBossMap());

        }



        public void OnAfterOpen()

@@ -210,6 +213,7 @@


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

        }



        private void TaskButton()

        {



@@ -220,6 +224,7 @@
                coinTaskTip.IsPopup = false;

            }

        }



        private void TeamBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();