活动判断时间方式修改

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

@@ -14,38 +14,14 @@ namespace Assets.Game.HotUpdate.Data
         /**********************************************************新春活动*************************************************/
         public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
 
-        public bool CheckOpen()
+        public bool GetRewardRed()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
-
-        public bool CheckOpenOne(int id)
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
-
-        public long GetEndTime(int id)
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo.EndTime;
-        }
-
-        public bool GetRewardRed(int id =5004)
-        {
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
-            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
-            long startime = TimeUtil.DateTimeToTimestamp(_activityCfg.openTime);
-            long curTime = TimeHelper.ServerNow();
-            if (endTime < curTime || startime > curTime)
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
                 return false;
             }
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
-           int time = limitData.TotalPlayMax - limitData.PlayTimes;
+            int time = limitData.TotalPlayMax - limitData.PlayTimes;
 
             foreach (NpcVisitProto t in NpcInfoList)
             {
@@ -57,20 +33,16 @@ namespace Assets.Game.HotUpdate.Data
             return false;
         }
         //获取华容道可用次数
-        public bool CheckHRDRed(int id = 5003)
+        public bool CheckHRDRed()
         {
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
-            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
-            long curTime = TimeHelper.ServerNow();
-            if (endTime < curTime)
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
             {
                 return false;
             }
-
             RoleLimitData limitData;
             limitData = RoleLimitDataManager.GetLimitData(300);
             int times = limitData.TotalPlayMax - limitData.PlayTimes;
-            if(times > 0 && ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            if(times > 0)
             {
                 return true;
             }
@@ -83,7 +55,7 @@ namespace Assets.Game.HotUpdate.Data
         //合成红点
         public bool GetActivitySyntheticRed()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ItemSynthetic) == 0)
             {
                 return false;
             }

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

@@ -17,7 +17,7 @@ namespace GFGGame
     {
         public static async ETTask<bool> ReqGetNPCVisitInfo(int id = 5004)
         {
-            if(!ActivityTeaDataManager.Instance.CheckOpen())
+            if(ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.TEA) == 0)
             {
                 return false;
             }

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

@@ -76,7 +76,7 @@ namespace GFGGame
 
         private void OnClickBtnHuaRongDaoView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
@@ -88,7 +88,7 @@ namespace GFGGame
 
         private async void OnClickBtnVisitView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
@@ -103,7 +103,7 @@ namespace GFGGame
 
         private void OnClickBtnMergeView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ItemSynthetic) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -647,8 +647,8 @@ namespace GFGGame
 
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
-            _ui.m_btnTea.target.visible = ActivityTeaDataManager.Instance.CheckOpen();
-            _ui.m_btnActivityZCJB.target.visible = ActivityTeaDataManager.Instance.CheckOpenOne(17);
+            _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
+            _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
         }
 
         private void UpdateTime()