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

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 System/Pet/PetAttributeMethods.cs

@@ -531,7 +531,7 @@
            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, petmodel.petUpgradeToolId);

            if (haveCnt >= costNum)

            {

                if (WindowCenter.Instance.CheckOpen<RidingAndPetActivationWin>())

                if (WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>())

                {

                    petAutoTrainText.text = Language.Get("PetWin_EvolveTrainBtn_6");

                    isAutoTrain = false;