|
@@ -175,7 +175,7 @@ namespace GFGGame
|
|
|
{
|
|
|
comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
|
|
|
comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = true;
|
|
|
- string strFreeTime = TimeUtil.FormattingTimeTo_HHmmss(timeDifference);
|
|
|
+ string strFreeTime = TimeUtil.FormattingTimeTo_DDHHmm(timeDifference);
|
|
|
comBox.m_comLuckBoxBtn.m_txtFreeTime.text = string.Format("{0}后免费", strFreeTime);
|
|
|
}
|
|
|
else
|
|
@@ -486,7 +486,9 @@ namespace GFGGame
|
|
|
if (textField == null) return;
|
|
|
int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
|
|
|
var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
|
|
|
- long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
|
|
|
+ long endTime = 0;
|
|
|
+ if(activityCfg != null)
|
|
|
+ endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
|
|
|
long curTime = TimeHelper.ServerNow();
|
|
|
if (endTime < curTime)
|
|
|
{
|