From 4af082f15d5c3097056a518f383799ee7df8c852 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 04 九月 2018 17:32:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Guard/GuardModel.cs |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/System/Guard/GuardModel.cs b/System/Guard/GuardModel.cs
index cf3ef6b..ff5d02d 100644
--- a/System/Guard/GuardModel.cs
+++ b/System/Guard/GuardModel.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 namespace Snxxz.UI
 {
-    public class GuardModel : Model, IAfterPlayerDataInitialize
+    public class GuardModel : Model, IAfterPlayerDataInitialize, IPlayerLoginOk
     {
         List<int> fairyLandGuardItems = new List<int>();
 
@@ -28,6 +28,10 @@
 
         public void OnAfterPlayerDataInitialize()
         {
+        }
+
+        public void OnPlayerLoginOk()
+        {
             SnxxzGame.Instance.StartCoroutine(Co_LoadGuard());
         }
 
@@ -46,6 +50,10 @@
             }
             PlayerPackModel _packModel = ModelCenter.Instance.GetModel<PlayerPackModel>();
             SinglePackModel _equipModel = _packModel.GetSinglePackModel(PackType.rptEquip);
+            if (_equipModel == null)
+            {
+                yield break;
+            }
             var _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal);
             if (_itemModel != null && _itemModel.itemInfo != null)
             {

--
Gitblit v1.8.0