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

client_Hale

2019-04-19 feeceecc1252fd472a7027fc2049cd95816ea162

 System/Pet/PetModel.cs

@@ -257,7 +257,7 @@
            int type = 0;

            foreach (var key in _TagPetItem.Keys)

            {

                if (_TagPetItem[key] >= AttrFruitConfig.Get(key).MaxUseCnt)

                if (_TagPetItem[key] >= AttrFruitConfig.Get(key).basicUseLimit)

                {

                    continue;

                }

@@ -778,7 +778,7 @@
                    }

                    return iSHint;

                case PetEnum.PetStone:

                    int _maxuse = AttrFruitConfig.Get(id).MaxUseCnt;

                    int _maxuse = AttrFruitConfig.Get(id).basicUseLimit;

                    if (_TagPetItem.ContainsKey(id))

                    {

                        if (_maxuse > _TagPetItem[id])