Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/ServerProxy/TaskSProxy.cs

@@ -41,7 +41,7 @@ namespace ET
             var changeIds = new List<int>();
             message.TaskList.ForEach(proto =>
             {
-                var taskInfo = new TaskInfo { ID = proto.Id, State = proto.Status, Progress = proto.Progress };
+                var taskInfo = new TaskInfo { ID = proto.Id, State = proto.Status, Progress = proto.Progress, FuncType = proto.FuncType };
                 TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
                 changeIds.Add(taskInfo.ID);
             });

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

@@ -115,7 +115,6 @@ namespace GFGGame
         private void RefreshTimeText()
         {
             int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
-            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
             if (actLimitId <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
@@ -123,6 +122,7 @@ namespace GFGGame
                 OnClickBtnBack();
                 return;
             }
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
             string[] str = strTime.Split(':');
@@ -139,40 +139,51 @@ namespace GFGGame
         private void OnClickBtnHeaven()
         {
             //小游戏入口
-            ViewManager.Show<GameStartView>();
+            if (JudgeActivityExpire())
+                ViewManager.Show<GameStartView>();
         }
 
         private void OnClickBtnMingTong()
         {
             //副本入口
-            ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (JudgeActivityExpire())
+                ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnAnswerTianmen()
         {
             //剧情入口
-            ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (JudgeActivityExpire())
+                ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnTenShu()
         {
-            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
-            if (actLimitId <= 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动未开启");
-                return;
-            }
-            ViewManager.Show<LuckyBoxActivityView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (JudgeActivityExpire())
+                ViewManager.Show<LuckyBoxActivityView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnNineZhouPool() 
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            if(JudgeActivityExpire())
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
 
         private void OnClickButtonNewYearLogin()
         {
             ViewManager.Show<NewYearLoginView>();
         }
+
+        //判断神都宸游活动是否过期
+        private bool JudgeActivityExpire()
+        {
+            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (actLimitId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                return false;
+            }
+            return true;
+        }
     }
 }