新活动类型:5

back_recharge
xuexinpeng 2021-07-16 18:56:13 +08:00
parent cbe1b7753e
commit cdaeb7c971
3 changed files with 53 additions and 2 deletions

View File

@ -843,6 +843,24 @@ public class TimeUtils {
return c.getTimeInMillis();
}
/**
* 235959
*/
public static long getCurMonthEndTime(){
//获取当前月最后一天
Calendar ca = Calendar.getInstance();
ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
//将小时至0
ca.set(Calendar.HOUR_OF_DAY, 23);
//将分钟至0
ca.set(Calendar.MINUTE, 59);
//将秒至0
ca.set(Calendar.SECOND,59);
//将毫秒至0
ca.set(Calendar.MILLISECOND, 1000);
return ca.getTimeInMillis();
}
/**
* x:
* next:
@ -860,6 +878,24 @@ public class TimeUtils {
return c.getTimeInMillis();
}
/**
* time :
* x:
* next:
* 0
*/
public static long getMonthStartTime(long time,int x,int next){
Calendar c = Calendar.getInstance();
c.setTime(new Date(time));
c.add(Calendar.MONTH,next);
c.set(Calendar.DAY_OF_MONTH, x);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND, 0);
return c.getTimeInMillis();
}
/**
*
* @param targetWeekday

View File

@ -148,7 +148,7 @@ public class ActivityLogic implements IEventHandler{
//开服日期
String openTime = GameApplication.serverConfig.getOpenTime().split(" ")[0];
String nowTime = TimeUtils.getTimeStampYMDnew(TimeUtils.now());
now = TimeUtils.getGapMonthsByTwoTime(openTime, nowTime)+1;
//now = TimeUtils.getGapMonthsByTwoTime(openTime, nowTime)+1;
}
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 1);
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 2);

View File

@ -12,13 +12,28 @@ public class ToolsUtil {
baseTime = endTimeLong;
}
long startTime=0;
if(time == ActivityType.OPEN_TYPE_TIME || time == ActivityType.OPEN_TYPE_MONTHS){
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);
}
}else if(type ==2){
if(baseTime ==1){
startTime = TimeUtils.getCurMonthEndTime();
}else{
startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime);
}
}
}
return startTime;
}