Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Strengthening/WashTips.cs

@@ -490,7 +490,15 @@
                {

                    if (equipWashModel.IsWashFull(_itemModel, _washProModel, _tagWashModel))

                    {

                        if(_washProModel.XLAttrLV  >= equipWashModel.GetMaxWashLv()

                            && _washProModel.XLAttrLV <= equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV))

                        {

                            _washFullLvText.text = Language.Get("WashLevelFulled");

                        }

                        else

                        {

                        _washFullLvText.text = Language.Get("EquipWash113", _itemModel.chinItemModel.LV, equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV));

                        }

                        ObjHideOrShow(false, false, false, false, true);

                    }

                    else

@@ -532,6 +540,8 @@
                ObjHideOrShow(false, false, false, false, true);



            }





        }

        else

        {