From 079ecd71b24f5bf9aac653f18f76d4670bcd169e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 14 九月 2018 16:17:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FeatureNoticeModel.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeModel.cs b/System/MainInterfacePanel/FeatureNoticeModel.cs
index acd196f..e2d44ab 100644
--- a/System/MainInterfacePanel/FeatureNoticeModel.cs
+++ b/System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -99,6 +99,7 @@
}
if (OpenFuncId != FunctionList[i].FuncId || !RedPointChange)
{
+ OpenFuncId = FunctionList[i].FuncId;
IsRedPoint = false;
TrailerClassification(FunctionList[i].FuncId);
}
@@ -223,15 +224,18 @@
}
}
- public void WhetherToPlayTheBox()
+ public IEnumerator WhetherToPlayTheBox()
{
+ yield return new WaitForSeconds(0.7f);
var inDungeon = IsDungeon();
var IsOpenMaininterface = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
+ var IsOpenOffLineOnHook = WindowCenter.Instance.CheckOpen<OffLineOnHookWin>();
var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();
if (NewBieCenter.Instance.inGuiding || treasureModel.newGotShowing || inDungeon || !IsOpenMaininterface
- || treasureModel.treasureStageUpShow || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
+ || treasureModel.treasureStageUpShow || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() ||
+ IsOpenOffLineOnHook)
{
- return;
+ yield break;
}
for (int i = 0; i < FunctionList.Count; i++)
{
@@ -240,15 +244,19 @@
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(FunctionList[i].FuncId);
if (functionForecastConfig.FrameLevel <= 0)
{
- return;
+ yield break;
}
- string strKey = "FeatureNotice" + functionForecastConfig.FrameLevel+PlayerDatas.Instance.baseData.PlayerID;
+ string strKey = "FeatureNotice" + functionForecastConfig.FrameLevel + PlayerDatas.Instance.baseData.PlayerID;
int type = LocalSave.GetInt(strKey);
bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.FrameLevel && type == 0)
{
LocalSave.SetInt(strKey, functionForecastConfig.FrameLevel);
- WindowCenter.Instance.Open<FeatureNoticeWin>();
+ var IsOpenFeatureNotice = WindowCenter.Instance.CheckOpen<FeatureNoticeWin>();
+ if (!IsOpenFeatureNotice)
+ {
+ WindowCenter.Instance.Open<FeatureNoticeWin>();
+ }
}
}
}
--
Gitblit v1.8.0