Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Message/HrefAnalysis.cs

@@ -153,7 +153,7 @@
                            var _id = 0;

                            if (int.TryParse(presentHrefInfo.mSplits["showitem"], out _id))

                            {

                                ItemConfig cfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);

                                ItemConfig cfg = Config.Instance.Get<ItemConfig>(_id);

                                if (cfg != null && cfg.Type == 111)

                                {

                                    Dictionary<int, List<int>> userdatadic = null;

@@ -190,7 +190,7 @@
                        presentHrefInfo.mEvents.Add(RichTextEventEnum.SHOWITEM);

                        presentHrefInfo.Add(split_value, array[1]);

                        var _itemId = int.Parse(array[1]);

                        var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);

                        var _itemCfg = Config.Instance.Get<ItemConfig>(_itemId);

                        var text = RichTextMgr.Inst.presentRichText;

                        int colorType = 0;

                        if (text != null)