Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-28 c591cb6e215ea5e762560afdae059f1d4fd7f4ec

 System/Chat/ChatCtrl.cs

@@ -277,7 +277,7 @@
        {

            isDirty = DirtyWordConfig.IsDirtWord(msg);

            msg = DirtyWordConfig.IsDirtWord(msg, '*');

            var length = msg.Length;

            var length = GetChatMessageLength(msg);

            if (length > CHAT_INFO_CNT)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("L1014"));

@@ -381,6 +381,13 @@
         });

    }



    int GetChatMessageLength(string message)

    {

        message = WordAnalysis.Color_Start_Regex.Replace(message, string.Empty);

        message = WordAnalysis.Color_End_Regex.Replace(message, string.Empty);

        return message.Length;

    }



    bool CheckEmptyChat(string msg)

    {

        if (string.IsNullOrEmpty(msg.Replace(" ", string.Empty)))