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

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -45,7 +45,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
 
         protected override void OnShown()
@@ -69,7 +69,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
         private void OnBtnBackClick()
         {
@@ -77,9 +77,8 @@ namespace GFGGame
         }
         private void UpdateTime(object param)
         {
-            ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
             long curTime = TimeHelper.ServerNow();
-            long endTime = activityInfo.EndTime;
+            long endTime = _activityInfo.EndTime;
             _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
         }
 
@@ -101,7 +100,7 @@ namespace GFGGame
 
             UI_ListChargeItem item = UI_ListChargeItem.Proxy(obj);
 
-            int limitChargeExp = GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+            long limitChargeExp = _activityInfo.CountValue;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
             item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
@@ -148,7 +147,7 @@ namespace GFGGame
         {
             rechargeCfgs.Sort((ActivityRechargeCfg a, ActivityRechargeCfg b) =>
             {
-                int limitChargeExp = GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                long limitChargeExp = _activityInfo.CountValue;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
                 int stateA = _activityInfo.GetRewards.IndexOf(a.id);
                 int stateB = _activityInfo.GetRewards.IndexOf(b.id);