Merge branch 'master_test_gn' into master_prb_gn
commit
ad8d491fc9
|
@ -1446,6 +1446,16 @@ public class TimeUtils {
|
||||||
int week = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
int week = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
||||||
return week==0?7:week;
|
return week==0?7:week;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 获取周几
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static int getDayOfWeekBytime(long time) {
|
||||||
|
Calendar calendar = Calendar.getInstance();
|
||||||
|
calendar.setTimeInMillis(time);
|
||||||
|
int week = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
||||||
|
return week;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取指定时间 周几, 周日 0; 其他正常
|
* 获取指定时间 周几, 周日 0; 其他正常
|
||||||
|
|
|
@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
|
||||||
import util.StringUtil;
|
import util.StringUtil;
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -98,6 +99,18 @@ public class CrossLingmaiLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//當前是否是搶奪日的24點
|
||||||
|
public static List<Integer> getSendRewardWeekDay(){
|
||||||
|
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
||||||
|
int[][] battleTime = setting.getBattleTime();
|
||||||
|
long mondayZeroTime = TimeUtils.getWeekZero(1);
|
||||||
|
List<Integer> sendWeekDay = new ArrayList<>();
|
||||||
|
for (int[] everyTime : battleTime) {
|
||||||
|
sendWeekDay.add(TimeUtils.getDayOfWeekBytime(mondayZeroTime + (everyTime[1]+3) * 1000));
|
||||||
|
}
|
||||||
|
return sendWeekDay;
|
||||||
|
}
|
||||||
|
|
||||||
//功能是否开启 0未开启 1抢夺 2休战
|
//功能是否开启 0未开启 1抢夺 2休战
|
||||||
public void functionIsOpen(int[] result) {
|
public void functionIsOpen(int[] result) {
|
||||||
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
||||||
|
|
|
@ -343,7 +343,8 @@ public class MinuteTask extends Thread {
|
||||||
int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
||||||
|
|
||||||
//周二 四 六 开放 9点-21点
|
//周二 四 六 开放 9点-21点
|
||||||
if( w ==2|| w==4 || w == 6){
|
List<Integer> weekDay = CrossLingmaiLogic.getSendRewardWeekDay();
|
||||||
|
if(weekDay.contains(w)){
|
||||||
//占领奖励
|
//占领奖励
|
||||||
if(hour>=9&&hour<21){
|
if(hour>=9&&hour<21){
|
||||||
int mod = minute%10;
|
int mod = minute%10;
|
||||||
|
|
Loading…
Reference in New Issue