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

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

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

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

@@ -143,7 +143,7 @@ namespace GFGGame
 
         public void OnFinishZCJBStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
-            ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
+            ViewManager.Show<ActivityZCJBChapterView>(new object[] { ActivityDataManager.Instance.activityZCJBId, 2 });
         }
         public void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
         {

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -247,6 +247,7 @@ namespace GFGGame
         //招财进宝活动
         public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
         {
+            ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(5006).paramsArr[0];
             S2C_GetDressRewrdStatusList response = null;
             response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = id });
             if (response != null)

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

@@ -59,12 +59,13 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.RemoveEventListener(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()
         {
@@ -77,7 +78,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动已到期！");
                 return;
             }
-            ActivityFightCfg chapterCfgs = ActivityFightCfgArray.Instance.GetCfg(61001);
+            ActivityFightCfg chapterCfgs = ActivityFightCfgArray.Instance.GetCfg(ActivityDataManager.Instance.activityZCJBId);
             ViewManager.Show<ActivityZCJBChapterView>(new object[] { chapterCfgs.id, 2 });
         }
         private void OnClickShowReward()

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

@@ -377,8 +377,8 @@ namespace GFGGame
             }
             else
             {
-                limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(61001).limit);
-                limitID = ActivityFightCfgArray.Instance.GetCfg(61001).limit;
+                limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(ActivityDataManager.Instance.activityZCJBId).limit);
+                limitID = ActivityFightCfgArray.Instance.GetCfg(ActivityDataManager.Instance.activityZCJBId).limit;
             }
             int time = limitData.TotalPlayMax - limitData.PlayTimes;
             com.m_limitNum.text = string.Format("今日免费次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);