活动修改

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

@@ -283,9 +283,16 @@ namespace GFGGame
         public int activityZCJBId = 61101;
         public bool CheckZCJBRed()
         {
+            List<ActivityDressCfg> zcjbCfgList = new List<ActivityDressCfg>();
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
+            if (zcjbCfgList == null || zcjbCfgList.Count == 0)
+            {
+                return false;
+            }
             ItemData numItem;
             long num;
-            if(BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
+            if(BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -294,11 +301,11 @@ namespace GFGGame
                 num = 0;
             }
 
-            for (int i = 0; i < ActivityDressCfgArray.Instance.dataArray.Length - 1; i++)
+            for (int i = 0; i < zcjbCfgList.Count; i++)
             {
                     if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
                     {
-                        if (num >= ActivityDressCfgArray.Instance.dataArray[i].comsumeArr[0][1])
+                        if (num >= zcjbCfgList[i].comsumeArr[0][1])
                         {
                             return true;
                         }
@@ -391,15 +398,19 @@ namespace GFGGame
         }
         public bool isExtendTime(int day)
         {
-            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
-            long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
-            long ExtendTime = (day * 24 * 60 * 60 * 1000);
-            long currentTime = TimeHelper.ServerNow();
-            if(currentTime > endTime)
+            int id = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
+            if (activityCfg != null)
             {
-                if((currentTime - endTime) <= ExtendTime)
+                long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
+                long ExtendTime = (day * 24 * 60 * 60 * 1000);
+                long currentTime = TimeHelper.ServerNow();
+                if (currentTime > endTime)
                 {
-                    return true;
+                    if ((currentTime - endTime) <= ExtendTime)
+                    {
+                        return true;
+                    }
                 }
             }
             return false;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -140,7 +140,7 @@ namespace GFGGame
             UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
             valueBar.m_c1.selectedIndex = 12;
             UI_ComponentValueBar.ProxyEnd();
-            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityID)[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
             _ui.m_selectChapter.visible = false;
             _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -125,7 +125,7 @@ namespace GFGGame
             UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(_ui.m_List.GetChildAt(itemCfg - 1));
             if (item.m_RewardBtn.m_c1.selectedIndex == 1)
             {
-                bool result = await ActivitySProxy.ReqActivityZCJBReward(ActivityDataManager.Instance.GetCurOpenActiveByType(17), itemCfg);
+                bool result = await ActivitySProxy.ReqActivityZCJBReward(ActivityDataManager.Instance.GetCurOpenActiveByType(17), zcjbCfgList[itemCfg - 1].id);
                 if (!result) return;
                 GetSuitItemController.TryShow(0);
                 EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);