开服冲榜活动结束

back_recharge
duhui 2022-11-07 14:12:03 +08:00
parent d112e60d82
commit 60f3397865
2 changed files with 28 additions and 22 deletions

View File

@ -91,7 +91,7 @@ public class OpenServerCompeteRankActivity extends AbstractActivity {
return 0;
}
long endTime = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),0, 2);
return endTime + info.getCloseTime() * 1000L;
return endTime + info.getCloseTime() * 1000L - TimeUtils.now();
}
/**

View File

@ -6,34 +6,40 @@ import util.TimeUtils;
public class ToolsUtil {
public static long getTimeLong(long startTimeLong , long endTimeLong,int time,long createUserTime,int type){
public static long getTimeLong(long startTimeLong, long endTimeLong, int time, long createUserTime, int type){
long baseTime = startTimeLong;
if(type == 2){
baseTime = endTimeLong;
}
long startTime=0;
if(time == ActivityType.OPEN_TYPE_TIME ){
startTime = baseTime;
}else if(time == ActivityType.OPEN_TYPE_SERVER){
long serverOpenTime = GameApplication.serverConfig.getCacheOpenTime();
startTime = serverOpenTime + baseTime*1000;
}else if(time == ActivityType.OPEN_TYPE_ROLE){
startTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000;
}else if(time == ActivityType.OPEN_TYPE_MONTHS){
if(type == 1){
if(baseTime ==1){
//第一个月
startTime = GameApplication.serverConfig.getCacheOpenTime();
}else{
startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime-1);
switch (time){
case ActivityType.OPEN_TYPE_TIME:
startTime = baseTime;
break;
case ActivityType.OPEN_TYPE_ROLE:
startTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000;
break;
case ActivityType.OPEN_TYPE_SERVER:
long serverOpenTime = GameApplication.serverConfig.getCacheOpenTime();
startTime = serverOpenTime + baseTime*1000;
break;
case ActivityType.OPEN_TYPE_MONTHS:
if(type == 1){
if(baseTime == 1){//第一个月
startTime = GameApplication.serverConfig.getCacheOpenTime();
}else{
startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime-1);
}
}
}else if(type ==2){
if(baseTime ==1){
startTime = TimeUtils.getMonthEndTime(GameApplication.serverConfig.getCacheOpenTime());
}else{
startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime);
if(type == 2){
if(baseTime ==1){
startTime = TimeUtils.getMonthEndTime(GameApplication.serverConfig.getCacheOpenTime());
}else{
startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime);
}
}
}
break;
default:break;
}
return startTime;
}