Merge branch 'master' into ItemTip

client_Wu Xijin

2019-03-14 66909e1da5f3e0ff39dfe48d819d2128b574cfbd

 System/Chat/ChatCtrl.cs

@@ -778,7 +778,7 @@
                        {

                            string append = string.Format("<a><Word info=item id={0} chatsenditem={1} chatsend=1/>|showitem={0} chatsenditem={1}</a>",

                                      chatSendItem.itemId, detail);

                            append = UIHelper.AppendStringColor(itemConfig.ItemColor, append);

                            append = UIHelper.AppendColor(itemConfig.ItemColor, append);

                            data.richText.Append(append);

                        }

                        catch (Exception e)