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

client_Zxw

2019-01-05 e1da7e743031b1afa394ed190dee78e5b5c82556

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

 System/Chat/ChatContentBehaviour.cs

@@ -68,6 +68,11 @@
            }

        }



        FriendsModel friendModel

        {

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

        }



        private void Awake()

        {

            m_ChatContentControl.OnGetDynamicSize += OnGetChatDynamicSize;

@@ -95,6 +100,8 @@
            ChatCtrl.Inst.OnPteChatChangeEvent += OnPteChatChangeEvent;

            chatCenter.UpdateChatContent += UpdateChatContent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

            friendModel.RefreshFriendCntEvent += RefreshFriendCntEvent;

            friendModel.RefreshFriendModel += DisplayChatRemind;

            ResetNewInfo();

            UpdateChatContent();

            if (m_ChatType == ChatInfoType.Friend)

@@ -325,9 +332,21 @@
            if (m_ContainerPrivateChatRemind != null)

            {

                bool requireRemind = false;

                var _dict = friendModel.GetFriendInfoDict((byte)GroupType.RecentContact);

                if (m_ChatType == ChatInfoType.Friend)

                {

                    requireRemind = true;

                    if (WindowCenter.Instance.IsOpen<ChatWin>())

                    {

                        if (((_dict != null && _dict.Count > 0) ||

                        friendModel.tempFriendData != null) && ChatCtrl.Inst.PteChatID > 0)

                        {

                            requireRemind = true;

                        }

                    }

                    else

                    {

                        requireRemind = true;

                    }

                }

                var displayAreaHeight = m_ContainerDisplay.rect.height;

                m_ContainerPrivateChatRemind.gameObject.SetActive(requireRemind);

@@ -486,6 +505,24 @@
            chatCenter.UpdateChatContent -= UpdateChatContent;

            ChatCtrl.Inst.OnPteChatChangeEvent -= OnPteChatChangeEvent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;

            friendModel.RefreshFriendCntEvent -= RefreshFriendCntEvent;

            friendModel.RefreshFriendModel -= DisplayChatRemind;

        }



        private void RefreshFriendCntEvent(GroupType type, bool arg2)

        {

            if (type == GroupType.RecentContact && m_ChatType == ChatInfoType.Friend)

            {

                DisplayChatRemind();

                if (WindowCenter.Instance.IsOpen<ChatWin>())

                {

                    var _dict = friendModel.GetFriendInfoDict((byte)GroupType.RecentContact);

                    if (!_dict.ContainsKey((uint)ChatCtrl.Inst.PteChatID))

                    {

                        ChatCtrl.Inst.PteChatID = 0;

                    }

                }

            }

        }



        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)


 System/Debug/DebugRoot.cs

@@ -36,7 +36,7 @@
            return;
        }

        if (DebugUtility.Instance.debugAccount)
        if (DebugUtility.Instance.isWhiteListAccount)
        {
            if (Input.GetMouseButtonDown(0))
            {

 System/Debug/DebugUtility.cs

@@ -19,7 +19,7 @@
            if (m_DebugAccount != value)

            {

                m_DebugAccount = value;

                if (debugAccount)

                if (m_DebugAccount)

                {

                    RunTimeExceptionUtility.Instance.Init();

                }


 UI/HUD/PopUpNum.cs

@@ -72,6 +72,11 @@
                return;

            }



            if (_popupInfo.target==null || _popupInfo.camera==null)

            {

                return;

            }



            var popupNum = PopUpNumPool.Require(_popupInfo.pattern);

            if (popupNum == null)

            {