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

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 using FairyGUI;
 using UI.CommonGame;
 using UnityEngine;
@@ -188,6 +189,18 @@ namespace GFGGame
             string functionId = infos[0];
             GameFunctionCfg gameFunctionCfg = GameFunctionCfgArray.Instance.GetCfg(functionId);
 
+            if (gameFunctionCfg.activityIdArr.Length > 0)
+            {
+                ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(gameFunctionCfg.activityIdArr[0]);
+                long openTime = TimeUtil.DateTimeToTimestamp(_activityCfg.openTime);
+                long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+                long curTime = TimeHelper.ServerNow();
+                if (openTime > curTime || curTime > endTime) { 
+                    PromptController.Instance.ShowFloatTextPrompt("活动已过期");
+                    return;
+                }
+            }
+
             long hasNum = ItemDataManager.GetItemNum(_itemId);
             long needCount = 0;
             bool isJump = true;
@@ -405,6 +418,7 @@ namespace GFGGame
                     ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
                     break;
                 case ConstFunctionId.ACTIVITY_GET_YUAN_XIAO_TASK:
+                    ViewManager.Show<ActivityGetYuanXiaoEntryView>();
                     ViewManager.Show($"GFGGame.{gameFunctionCfg.functionId}");
                     break;
                 case ConstFunctionId.ACTIVITY_GET_YUAN_XIAO: