Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 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;