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

client_Wu Xijin

2019-01-22 c249639c00811edb11d537d0dd55cf552cc5b2d0

 System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs

@@ -128,7 +128,8 @@
                activeObj.SetActive(!isActive);

                if(!isActive)

                {

                    string conditionSB = StringUtility.Contact("达到8阶激活");

                    string conditionSB = StringUtility.Contact("达到",suitAttrData.suitLv,"阶激活");

                    activeText.text = conditionSB;

                }

                for (int i = 0; i < attrObjlist.Count; i++)

                {