From 30fe0d8ca6b3ed92e02cb8abdcd4c57713477a9a Mon Sep 17 00:00:00 2001
From: xuexinpeng <xuexinpeng0816@163.com>
Date: Sun, 26 Sep 2021 11:42:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B7=A8=E6=9C=8D=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E8=B7=A8=E6=9C=8D=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=92=8C?=
 =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E8=81=8A=E5=A4=A9=E6=94=B9=E4=B8=BA=E5=9C=A8?=
 =?UTF-8?q?=E5=BC=80=E6=9C=8D7=E5=A4=A9=E5=86=85=E4=B8=8D=E5=BC=80?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ljsd/jieling/logic/GlobleSystemLogic.java | 25 ++++++++++++++++---
 .../ljsd/jieling/logic/mail/MailLogic.java    |  6 ++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

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<String, MailCache> mails =redisUtil.getMapValues(RedisKey.READY_TO_USER_MAIL, "", String.class, MailCache.class);
             if (mails.size()<1){