Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-28 c591cb6e215ea5e762560afdae059f1d4fd7f4ec

 System/FriendSystem/New/FriendsModel.cs

@@ -128,13 +128,9 @@
    private void RefreshKillOtherPlayer(uint id, string name)

    {

        if (id == PlayerDatas.Instance.baseData.PlayerID || IsDungeon()) return;



        ChatCtrl.Inst.PteChatID = (int)id;

        ChatCtrl.Inst.PteChatName = name;

        LanguageVerify.toPlayerLevel = 0;

        MapConfig mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

        string msg = StringUtility.Contact(Language.Get("KillOthersDes", mapConfig.Name,StringUtility.Contact("<color=#FF0101FF>", UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName), "</color>")),ChatCtrl.KILL_IDENTIFY);

        ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend,msg);

        SendChatInfoToPlayer((int)id,name,0,msg);

    }



    private bool IsDungeon()

@@ -144,6 +140,28 @@
        return mapConfig != null && mapConfig.MapFBType != 0;

    }



    public void SendChatInfoByGroup(GroupType groupType,string info)

    {

        if(_groupDict.ContainsKey((byte)groupType))

        {

            foreach(var value in _groupDict[(byte)groupType].Values)

            {

                if (_socialPlayerDict.ContainsKey(value.PlayerID))

                {

                    FriendPlayer friendPlayer = _socialPlayerDict[value.PlayerID];

                    SendChatInfoToPlayer((int)friendPlayer.PlayerID, UIHelper.ServerStringTrim(friendPlayer.PlayerName), friendPlayer.LV, info);

                }

            }

        }

    }



    public void SendChatInfoToPlayer(int id,string name,int lv,string info)

    {

        ChatCtrl.Inst.PteChatID = id;

        ChatCtrl.Inst.PteChatName = name;

        LanguageVerify.toPlayerLevel = lv;

        ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend,info);

    }



    //刷新好友列表信息

    public void ReFreshFriendlist(HB304_tagGCSocialPlayers friendInfo)