From 1f5e35cd47a9baaaa6fa559c06640f47c9e79554 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 20 九月 2018 20:41:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Store/StoreModel.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/System/Store/StoreModel.cs b/System/Store/StoreModel.cs
index 890ca6e..a633531 100644
--- a/System/Store/StoreModel.cs
+++ b/System/Store/StoreModel.cs
@@ -69,6 +69,7 @@
         NewBieCenter.Instance.guideBeginEvent -= GuidBegin;
         shopItemlimitDict.Clear();
         petAndMountPushlist.Clear();
+        ClearPushData();
         tagTowerModel = null;
         storeFuncType = StoreFunc.WeekStore;
         tcbRefreshDict.Clear();
@@ -1118,7 +1119,11 @@
 
     private void GuidBegin()
     {
-        SetPushPetAndMountWinState(true,true);
+        PetAndMountPushWin pushWin = WindowCenter.Instance.Get<PetAndMountPushWin>();
+        if(pushWin != null)
+        {
+            SetPushPetAndMountWinState(true, true);
+        }
     }
 
     private void OnMoveTopPart(bool isMove)

--
Gitblit v1.8.0