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

client_Zxw

2018-10-31 3a40ee1acff6579f0d2a08b97d3864b926d6d70a

 System/Compose/New/ComposeSecondTypeCell.cs

@@ -31,7 +31,7 @@
            unlockObj.SetActive(!isTrailer);

            unlockTypeName.text = itemCompound.thirdTypeName;

            lockTypeName.text = itemCompound.thirdTypeName;

            lockLevel.text = StringUtility.Contact(itemCompound.levelNeed,"级");

            lockLevel.text =  StringUtility.Contact(itemCompound.levelNeed,Language.Get("Z1041"));

            UpdateBtnImg(selectThirdType);

            typeBtn.RemoveAllListeners();

            typeBtn.AddListener(ClickTypeBtn);