From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/FriendSystem/New/FriendsModel.cs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/System/FriendSystem/New/FriendsModel.cs b/System/FriendSystem/New/FriendsModel.cs
index 22fed92..62256fb 100644
--- a/System/FriendSystem/New/FriendsModel.cs
+++ b/System/FriendSystem/New/FriendsModel.cs
@@ -130,6 +130,7 @@
ChatCtrl.Inst.PteChatID = (int)id;
+ ChatCtrl.Inst.PteChatName = name;
MapConfig mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
string msg = StringUtility.Contact(Language.Get("KillOthersDes", mapConfig.Name, UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName)),ChatCtrl.KILL_IDENTIFY);
ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend,msg);
--
Gitblit v1.8.0