限时累充修改图标，屏蔽成长基金

GameClient/Assets/Game/HotUpdate/Data/ActivityTeaDataManager.cs

@@ -44,7 +44,18 @@ namespace Assets.Game.HotUpdate.Data
             int times = limitData.TotalPlayMax - limitData.PlayTimes;
             if(times > 0)
             {
-                return true;
+                //当有关卡没通过时
+                for (int i = 0; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
+                {
+                    if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 3)
+                    {
+                        if (!MiniGameDateManager.Instance.gameinfoList[i].IsCleared)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs

@@ -73,12 +73,31 @@ namespace GFGGame
             }
             EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
             npcId = (int)this.viewData;
-            var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr);
-            if(taskCfgs.Count == 0)
+            if (!TaskDataManager.Instance.TaskInfosDic.TryGetValue(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr[0], out TaskInfo item))
             {
                 TaskSProxy.GetTaskInfos();
-                taskCfgs = TaskDataManager.Instance.GetTaskCfgs(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr);
+                if (!isShowing)
+                {
+                    return;
+                }
+                Timers.inst.Add(1.0f, 1, UpdateView);
+            }
+            else
+            {
+                UpdateView();
             }
+        }
+
+        protected override void OnHide()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
+            base.OnHide();
+            Timers.inst.Remove(UpdateView);
+        }
+
+        private void UpdateView(object param = null)
+        {
+            var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr);
             _ui.m_taskList.data = taskCfgs;
             _ui.m_npcIcon.url = ResPathUtil.GetNpcPicSPath(ActivityVisitCfgArray.Instance.dataArray[npcId].picRes);
             _ui.m_loaBg.url = ResPathUtil.GetSceneBgPath(ActivityVisitCfgArray.Instance.dataArray[npcId].bgRes);
@@ -104,13 +123,6 @@ namespace GFGGame
             SetTypeWriting();
         }
 
-        protected override void OnHide()
-        {
-            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
-            base.OnHide();
-        }
-
-
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(ActivityVisitNpcView).FullName);

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_list.itemRenderer = ListItemRenderer;
-            _ui.m_btnBuy.target.onClick.Add(OnBtnBuyClick);
+            //_ui.m_btnBuy.target.onClick.Add(OnBtnBuyClick);
 
         }
         protected override void AddEventListener()
@@ -154,9 +154,9 @@ namespace GFGGame
             ItemUtil.CreateItemView(GrowthFundCfgArray.Instance.dataArray[index].bonusArr[0], item.m_reward as GComponent);
             if (item.m_rewardBtn.target.data == null)
             {
-                item.m_rewardBtn.target.onClick.Add(OnBtnGetClick);
+                //item.m_rewardBtn.target.onClick.Add(OnBtnGetClick);
             }
-            item.m_rewardBtn.target.data = index + 1;
+            //item.m_rewardBtn.target.data = index + 1;
             UI_GrowthFundItemUI.ProxyEnd();
 
         }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -187,12 +187,11 @@ namespace GFGGame
                 //成长基金单独处理
                 if (_storeTabCfgs[index][0] == "成长基金")
                 {
-                    ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(3002);
-                    if(RoleDataManager.lvl < activityCfg.level)
-                    {
+                    //ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(3002);
+                    //if(RoleDataManager.lvl < activityCfg.level)
+                    //{
                         item.visible = false;
-                        return;
-                    }
+                    //}
                 }
                 item.title = _storeTabCfgs[index][0];
                 menu2 = int.Parse(_storeTabCfgs[index][1]);