回退提交

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

@@ -107,6 +107,7 @@ namespace GFGGame
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
             _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
+            //_ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -391,6 +392,11 @@ namespace GFGGame
             ViewManager.Show<ActivityWanShiLiView>();
         }
 
+        private void  OnClickBtnTea()
+        {
+            ViewManager.Show<ActivityTeaMainView>();
+        }
+
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -407,8 +413,7 @@ namespace GFGGame
         }
         private void OnClickBtnBag()
         {
-            //ViewManager.Show<BagView>();
-            ViewManager.Show<ActivityTeaMainView>();
+            ViewManager.Show<BagView>();
         }
 
         private void OnClickBtnLeague()
@@ -652,10 +657,16 @@ 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();
         }
 
         private void UpdateTime()
         {
+            //if (_ui.m_btnTea.target.visible)
+            //{
+            //    long time = ActivityTeaDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
+            //    _ui.m_btnTea.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            //}
             if (_ui.m_btnActivityDay7.target.visible)
             {
                 long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
@@ -1071,34 +1082,34 @@ namespace GFGGame
                     return;
                 }
             }
-            //月卡弹窗
-            if (GameGlobal.AutoMonthlyCardView)
-            {
-                GameGlobal.AutoMonthlyCardView = false;
-                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
-                {
-                    long endTime1 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
-                    long endTime2 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
-                    if (endTime1 < TimeHelper.ServerNow())
-                    {
-                        if (endTime2 < TimeHelper.ServerNow())
-                        {
-                            ViewManager.Show<MonthlyCardTipsView>();
-                        }
-                    }
-                    return; 
-                }
-            }
-            //活动公告弹窗
-            if (GameGlobal.AutoAcitivtyTipsLoginView)
-            {
-                GameGlobal.AutoAcitivtyTipsLoginView = false;
-                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
-                {
-                    ViewManager.Show<ActivityMainTipsView>();
-                    return;
-                }
-            }
+            ////月卡弹窗
+            //if (GameGlobal.AutoMonthlyCardView)
+            //{
+            //    GameGlobal.AutoMonthlyCardView = false;
+            //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            //    {
+            //        long endTime1 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
+            //        long endTime2 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
+            //        if (endTime1 < TimeHelper.ServerNow())
+            //        {
+            //            if (endTime2 < TimeHelper.ServerNow())
+            //            {
+            //                ViewManager.Show<MonthlyCardTipsView>();
+            //            }
+            //        }
+            //        return; 
+            //    }
+            //}
+            ////活动公告弹窗
+            //if (GameGlobal.AutoAcitivtyTipsLoginView)
+            //{
+            //    GameGlobal.AutoAcitivtyTipsLoginView = false;
+            //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
+            //    {
+            //        ViewManager.Show<ActivityMainTipsView>();
+            //        return;
+            //    }
+            //}
             if (GameGlobal.AutoSpecialOfferGiftBoxView)
             {
                 //List<int> shopListId = new List<int>() { 40012, 40013 };