Merge branch 'master_test_gn' into master_prb_gn

back_recharge
xuexinpeng 2022-05-25 20:20:43 +08:00
commit ad8d491fc9
3 changed files with 25 additions and 1 deletions

View File

@ -1446,6 +1446,16 @@ public class TimeUtils {
int week = calendar.get(Calendar.DAY_OF_WEEK) - 1;
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

View File

@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
import util.StringUtil;
import util.TimeUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
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休战
public void functionIsOpen(int[] result) {
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);

View File

@ -343,7 +343,8 @@ public class MinuteTask extends Thread {
int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
//周二 四 六 开放 9点-21点
if( w ==2|| w==4 || w == 6){
List<Integer> weekDay = CrossLingmaiLogic.getSendRewardWeekDay();
if(weekDay.contains(w)){
//占领奖励
if(hour>=9&&hour<21){
int mod = minute%10;