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

client_linchunjie

2019-04-22 288835aff9bdcdaf0c6a8d8457d468c4fb62edd9

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

 System/ItemTip/EquipTipWin.cs

@@ -242,7 +242,7 @@
                }
                else
                {
                    job.text = Language.Get("StoreWin110");
                    job.text = Language.Get("EquipWin_JobTitleText_1") + Language.Get("StoreWin110");
                }

                equipPlace.text = Language.Get("EquipWin_PartTitleText_1") + UIHelper.GetEquipPlaceName(itemConfig.EquipPlace);

 System/ItemTip/GuardTipWin.cs

@@ -89,7 +89,7 @@
            }
            else
            {
                m_Job.text = Language.Get("StoreWin110");
                m_Job.text = Language.Get("EquipWin_JobTitleText_1") + Language.Get("StoreWin110");
            }

            m_Place.text = Language.Get("EquipWin_PartTitleText_1") + UIHelper.GetEquipPlaceName(itemConfig.EquipPlace);