御剑行剧本一周期一算
parent
082952c1cc
commit
b60d589ee9
|
@ -113,24 +113,24 @@ public class RidingSwardLogic{
|
|||
TreeMap<Integer, SRidingSwardResult> treeMap = new TreeMap<>(STableManager.getConfig(SRidingSwardResult.class));
|
||||
|
||||
// 开始时间计算
|
||||
boolean sameDay = TimeUtils.isSameDay(TimeUtils.now(), startTime);
|
||||
long start = sameDay ? startTime : TimeUtils.getTodayZero();
|
||||
// boolean sameDay = TimeUtils.isSameDay(TimeUtils.now(), startTime);
|
||||
// long start = sameDay ? startTime : TimeUtils.getTodayZero();
|
||||
// 结束时间计算
|
||||
boolean sameDay2 = TimeUtils.isSameDay(TimeUtils.now(), endTime);
|
||||
long end = sameDay2 ? endTime : TimeUtils.getTomorrowZero();
|
||||
// boolean sameDay2 = TimeUtils.isSameDay(TimeUtils.now(), endTime);
|
||||
// long end = sameDay2 ? endTime : TimeUtils.getTomorrowZero();
|
||||
// 投注时间获取
|
||||
long bet = config.getTime()[0] * TimeUtils.ONE_SECOND;
|
||||
// 比赛时间获取
|
||||
long competition = config.getTime()[1] * TimeUtils.ONE_SECOND;
|
||||
|
||||
// 今日比赛次数
|
||||
long num = (end - start) / (bet + competition);
|
||||
long num = (endTime - startTime) / (bet + competition);
|
||||
// 总权重
|
||||
int sum = treeMap.values().stream().mapToInt(SRidingSwardResult::getRate).sum();
|
||||
|
||||
// map存储结果
|
||||
HashMap<String, Integer> result = new HashMap<>();
|
||||
long time = start;
|
||||
long time = startTime;
|
||||
for (int i = 0; i < num; i++) {
|
||||
// 比赛开始时间
|
||||
long competitionIng = time += bet;
|
||||
|
@ -151,7 +151,7 @@ public class RidingSwardLogic{
|
|||
redisUtil.putMapEntrys(RedisKey.RIDING_SWARD_RANK, "", result);
|
||||
LOGGER.info("御剑行日志:结果:{}", result.toString());
|
||||
// 覆盖锁
|
||||
redisUtil.set(key,String.valueOf(end));
|
||||
redisUtil.set(key,String.valueOf(endTime));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -214,7 +214,7 @@ public class MinuteTask extends Thread {
|
|||
// 助战
|
||||
HelpHeroLogic.getInstance().zeroClearRedisHelp();
|
||||
// 御剑行创建新脚本
|
||||
RidingSwardLogic.getInstance().createExecuteScript();
|
||||
// RidingSwardLogic.getInstance().createExecuteScript();
|
||||
|
||||
// 公会信息处理
|
||||
Map<Integer, GuildInfo> guildInfoMap = GuilidManager.guildInfoMap;
|
||||
|
|
Loading…
Reference in New Issue