|  | @@ -68,9 +68,9 @@ namespace GFGGame
 | 
											
												
													
														|  |              || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 |  |              || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
 |  |              _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
 | 
											
												
													
														|  | 
 |  | +            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
 | 
											
												
													
														|  |              if (ActivityDataManager.Instance.actLimitChargeId > 0)
 |  |              if (ActivityDataManager.Instance.actLimitChargeId > 0)
 | 
											
												
													
														|  |              {
 |  |              {
 | 
											
												
													
														|  | -                ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
 |  | 
 | 
											
												
													
														|  |                  _ui.m_comList.m_btnLimitChargeAddUp.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
 |  |                  _ui.m_comList.m_btnLimitChargeAddUp.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
 | 
											
												
													
														|  |                  _ui.m_comList.m_btnLimitChargeAddUp.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
 |  |                  _ui.m_comList.m_btnLimitChargeAddUp.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
										
											
												
													
														|  | @@ -95,9 +95,9 @@ namespace GFGGame
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  |              if (ActivityDataManager.Instance.actLimitChargeId > 0)
 |  |              if (ActivityDataManager.Instance.actLimitChargeId > 0)
 | 
											
												
													
														|  |              {
 |  |              {
 | 
											
												
													
														|  | -                ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
 |  | 
 | 
											
												
													
														|  | 
 |  | +                ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
 | 
											
												
													
														|  |                  long curTime = TimeHelper.ServerNow();
 |  |                  long curTime = TimeHelper.ServerNow();
 | 
											
												
													
														|  | -                long endTime = TimeUtil.DateTimeToTimestamp(openCfg.endTime);
 |  | 
 | 
											
												
													
														|  | 
 |  | +                long endTime = activityInfo.endTime;
 | 
											
												
													
														|  |                  if (curTime < endTime)
 |  |                  if (curTime < endTime)
 | 
											
												
													
														|  |                  {
 |  |                  {
 | 
											
												
													
														|  |                      _ui.m_comList.m_btnLimitChargeAddUp.m_txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
 |  |                      _ui.m_comList.m_btnLimitChargeAddUp.m_txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
 |