From 1c36e698ce2ca2344cbc440b6bf5f598c70339ce Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 08 十一月 2018 21:18:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/FeatureNotice2Win.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/System/MainInterfacePanel/FeatureNotice2Win.cs b/System/MainInterfacePanel/FeatureNotice2Win.cs
index 8873500..77b2bd1 100644
--- a/System/MainInterfacePanel/FeatureNotice2Win.cs
+++ b/System/MainInterfacePanel/FeatureNotice2Win.cs
@@ -104,7 +104,8 @@
             Transform Tran = cell.transform;
             GameObject Tran1 = Tran.Find("FeaturesTypeOne").gameObject;
             GameObject Tran2 = Tran.Find("FeaturesTypeTwo").gameObject;
-            if (funcId == featureNoticeModel.FunctionForecastIndex)
+            var configs = Config.Instance.Get<FunctionForecastConfig>(funcId);
+            if (configs.OpenNumber == featureNoticeModel.FunctionForecastIndex)
             {
                
                 Tran1.SetActive(false);
@@ -141,7 +142,7 @@
                 int openTag = config.FuncId;
                 if (!FuncOpen.Instance.IsFuncOpen(openTag))
                 {
-                    featureNoticeModel.FunctionForecastIndex = config.FuncId;
+                    featureNoticeModel.FunctionForecastIndex = config.OpenNumber;
                     return;
                 }
             }
@@ -161,7 +162,7 @@
             }
             Index = featureNoticeModel.FunctionList.FindIndex((x) =>
             {
-                return x.FuncId == featureNoticeModel.FunctionForecastIndex;
+                return x.OpenNumber == featureNoticeModel.FunctionForecastIndex;
             });
             if (Index == -1)
             {

--
Gitblit v1.8.0