|
|
@@ -12,6 +12,7 @@ namespace GFGGame
|
|
|
{
|
|
|
private UI_DailyWelfareUI _ui;
|
|
|
private ValueBarController _valueBarController;
|
|
|
+ private List<ActivityInfo> _limitChargeInfo = new List<ActivityInfo>();
|
|
|
|
|
|
private int _signCount;
|
|
|
private int _month;
|
|
|
@@ -45,7 +46,8 @@ namespace GFGGame
|
|
|
|
|
|
_ui.m_btnback.onClick.Add(OnBtnBackClick);
|
|
|
// _ui.m_list.itemRenderer = ListItemRender;
|
|
|
- _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
|
|
|
+ // _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
|
|
|
+ _ui.m_comList.m_listLimitCharge.itemRenderer = RenderListLimitChargeItem;
|
|
|
_ui.m_comList.m_btnSevenDayLogin.target.onClick.Add(OnBtnSevenDayLoginClick);
|
|
|
_ui.m_comList.m_btnSign.target.onClick.Add(OnBtnSignClick);
|
|
|
_ui.m_comList.m_btnSupply.target.onClick.Add(OnBtnSupplyClick);
|
|
|
@@ -67,15 +69,11 @@ namespace GFGGame
|
|
|
_ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
|
|
|
|| (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
|
|
|
|
|
|
- _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
|
|
|
- ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
|
|
|
- if (ActivityDataManager.Instance.actLimitChargeId > 0)
|
|
|
- {
|
|
|
- _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;
|
|
|
- }
|
|
|
+ _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
|
|
|
+ _ui.m_comList.m_listLimitCharge.numItems = _limitChargeInfo.Count;
|
|
|
+ _ui.m_comList.m_listLimitCharge.ResizeToFit();
|
|
|
|
|
|
- if (ActivityDataManager.Instance.actLimitChargeId > 0)
|
|
|
+ if (_limitChargeInfo.Count > 0)
|
|
|
{
|
|
|
Timers.inst.Add(1, 0, UpdateTime);
|
|
|
}
|
|
|
@@ -97,22 +95,48 @@ namespace GFGGame
|
|
|
{
|
|
|
if (ActivityDataManager.Instance.actLimitChargeId > 0)
|
|
|
{
|
|
|
- ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
|
|
|
- long curTime = TimeHelper.ServerNow();
|
|
|
- long endTime = activityInfo.EndTime;
|
|
|
- if (curTime < endTime)
|
|
|
+ for (int i = 0; i < _limitChargeInfo.Count; i++)
|
|
|
{
|
|
|
- _ui.m_comList.m_btnLimitChargeAddUp.m_txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
|
|
|
+ ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_limitChargeInfo[i].ActivityId);
|
|
|
+ long curTime = TimeHelper.ServerNow();
|
|
|
+ long endTime = activityInfo.EndTime;
|
|
|
+ if (curTime < endTime)
|
|
|
+ {
|
|
|
+ GTextField txtTime = _ui.m_comList.m_listLimitCharge.GetChildAt(i).asCom.GetChild("txtTime").asTextField;
|
|
|
+ txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ private void RenderListLimitChargeItem(int index, GObject obj)
|
|
|
+ {
|
|
|
+
|
|
|
+ // _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
|
|
|
+ UI_Button1 item = UI_Button1.Proxy(obj);
|
|
|
+ ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_limitChargeInfo[index].ActivityId);
|
|
|
+ item.m_c1.selectedIndex = 1;
|
|
|
+ item.m_c2.selectedIndex = 0;
|
|
|
+ if (ActivityDataManager.Instance.actLimitChargeId > 0)
|
|
|
+ {
|
|
|
+ item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
|
|
|
+ item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
|
|
|
+ }
|
|
|
+ if (item.target.data == null)
|
|
|
+ {
|
|
|
+ item.target.onClick.Add(OnBtnLimitChargeAddUpClick);
|
|
|
+ }
|
|
|
+ item.target.data = _limitChargeInfo[index].ActivityId;
|
|
|
+ UI_Button1.ProxyEnd();
|
|
|
+ }
|
|
|
private void OnBtnBackClick()
|
|
|
{
|
|
|
ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
|
|
|
}
|
|
|
- private void OnBtnLimitChargeAddUpClick()
|
|
|
+ private void OnBtnLimitChargeAddUpClick(EventContext context)
|
|
|
{
|
|
|
- ViewManager.Show<LimitChargeView>(null, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
|
|
|
+ GObject gObject = context.sender as GObject;
|
|
|
+
|
|
|
+ ViewManager.Show<LimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
|
|
|
}
|
|
|
private void OnBtnSevenDayLoginClick()
|
|
|
{
|
|
|
@@ -128,7 +152,11 @@ namespace GFGGame
|
|
|
}
|
|
|
private void UpdateRedDot()
|
|
|
{
|
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnLimitChargeAddUp.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -40);
|
|
|
+ for (int i = 0; i < _limitChargeInfo.Count; i++)
|
|
|
+ {
|
|
|
+ GComponent item = _ui.m_comList.m_listLimitCharge.GetChildAt(i).asCom;
|
|
|
+ RedDotController.Instance.SetComRedDot(item, RedDotDataManager.Instance.GetLimiteChargeRewardRed(_limitChargeInfo[i].ActivityId), "", -40);
|
|
|
+ }
|
|
|
RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSevenDayLogin.target, RedDotDataManager.Instance.GetSevenDayLoginRed(), "", -40);
|
|
|
RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSign.target, RedDotDataManager.Instance.DailySignRed(), "", -40);
|
|
|
RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSupply.target, RedDotDataManager.Instance.DailySupplyRed(), "", -40);
|
zhaoyang