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

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

@@ -280,7 +280,7 @@ namespace GFGGame
 
         //招财进宝活动
         public List<int> ActivityZCJBList = new List<int>();
-        public int activityZCJBId = 61001;
+        public int activityZCJBId = 61101;
         public bool CheckZCJBRed()
         {
             ItemData numItem;

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

@@ -50,7 +50,7 @@ namespace GFGGame
             ReqInfo();
             //_ui.m_time.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
+            
         }
         protected override void OnHide()
         {
@@ -59,12 +59,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, SetRed);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, SetRed);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, SetRed);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, SetRed);
         }
         private void SetRed()