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

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

@@ -244,13 +244,6 @@ namespace GFGGame
         public List<int> ActivityZCJBList = new List<int>();
         public bool CheckZCJBRed()
         {
-            foreach(int i in ActivityDataManager.Instance.ActivityZCJBList)
-            {
-                if(i == 1)
-                {
-                    return true;
-                }
-            }
             ItemData numItem;
             long num;
             if(BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))

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

@@ -30,6 +30,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_backBtn.onClick.Add(this.Hide);
+            _ui.m_back.onClick.Add(this.Hide);
             _ui.m_List.itemRenderer = RenderRewardList;
         }
         protected override void OnShown()
@@ -77,6 +78,11 @@ namespace GFGGame
                     item.m_RewardBtn.m_c1.selectedIndex = 1;
                     RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, true);
                 }
+                else
+                {
+                    item.m_RewardBtn.m_c1.selectedIndex = 3;
+                    RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, false);
+                }
             }
             //
             item.m_rewardName.text = "消耗" + costItem.name + "*"+ ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][1] + "兑换";

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

@@ -29,6 +29,7 @@ namespace GFGGame
             _ui.m_viewBtn.onClick.Add(OnBtnAdJump);
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
+            _ui.m_btnChange.onClick.Add(this.Hide);
         }
         protected override void OnShown()
         {

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

@@ -180,11 +180,15 @@ namespace GFGGame
                 UpGiftBox(comBox);
             }
             else if (boxId == LuckyBoxDataManager.BOX_ID_2) { 
-                long endTime = TimeUtil.DateTimeToTimestamp("[2024][1][28][05:00]");
+                long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
                 if (endTime < TimeHelper.ServerNow())
                     comBox.m_showActivityType.selectedIndex = 0;
-                else
+                else { 
                     comBox.m_showActivityType.selectedIndex = 2;
+                    long curTime = TimeHelper.ServerNow();
+                    if (endTime >= curTime)
+                        comBox.m_txtHasTime.text = "剩余时间: " + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+                }
             }
             else
                 comBox.m_showActivityType.selectedIndex = 0;
@@ -448,7 +452,7 @@ namespace GFGGame
             GObject textField = item.asCom.GetChild("txtHasTime");
             if (textField == null) return;
             long curTime = TimeHelper.ServerNow();
-            long endTime = TimeUtil.DateTimeToTimestamp("[2024][1][28][05:00]");
+            long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
             if (endTime < curTime)
             {
                 Timers.inst.Remove(UpdateImitateTime);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -210,6 +210,7 @@ namespace GFGGame
             //招财进宝活动
             if(levelCfg.subType == 1 && levelCfg.type == 6)
             {
+                _ui.m_ctrlNeed.selectedIndex = 0;
                 EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
                 _ui.m_comCostCurrent.visible = true;
                 _ui.m_btnBg.url = "ui://Main/zcjb_zdgktc";
@@ -326,6 +327,11 @@ namespace GFGGame
                 addition = addition / 10000 * 100;
                 _ui.m_txtAddition.text = string.Format("{0}%加成", addition);
             }
+            //招财进宝活动
+            if (levelCfg.subType == 1 && levelCfg.type == 6)
+            {
+                _ui.m_ctrlNeed.selectedIndex = 0;
+            }
         }
 
         private void RenderListTagItem(int index, GObject obj)

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

@@ -963,8 +963,11 @@ namespace GFGGame
 
         private void CheckProbabilityUp()
         {
-            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
-            if (activityId > 0)
+            long curTime = TimeHelper.ServerNow();
+            long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
+            //int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
+            //if (activityId > 0)
+            if (endTime >= curTime)
                 _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
             else
                 _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;