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

client_Hale

2019-06-29 aabbfee8c149cd91c8a5c9ebd5578706da6817be

 Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs

@@ -22,6 +22,7 @@
    {

        get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }

    }



    public FairyData fairy = null;

    public FairyMember mine = null;

    public event Action OnRefreshFairyInfo;

@@ -260,6 +261,11 @@
    {

        if (vNetData.FamilyNameLen > 0)

        {

            if (fairy == null)

            {

                fairy = new FairyData();

            }



            if (mine != null)

            {

                mine.FamilyLV = vNetData.FamilyMemberLV;