开服活动剧情提示修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_StoryItem.cs

@@ -9,6 +9,7 @@ namespace UI.OpenServerActivity
         public GComponent target;
         public Controller m_storyImageType;
         public Controller m_posType;
+        public Controller m_openCloseType;
         public GLoader m_loaItemBg;
         public UI_item m_rewardItem;
         public GTextField m_txtTitle;
@@ -65,6 +66,7 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = comp.GetController("storyImageType");
             m_posType = comp.GetController("posType");
+            m_openCloseType = comp.GetController("openCloseType");
             m_loaItemBg = (GLoader)comp.GetChild("loaItemBg");
             m_rewardItem = (UI_item)UI_item.Create(comp.GetChild("rewardItem"));
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -77,6 +79,7 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = null;
             m_posType = null;
+            m_openCloseType = null;
             m_loaItemBg = null;
             m_rewardItem.Dispose();
             m_rewardItem = null;

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -126,10 +126,16 @@ namespace GFGGame
             }
             RedDotController.Instance.SetComRedDot(item.target, redVisible, "", posRedX, posRedY);
 
-            if (activityStoryCfg.needItemsArr.Length > 0) { 
-                item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]], activityStoryCfg.needItemsArr[0][1]);
-                ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
-                item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
+            if (activityStoryCfg.needItemsArr.Length > 0) {
+                if (ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]] < activityStoryCfg.needItemsArr[0][1])
+                {
+                    item.m_openCloseType.selectedIndex = 0;
+                    item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]], activityStoryCfg.needItemsArr[0][1]);
+                    ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
+                    item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
+                }
+                else
+                    item.m_openCloseType.selectedIndex = 1;
             }
 
             if (item.m_loaItemBg.data == null)