From ae24f8b1fdd1abf18e3575ddb7004706d852f22e Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 13 九月 2018 21:35:06 +0800
Subject: [PATCH] 3488 【前端】【1.0.15】【1.1.0】功能预告优化
---
System/MainInterfacePanel/FeatureNoticeModel.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeModel.cs b/System/MainInterfacePanel/FeatureNoticeModel.cs
index 5131313..acd196f 100644
--- a/System/MainInterfacePanel/FeatureNoticeModel.cs
+++ b/System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -26,7 +26,7 @@
public void OnBeforePlayerDataInitialize()
{
-
+
}
public void OnPlayerLoginOk()
@@ -42,11 +42,11 @@
treasureModel.treasureStageUpEvent += treasureStageUpEvent;
}
-
+
public override void UnInit()
{
-
+
}
private void treasureStageUpEvent(int obj)
{
@@ -147,7 +147,7 @@
{
return;
}
- if (PlayerDatas.Instance.baseData.LV>= functionForecastConfig.RedPointLV)
+ if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)
{
RedPointChange = true;
IsRedPoint = true;
@@ -164,10 +164,10 @@
}
}
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
- private void MagicWeapon(int fabaoID,int funcID)
+ private void MagicWeapon(int fabaoID, int funcID)
{
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcID);
- if (functionForecastConfig.RedPointLV >0)//鏍规嵁濉殑绛夌骇鏉�
+ if (functionForecastConfig.RedPointLV > 0)//鏍规嵁濉殑绛夌骇鏉�
{
if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)
{
@@ -202,7 +202,7 @@
}
if (treasure.stage == funcStage - 1 || funcStage == 0)
{
- float exp = ((float)treasure.exp / treasure.treasureStages[funcStage].exp)*100;
+ float exp = ((float)treasure.exp / treasure.treasureStages[funcStage].exp) * 100;
if (functionForecastConfig.RedPointPercentage > -1)
{
if (exp >= functionForecastConfig.RedPointPercentage)
@@ -227,7 +227,9 @@
{
var inDungeon = IsDungeon();
var IsOpenMaininterface = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
- if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || inDungeon || !IsOpenMaininterface)
+ var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();
+ if (NewBieCenter.Instance.inGuiding || treasureModel.newGotShowing || inDungeon || !IsOpenMaininterface
+ || treasureModel.treasureStageUpShow || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
{
return;
}
--
Gitblit v1.8.0