|
@@ -83,7 +83,7 @@ namespace GFGGame
|
|
_activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
|
|
_activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
|
|
_luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
|
|
_luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
|
|
_valueBarController.OnShown();
|
|
_valueBarController.OnShown();
|
|
- _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
|
|
|
|
|
|
+ _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID, ConstItemID.DIAMOND_RED, ConstItemID.DIAMOND_PURPLE });
|
|
_luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
|
|
_luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
|
|
LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
|
|
LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
|
|
LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
|
|
LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
|
|
@@ -92,6 +92,10 @@ namespace GFGGame
|
|
UpdateListItemData();
|
|
UpdateListItemData();
|
|
UpdateRedDot();
|
|
UpdateRedDot();
|
|
_ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
|
|
_ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
|
|
|
|
+ if(_activityType == ConstLimitTimeActivityType.ActLimitStlyc)
|
|
|
|
+ _ui.m_comBox.m_c1.selectedIndex = 2;
|
|
|
|
+ else
|
|
|
|
+ _ui.m_comBox.m_c1.selectedIndex = 1;
|
|
|
|
|
|
int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
|
|
int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
|
|
ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
|
|
ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
|
|
@@ -110,7 +114,7 @@ namespace GFGGame
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
|
|
TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
|
|
- _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
|
|
|
|
|
|
+ _ui.m_txtTime.text = "剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
|
|
|
|
|
|
//=====限时礼包倒计时
|
|
//=====限时礼包倒计时
|
|
UpGiftBox();
|
|
UpGiftBox();
|