|
@@ -568,7 +568,7 @@ namespace GFGGame
|
|
UpdateOpenServerActivity();
|
|
UpdateOpenServerActivity();
|
|
|
|
|
|
UpdateLimitedActvityState();
|
|
UpdateLimitedActvityState();
|
|
- UpdateTime();
|
|
|
|
|
|
+ //UpdateTime();
|
|
|
|
|
|
//特惠礼包/限时礼包窗口内的倒计时
|
|
//特惠礼包/限时礼包窗口内的倒计时
|
|
UpGiftBox1();
|
|
UpGiftBox1();
|
|
@@ -647,37 +647,37 @@ namespace GFGGame
|
|
|
|
|
|
private void UpdateTime()
|
|
private void UpdateTime()
|
|
{
|
|
{
|
|
- if (_ui.m_btnTea.target.visible)
|
|
|
|
- {
|
|
|
|
- long time = ActivityTeaDataManager.Instance.GetEndTime(ActivityType.TEA) - TimeHelper.ServerNow();
|
|
|
|
- _ui.m_btnTea.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
- }
|
|
|
|
- if (_ui.m_btnActivityDay7.target.visible)
|
|
|
|
- {
|
|
|
|
- long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
|
|
|
|
- _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (_ui.m_btnWanShiLi.target.visible)
|
|
|
|
- {
|
|
|
|
- long time = ActivityWanShiLiDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
|
|
|
|
- _ui.m_btnWanShiLi.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (_ui.m_btnActivityAfuGift.target.visible)
|
|
|
|
- {
|
|
|
|
- var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
|
|
|
|
- if (activityInfo == null)
|
|
|
|
- {
|
|
|
|
- _ui.m_btnActivityAfuGift.target.visible = false;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- long time = activityInfo.EndTime - TimeHelper.ServerNow();
|
|
|
|
- _ui.m_btnActivityAfuGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
|
|
+ //if (_ui.m_btnTea.target.visible)
|
|
|
|
+ //{
|
|
|
|
+ // long time = ActivityTeaDataManager.Instance.GetEndTime(ActivityType.TEA) - TimeHelper.ServerNow();
|
|
|
|
+ // _ui.m_btnTea.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
+ //}
|
|
|
|
+ //if (_ui.m_btnActivityDay7.target.visible)
|
|
|
|
+ //{
|
|
|
|
+ // long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
|
|
|
|
+ // _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
+ //}
|
|
|
|
+
|
|
|
|
+ //if (_ui.m_btnWanShiLi.target.visible)
|
|
|
|
+ //{
|
|
|
|
+ // long time = ActivityWanShiLiDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
|
|
|
|
+ // _ui.m_btnWanShiLi.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
+ //}
|
|
|
|
+
|
|
|
|
+ //if (_ui.m_btnActivityAfuGift.target.visible)
|
|
|
|
+ //{
|
|
|
|
+ // var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
|
|
|
|
+ // if (activityInfo == null)
|
|
|
|
+ // {
|
|
|
|
+ // _ui.m_btnActivityAfuGift.target.visible = false;
|
|
|
|
+ // }
|
|
|
|
+ // else
|
|
|
|
+ // {
|
|
|
|
+ // long time = activityInfo.EndTime - TimeHelper.ServerNow();
|
|
|
|
+ // _ui.m_btnActivityAfuGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
|
|
|
|
+ // }
|
|
|
|
+
|
|
|
|
+ //}
|
|
}
|
|
}
|
|
|
|
|
|
private void OnNumericChange(EventContext context)
|
|
private void OnNumericChange(EventContext context)
|
|
@@ -881,7 +881,7 @@ namespace GFGGame
|
|
RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
|
|
RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
|
|
|
|
|
|
if (redPointUpdateFrame == 9)
|
|
if (redPointUpdateFrame == 9)
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -19, 5);
|
|
|
|
|
|
if (redPointUpdateFrame == 10)
|
|
if (redPointUpdateFrame == 10)
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed()
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed()
|
|
@@ -892,8 +892,8 @@ namespace GFGGame
|
|
RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
|
|
RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
|
|
|
|
|
|
if (redPointUpdateFrame == 12)
|
|
if (redPointUpdateFrame == 12)
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red(), "", 0, 2);
|
|
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -24, -20);
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red(), "", -10, 17);
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -24, -9);
|
|
|
|
|
|
if (redPointUpdateFrame == 13)
|
|
if (redPointUpdateFrame == 13)
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "icon_tanhao", -17, 24);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "icon_tanhao", -17, 24);
|
|
@@ -926,7 +926,7 @@ namespace GFGGame
|
|
if (_ui.m_btnActivityAfuGift.target.visible)
|
|
if (_ui.m_btnActivityAfuGift.target.visible)
|
|
{
|
|
{
|
|
if (redPointUpdateFrame == 17)
|
|
if (redPointUpdateFrame == 17)
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -39, -12);
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -39, -6);
|
|
}
|
|
}
|
|
//海之市
|
|
//海之市
|
|
if (redPointUpdateFrame == 18)
|
|
if (redPointUpdateFrame == 18)
|
|
@@ -938,7 +938,7 @@ namespace GFGGame
|
|
if (_ui.m_btnTea.target.visible)
|
|
if (_ui.m_btnTea.target.visible)
|
|
{
|
|
{
|
|
if (redPointUpdateFrame == 19)
|
|
if (redPointUpdateFrame == 19)
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -24, 14);
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -24, -3);
|
|
}
|
|
}
|
|
|
|
|
|
redPointUpdateFrame++;
|
|
redPointUpdateFrame++;
|