Merge remote-tracking branch 'remotes/origin/master' into douYou

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

@@ -49,6 +49,7 @@ namespace GFGGame
             base.OnShown();
             ReqInfo();
             //_ui.m_time.visible = false;
+            _ui.m_rewardBTn.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
         }