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

client_Wu Xijin

2018-08-24 d4b711bcc9a9e71c5835276f8ac5130329707da5

 System/FriendSystem/New/FriendTips.cs

@@ -116,6 +116,7 @@
                selectFriendObj.SetActive(false);

                unSelectFriendObj.SetActive(true);

                ChatCtrl.Inst.PteChatID = 0;

                ChatCtrl.Inst.PteChatName = string.Empty;

            }

        }



@@ -167,6 +168,7 @@
            selectPlayerId = playerId;

            typeCtrl.m_Scorller.RefreshActiveCellViews();

            ChatCtrl.Inst.PteChatID = playerId;

            ChatCtrl.Inst.PteChatName = playerName;

            speakOtherNameText.text = Language.Get("Friend107", UIHelper.ServerStringTrim(playerName));



            friendsModel.RemoveFriendRed(lookGroupType,playerId);

@@ -237,6 +239,7 @@
                    selectFriendObj.SetActive(true);

                    unSelectFriendObj.SetActive(false);

                    ChatCtrl.Inst.PteChatID = playerId;

                    ChatCtrl.Inst.PteChatName = playerName;

                    playerInfoCell.Init(playerId, groupType,playerId);

                    speakOtherNameText.text = Language.Get("Friend107", UIHelper.ServerStringTrim(playerName));

                });