From 252d46b8642ad4ecebe1a8b9d3a0678913413ebf Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 14 十一月 2018 15:30:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingTip.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 025d2d5..89dd126 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -427,13 +427,15 @@
private void RefreshStoreEffect()
{
storeDesBtn.gameObject.SetActive(false);
- int limitLv = int.Parse(Config.Instance.Get<FuncConfigConfig>("MallPush").Numerical1);
if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store)
- || PlayerDatas.Instance.baseData.LV < limitLv)
+ || PlayerDatas.Instance.baseData.LV < storeModel.storeTrailerLv
+ || !storeModel.IsNewDay(storeModel.StoreEffectRecord_Key))
return;
- List<StoreConfig> shoplist = ModelCenter.Instance.GetModel<StoreModel>().shoplist;
- if (shoplist.Count > 0 && !m_StoreEffect.IsPlaying)
+ var storeDatas = storeModel.TryGetStoreDatas((int)StoreFunc.WeekStore);
+ if (storeDatas != null
+ && storeDatas.Count > 0
+ && !m_StoreEffect.IsPlaying)
{
if (isNeedTip)
{
@@ -447,7 +449,7 @@
}
m_StoreEffect.Play();
}
- else if (shoplist.Count <= 0 && m_StoreEffect.IsPlaying)
+ else
{
m_StoreEffect.StopImediatly();
}
--
Gitblit v1.8.0