diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java index 0e405bc85..25bda1672 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java @@ -128,8 +128,23 @@ public class GlobleSystemLogic implements IEventHandler { } } } - - + public static long oneWeekTimelong = 604800000L; + /** + * 是否是开服前七天 + * @return + */ + public static boolean isOpenServer7(){ + // 开服时间戳 + long openTime = TimeUtils.stringToTimeLong2(GameApplication.serverConfig.getOpenTime()); + long openServer7DayTime = openTime + oneWeekTimelong; + // 当前时间戳 + long now = TimeUtils.now(); + if(now >= openServer7DayTime){ + return false; + }else{ + return true; + } + } /** * 计算世界等级 * @@ -138,12 +153,14 @@ public class GlobleSystemLogic implements IEventHandler { * 2 高于50名 */ public void calCulRank() { - + //开服前7天不开放跨服功能 + /*if(isOpenServer7()){ + return; + }*/ //不参与跨服,不用计算世界等级 if(!GameApplication.serverProperties.isArenaCross()){ return; } - SMServerArenaSetting setting = STableManager.getConfig(SMServerArenaSetting.class).get(1); int rankEndLine = setting.getWorldLevLimit(); double sum=0; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index 7f552fff7..e63e1aff5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -394,9 +394,13 @@ public class MailLogic { //检测跨服分组邮件 Integer split = redisUtil.getMapValue(RedisKey.SERVER_SPLIT_MAIL_INFO, "", String.valueOf(GameApplication.serverId), Integer.class); if(split!=null){ - sendServerSplitMail(); + //开服前七天不发跨服分组邮件 + if(!GlobleSystemLogic.isOpenServer7()){ + sendServerSplitMail(); + } redisUtil.removeMapEntrys(RedisKey.SERVER_SPLIT_MAIL_INFO, "", String.valueOf(GameApplication.serverId)); } + //检测个人邮件 Map mails =redisUtil.getMapValues(RedisKey.READY_TO_USER_MAIL, "", String.class, MailCache.class); if (mails.size()<1){