From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 System/Strengthening/WashTips.cs |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/System/Strengthening/WashTips.cs b/System/Strengthening/WashTips.cs
index 3883b45..66b73f8 100644
--- a/System/Strengthening/WashTips.cs
+++ b/System/Strengthening/WashTips.cs
@@ -490,7 +490,15 @@
                 {
                     if (equipWashModel.IsWashFull(_itemModel, _washProModel, _tagWashModel))
                     {
-                        _washFullLvText.text = Language.Get("EquipWash113", _itemModel.chinItemModel.LV, equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV));
+                        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
         {

--
Gitblit v1.8.0