|
@@ -377,7 +377,7 @@ namespace GFGGame
|
|
|
|
|
|
private void OnClickBtnActivityLuckyBox()
|
|
|
{
|
|
|
- ViewManager.Show<ActivityThemeLuckyBoxView>(null,true);
|
|
|
+ ViewManager.Show<OpenServerActivityView>();
|
|
|
}
|
|
|
|
|
|
private void OnClickBtnWanShiLi()
|
|
@@ -592,21 +592,21 @@ namespace GFGGame
|
|
|
|
|
|
private void UpdateActLuckyBox()
|
|
|
{
|
|
|
- int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
|
|
|
- _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
|
|
|
- if (actLuckyBoxId > 0)
|
|
|
- {
|
|
|
- if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
|
|
|
- {
|
|
|
- ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
|
|
|
- ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
|
|
|
- }
|
|
|
- ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
|
|
|
- _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
|
|
|
- _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
|
|
|
- long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
|
|
|
- _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
- }
|
|
|
+ //int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
|
|
|
+ //_ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
|
|
|
+ //if (actLuckyBoxId > 0)
|
|
|
+ //{
|
|
|
+ // if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
|
|
|
+ // {
|
|
|
+ // ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
|
|
|
+ // ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
|
|
|
+ // }
|
|
|
+ // ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
|
|
|
+ // _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
|
|
|
+ // _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
|
|
|
+ // long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
|
|
|
+ // _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
private void UpdateLimitedActvityState()
|
|
@@ -801,7 +801,7 @@ namespace GFGGame
|
|
|
_ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
|
|
|
_ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
|
|
|
_ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
|
|
|
- _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
|
|
|
+ //_ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
|
|
|
List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
|
|
|
int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
|
|
|
_ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
|