Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

昨天 bcd1dcef07dc129d68539ca2d562c5df53007f36

 Main/System/Chat/ChatBulletView.cs

@@ -61,6 +61,8 @@
                    fmlv = fairyMember.FmLV;
                }
                return Language.Get("Chat16", RichTextMsgReplaceConfig.GetRichReplace("FAMILY", fmlv), data.Name, data.Content);
            case ChatChannel.CrossServer:
                return Language.Get("Chat17", data.Name, data.Content);
            default:
                return data.Content;
        }