From 93831474091472c3531e078f3d023e30bcf41e2d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 13 十一月 2018 21:07:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/FunctionForecastTip.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/System/MainInterfacePanel/FunctionForecastTip.cs b/System/MainInterfacePanel/FunctionForecastTip.cs
index 842b5ea..64acb3e 100644
--- a/System/MainInterfacePanel/FunctionForecastTip.cs
+++ b/System/MainInterfacePanel/FunctionForecastTip.cs
@@ -87,7 +87,16 @@
                     return;
                 }
             }
-            if (featureNoticeModel.redPointStre1.state == RedPointState.Simple)//棰勫憡瀹屾瘯杩樻湁濂栧姳鑳介鍙�
+            bool IsOpen = false;
+            foreach (var _key in featureNoticeModel.DicOpenFuncState.Keys)
+            {
+                if (featureNoticeModel.DicRedPoint.ContainsKey(_key) && featureNoticeModel.DicOpenFuncState[_key].State == 1
+                && featureNoticeModel.DicOpenFuncState[_key].AwardState == 0 && featureNoticeModel.DicAwardItem.ContainsKey(_key))
+                {
+                    IsOpen = true;
+                }
+            }
+            if (IsOpen)//棰勫憡瀹屾瘯杩樻湁濂栧姳鑳介鍙�
             {
                 _FunctionForecastPanel.gameObject.SetActive(true);
                 _FunctionIcon.SetSprite("PersonBossIcon");

--
Gitblit v1.8.0