循环活动bug处理
parent
8ab1f93bb5
commit
d08dea2dd5
|
|
@ -482,10 +482,9 @@ public class ActivityLogic implements IEventHandler{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ActivityMission mission = activityManager.getActivityMissionMap().get(activityId);
|
ActivityMission mission = activityManager.getActivityMissionMap().get(activityId);
|
||||||
long gepTimeLong = endTime + activity.getGapTime() * TimeUtils.ONE_DAY;
|
|
||||||
// 活动存在,(当前时间大于最近的结束时间 或 活动创建时间大于最近得开启时间),表示当期活动结束
|
// 活动存在,(当前时间大于最近的结束时间 或 活动创建时间大于最近得开启时间),表示当期活动结束
|
||||||
if (mission.getCreatTime() < startTime){
|
if (mission.getCreatTime() < startTime){
|
||||||
goRewardActivity(user, activityId, builder, now > gepTimeLong);
|
goRewardActivity(user, activityId, builder, true);
|
||||||
checkStateAndInitFromActivity(user, activityId);
|
checkStateAndInitFromActivity(user, activityId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ 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){
|
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){
|
else if (activity.getTime()==2){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue