主界面提交回退

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

@@ -426,8 +426,7 @@ namespace GFGGame
 
         private void OnClickBtnHaoYou()
         {
-            //ViewManager.Show<FriendView>(null, true);
-            ViewManager.Show<MergeGameView>();
+            ViewManager.Show<FriendView>(null, true);
         }
 
         private void OnClickBtnGongGao()
@@ -1077,34 +1076,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 };