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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/OffLineOnHookWin.cs

@@ -162,7 +162,7 @@
            if (ItemID > 4)

            {

                pickUpInformation.TitleText.text = Language.Get("PickUp_Z");

                ItemConfig itemconfig = ConfigManager.Instance.GetTemplate<ItemConfig>(ItemID);

                ItemConfig itemconfig = Config.Instance.Get<ItemConfig>(ItemID);

                pickUpInformation.CoentText.color = UIHelper.GetUIColor(itemconfig.ItemColor, true);

                pickUpInformation.CoentText.text = string.Format(Language.Get("ItemsToPickUp"), itemconfig.ItemName, onHookModel.DicItem[ItemID]);

            }