From 79457ed9f96d8b2b1e097a8e8940d09bb20385aa Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 19 四月 2019 09:44:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/StoreModel.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/System/Store/StoreModel.cs b/System/Store/StoreModel.cs
index 9417179..fe39087 100644
--- a/System/Store/StoreModel.cs
+++ b/System/Store/StoreModel.cs
@@ -64,7 +64,8 @@
showCoinsUIDict = ConfigParse.GetDic<int, int>(mallCurrency.Numerical1);
FuncConfigConfig mallPush = FuncConfigConfig.Get("MallPush");
storeTrailerLv = int.Parse(mallPush.Numerical1);
- MainInterfaceWin.IsCopyOfThePanel += OnMoveTopPart;
+
+ MainPositionTween.switchFunctionStateEvent += OnMoveTopPart;
}
public void OnBeforePlayerDataInitialize()
@@ -128,7 +129,7 @@
public override void UnInit()
{
- MainInterfaceWin.IsCopyOfThePanel -= OnMoveTopPart;
+ MainPositionTween.switchFunctionStateEvent -= OnMoveTopPart;
}
public void RefreshMysteryShop()
@@ -1588,11 +1589,11 @@
}
}
- private void OnMoveTopPart(bool isMove)
+ private void OnMoveTopPart(bool immedidately)
{
if (!isLogin)
{
- SetPushPetAndMountWinState(!isMove);
+ SetPushPetAndMountWinState(!MainPositionTween.isDefaultState);
}
}
@@ -1657,7 +1658,7 @@
|| NewBieCenter.Instance.inGuiding
|| WindowCenter.Instance.IsOpen<FirstTimeRechargeWin>()
|| currentPushId == 0
- || !ModelCenter.Instance.GetModel<PlayerMainDate>().MainTopPanelShow)
+ || MainPositionTween.rightTopState != MainPositionTween.RightTopState.Function)
{
isShow = false;
}
--
Gitblit v1.8.0