From 2b32c1203f307905b0b5e646291137c44d067f4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 10 十一月 2018 15:06:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Strengthening/WashTips.cs |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/System/Strengthening/WashTips.cs b/System/Strengthening/WashTips.cs
index 052ace8..8f68112 100644
--- a/System/Strengthening/WashTips.cs
+++ b/System/Strengthening/WashTips.cs
@@ -429,8 +429,8 @@
                 break;
         }
 
-        List<EquipWashSpecConfig> tagSpecModellist = EquipWashSpecConfig.GetWashSpecModel(type);
-        if (curTypeLv < tagSpecModellist[0].levelNeed)
+        List<EquipWashSpecConfig.EquipWashSpecData> tagSpecModellist = EquipWashSpecConfig.GetWashSpecModel(type);
+        if (curTypeLv < tagSpecModellist[0].specConfig.levelNeed)
         {
             _specWashOpenCondition.gameObject.SetActive(true);
             _openSpecWashPro.SetActive(false);
@@ -442,10 +442,11 @@
             int i = 0;
             for (i = tagSpecModellist.Count - 1; i > -1; i--)
             {
-                if (curTypeLv >= tagSpecModellist[i].levelNeed)
+                var washSpecData = tagSpecModellist[i];
+                if (curTypeLv >= washSpecData.specConfig.levelNeed)
                 {
-                    int[] specAttrsID = ConfigParse.GetMultipleStr<int>(tagSpecModellist[i].attByLevel);
-                    int[] specAttrsValue = ConfigParse.GetMultipleStr<int>(tagSpecModellist[i].attByLevelValue);
+                    int[] specAttrsID = washSpecData.activeIds;
+                    int[] specAttrsValue = washSpecData.activeValues;
                     int j = 0;
                     for (j = 0; j < specAttrNameText.Count; j++)
                     {
@@ -469,7 +470,7 @@
             }
         }
 
-        if(curTypeLv >= tagSpecModellist[tagSpecModellist.Count - 1].levelNeed)
+        if(curTypeLv >= tagSpecModellist[tagSpecModellist.Count - 1].specConfig.levelNeed)
         {
             _specWashFullText.gameObject.SetActive(true);
         }

--
Gitblit v1.8.0