Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-03-14 d0d289d502fe85e9bb597ced1b41c73b8bc75889

 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)

@@ -861,13 +861,12 @@
                    int[] equipGems = null;

                    if (equip)

                    {

                        equipGemModel.TryGetEquipGems(itemPlaceList[i].itemPlace, out equipGems);

                        equipGemModel.TryGetEquipGems(itemPlaceList[i].gridIndex, out equipGems);

                    }

                    _textBuilder.Append("#item#");

                    var chatSendItem = new ChatSendItem()

                    {

                        itemId = (int)itemPlaceList[i].itemId,

                        isBind = (int)itemPlaceList[i].isBind,

                        count = (int)itemPlaceList[i].count,

                        equipGems = equipGems,

                        useData = itemPlaceList[i].itemInfo.userData,

@@ -1051,7 +1050,6 @@
            var item = new ItemModel(PackType.Item);

            var itemInfo = new ItemInfo();

            itemInfo.itemId = flauntGemId;

            itemInfo.isBind = flauntGemBind ? 1 : 0;

            item.SetItemInfo(itemInfo);

            var tip = string.Format("[{0}]", config.ItemName);

            itemPlaceList.Add(item);

@@ -1144,7 +1142,6 @@
    public struct ChatSendItem

    {

        public int itemId;

        public int isBind;

        public int count;

        public int[] equipGems;

        public string useData;