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

client_linchunjie

2018-11-02 3ea77bcede501037ec86c8afd28268ee16a35437

 System/Pet/PetAttributeWin.cs

@@ -224,7 +224,9 @@
                    return;

                }

            }

            petmodel.SigPetId = petId;

            TypePetID = petId;



            _PetAttributeMethods.ModelShow(petId);



        }

@@ -316,6 +318,7 @@
                    if (Pet != 0)

                    {

                        TypePetID = Pet;

                        petmodel.SigPetId = Pet;

                        return;

                    }

                }

@@ -331,6 +334,7 @@
                    if (Value.UnLockNeedItemID == ItemId)

                    {

                        TypePetID = Value.ID;

                        petmodel.SigPetId = TypePetID;

                        return;

                    }

                }

@@ -341,6 +345,7 @@
                if (petmodel.DeblockingRedPoint[key].state == RedPointState.Simple)

                {

                    TypePetID = key;

                    petmodel.SigPetId = TypePetID;

                    return;

                }

            }

@@ -350,16 +355,19 @@
                if (petmodel.CultivateRedPoint[key].state == RedPointState.Simple)

                {

                    TypePetID = key;

                    petmodel.SigPetId = TypePetID;

                    return;

                }

            }

            if (petmodel.PetNow != 0)

            {

                TypePetID = petmodel.PetNow;

                petmodel.SigPetId = TypePetID;

            }

            else

            {

                TypePetID = sortlist[0].ID;

                petmodel.SigPetId = TypePetID;

            }

        }

        private int JunpIndex()

@@ -389,6 +397,7 @@
                    if (value.ID == petID[0])

                    {

                        TypePetID = petID[0];

                        petmodel.SigPetId = TypePetID;

                    }

                }

                //m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

@@ -424,6 +433,13 @@
            }

            return Index;

        }





        public void FairyJadeDomesticate()

        {

            _PetAttributeMethods.FairyJadeDomesticate();



        }

    }

}