diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java index 4a5648714..995123119 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java @@ -401,13 +401,14 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { int [] ifOpen = activity.getIfOpen(); if(ifOpen != null && ifOpen.length > 1){ int day = ifOpen[1]; - long haveTime = now - startTime; + String openTime = GameApplication.serverConfig.getOpenTime(); + long openTimeLong = TimeUtils.stringToTimeLong2(openTime); + long haveTime = now - openTimeLong; //还处在不可见天数内,不可触发 if(haveTime < day * TimeUtils.DAY){ return false; } } - return now >= rankStartTime && now < rankEndTime; } @@ -427,13 +428,14 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { int [] ifOpen = activity.getIfOpen(); if(ifOpen != null && ifOpen.length > 1){ int day = ifOpen[1]; - long haveTime = now - startTime; + String openTime = GameApplication.serverConfig.getOpenTime(); + long openTimeLong = TimeUtils.stringToTimeLong2(openTime); + long haveTime = now - openTimeLong; //还处在不可见天数内,不可触发 if(haveTime < day * TimeUtils.DAY){ return false; } } - return now >= rankStartTime && now < rankEndTime; } @@ -547,7 +549,7 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { LOGGER.info("跨服冲榜备份结束,备份数据已存在,活动id:{},排行榜类型:{},排行榜数量:{}",id,backRankType,backRankInfo.size()); return null; } - String key = RedisUtil.getInstence().getKeyLocal(backRank.getCrossRedisKey(),""); + String key = RedisUtil.getInstence().getKeyNew(backRank.getCrossRedisKey(),""); RedisUtil.getInstence().zsetAddAall(key,rankInfo); RedisUtil.getInstence().expire(key,getCleanRankTime(rankType)); LOGGER.info("===========================跨服冲榜备份结束,活动id:{},排行榜类型:{},时间:{}",id,backRankType,TimeUtils.nowInt()); @@ -574,7 +576,7 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { LOGGER.info("===========================跨服冲榜开始发奖:{}-{}",id,rankType); // 备份排行榜 - Set> rankInfo = backRank(rankType); + Set> rankInfo = crossBackRank(rankType); if (rankInfo == null){ LOGGER.error("===========================跨服冲榜发奖提前结束,备份排行榜返回结果为空:{}-{}",id,rankType); return;