循环活动,百抽活动
parent
d0784058a3
commit
8cc94c9051
|
@ -27,12 +27,6 @@ public class NewEightActivity extends AbstractActivity {
|
||||||
long createTime = user.getPlayerInfoManager().getCreateTime();
|
long createTime = user.getPlayerInfoManager().getCreateTime();
|
||||||
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
long startTime = ToolsUtil.getTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), createTime, 1, activity.getCycleMinute());
|
long startTime = ToolsUtil.getTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), createTime, 1, activity.getCycleMinute());
|
||||||
if (activity.getTime()==1 || activity.getTime() == 6){
|
return TimeUtils.getOverTimeCount(startTime, now, 0) >= sActivityRewardConfig.getValues()[0][0] - 1;
|
||||||
return TimeUtils.getOverTimeCount(startTime, now, 0) >= sActivityRewardConfig.getValues()[0][0] - 1;
|
|
||||||
}
|
|
||||||
else if (activity.getTime()==2){
|
|
||||||
return TimeUtils.getOverTimeCount(createTime, now, 0) >= sActivityRewardConfig.getValues()[0][0] - 1;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ public class ToolsUtil {
|
||||||
case ActivityType.OPEN_TYPE_TIME://绝对时间
|
case ActivityType.OPEN_TYPE_TIME://绝对时间
|
||||||
resultTime = baseTime;
|
resultTime = baseTime;
|
||||||
break;
|
break;
|
||||||
case ActivityType.OPEN_TYPE_ROLE:
|
case ActivityType.OPEN_TYPE_ROLE://创角时间
|
||||||
resultTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000;
|
resultTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000;
|
||||||
break;
|
break;
|
||||||
case ActivityType.OPEN_TYPE_SERVER://开服时间
|
case ActivityType.OPEN_TYPE_SERVER://开服时间
|
||||||
|
|
Loading…
Reference in New Issue