From aabbfee8c149cd91c8a5c9ebd5578706da6817be Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 六月 2019 14:01:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
index 8fff9be..4bf6148 100644
--- a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
+++ b/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;

--
Gitblit v1.8.0