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

client_linchunjie

2018-10-30 042f11be8a7eb8ed31545a01e381b05e4f90e96d

 System/FriendSystem/New/SocialWin.cs

@@ -14,6 +14,8 @@
        [SerializeField] GameObject friendTipsObj;

        [SerializeField] ChatSendComponent m_ChatSend;



        SocialModel socialModel { get { return ModelCenter.Instance.GetModel<SocialModel>(); } }



        protected override void BindController()

        {



@@ -28,12 +30,17 @@


        protected override void OnPreOpen()

        {

            socialModel.SetDefaultSelectTitle();

            m_ChatSend.parent = this;

        }



        protected override void OnActived()

        {

            base.OnActived();

            if(!WindowJumpMgr.Instance.IsJumpState)

            {

                functionOrder = (int)socialModel.selectType;

            }

            btnGroup.TriggerByOrder(functionOrder);

        }



@@ -57,6 +64,7 @@


        private void ClickXianYuanBtn()

        {

            socialModel.UpdateSelectTitle(SocialModel.SocialType.XianYuan);

            CloseChild();

            friendTipsObj.SetActive(true);

            functionOrder = xianyuanBtn.order;

@@ -64,6 +72,7 @@


        private void TeamChat()

        {

            socialModel.UpdateSelectTitle(SocialModel.SocialType.Team);

            CloseChild();

            WindowCenter.Instance.Open<TeamChatWin>();

            functionOrder = m_TeamChat.order;

@@ -71,6 +80,7 @@


        private void FairyChat()

        {

            socialModel.UpdateSelectTitle(SocialModel.SocialType.Union);

            CloseChild();

            WindowCenter.Instance.Open<FairyChatWin>();

            functionOrder = m_FairyChat.order;