阳春花蔓活动结束临界时间增加阻止判断

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -96,14 +96,31 @@ namespace GFGGame
 
         private void OnBtnTaskClick()
         {
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            if (_activityId <= 0) {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                return;
+            }
             ViewManager.Show<ActivityThemeLuckyBoxTaskView>();
         }
         private void OnBtnChapterClick()
         {
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            if (_activityId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                return;
+            }
             ViewManager.Show<StudioActivityView>();
         }
         private void OnBtnLuckyBoxClick()
         {
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            if (_activityId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                return;
+            }
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
@@ -112,6 +129,12 @@ namespace GFGGame
 
         private void OnBtnShopClick()
         {
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            if (_activityId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                return;
+            }
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using ET;
+using System.Runtime.InteropServices;
 
 namespace GFGGame
 {
@@ -362,6 +363,12 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
+            var activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
+            if (activityId <= 0)
+            {
+                ViewManager.DeleteViewStackCountDown("MainUIView");
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+            }
             Hide();
         }
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs

@@ -157,7 +157,9 @@ namespace GFGGame
         private void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
             //StudioDataManager.Instance.SetLuckyBoxActivityID(MainStoryDataManager.currentChapterCfgId);
-            ViewManager.Show<StudioActivityView>();
+            //ViewManager.Show<StudioActivityView>();
+            UpdateView();
+            UpdateItem();
         }
 
         private void UpdateView()
@@ -196,6 +198,12 @@ namespace GFGGame
 
         protected void OnBtnBackClick()
         {
+            var activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            if (activityId <= 0)
+            {
+                ViewManager.DeleteViewStackCountDown("MainUIView");
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+            }
             Hide();
         }