From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Store/StoreModel.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/System/Store/StoreModel.cs b/System/Store/StoreModel.cs
index 890ca6e..8586001 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,12 +1119,19 @@
private void GuidBegin()
{
- SetPushPetAndMountWinState(true,true);
+ PetAndMountPushWin pushWin = WindowCenter.Instance.Get<PetAndMountPushWin>();
+ if(pushWin != null)
+ {
+ SetPushPetAndMountWinState(true, true);
+ }
}
private void OnMoveTopPart(bool isMove)
{
- SetPushPetAndMountWinState(!isMove);
+ if(!isLogin)
+ {
+ SetPushPetAndMountWinState(!isMove);
+ }
}
private void windowAfterOpen(Window win)
@@ -1136,6 +1144,8 @@
private void windowAfterClose(Window win)
{
+ if (isLogin) return;
+
if(win is MainInterfaceWin)
{
SetPushPetAndMountWinState(true);
--
Gitblit v1.8.0