From 69a15015debe5ee8d4a1a77136e2108f97326378 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Mon, 16 Aug 2021 00:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E6=8E=92=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ljsd/jieling/logic/GlobleSystemLogic.java     | 7 +++----
 .../java/com/ljsd/jieling/logic/rank/CrossRankManager.java | 4 +---
 .../com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java | 4 +---
 3 files changed, 5 insertions(+), 10 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 bd21ef353..0e405bc85 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java
@@ -227,6 +227,9 @@ public class GlobleSystemLogic implements IEventHandler {
             LOGGER.error("跨服分组，未获取到锁");
             return;
         }
+        // 跨服排行榜处理
+        CrossRankManager.getInstance().cleanCrossRank();
+
         //这里为所有服务器的世界等级
         Map<String,Integer> worldLevelMap = redisUtil.getMapValues(RedisKey.SERVER_WORLDLEVE_INFO,"",String.class,Integer.class);
         LOGGER.info("跨服开始分组");
@@ -266,10 +269,6 @@ public class GlobleSystemLogic implements IEventHandler {
             redisUtil.del(RedisKey.CHAT_CROSS_MSG_ID+i);
         }
 
-        // 跨服排行榜处理
-        CrossRankManager.getInstance().cleanCrossRank();
-        CrossRankManager.getInstance().crossRankHandle(true);
-
         //释放分布式锁
         redisUtil.del("SERVER_SPLIT_REDIS_LOCK");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java
index 024e98b24..f163da11a 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java
@@ -48,7 +48,7 @@ public class CrossRankManager {
      */
     public void crossRankHandle(boolean choice){
         // 时间验证
-        if (choice || isTime()){
+        if (isTime()){
             // 全部排行遍历
             for (RankEnum value : RankEnum.values()) {
                 int type = value.getType();
@@ -76,8 +76,6 @@ public class CrossRankManager {
                     }
                 }
             }
-            // 更新时间
-            isTime();
         }
     }
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
index ebb8162f3..cd9b97cc1 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
@@ -252,7 +252,6 @@ public abstract class AbstractRank implements IRank {
     }
 
     private CommonProto.UserRank.Builder getOneUserRank(User everyUser,CommonProto.RankInfo.Builder everyRankInfo){
-        String serverName = CrossServiceLogic.getInstance().getServerNameByUId(everyUser.getId());
         return CommonProto.UserRank.newBuilder()
                 .setUid(everyUser.getId())
                 .setUserName(everyUser.getPlayerInfoManager().getNickName())
@@ -265,8 +264,7 @@ public abstract class AbstractRank implements IRank {
                 .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin())
                 .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle())
                 .setUserMount(everyUser.getPlayerInfoManager().getUserMount())
-                .setPracticeLevel(everyUser.getHeroManager().getPracticeLevel())
-                .setServerName(serverName);
+                .setPracticeLevel(everyUser.getHeroManager().getPracticeLevel());
     }
 
     public CommonProto.UserRank.Builder getCrossOneUserRank(ArenaOfUser query, CommonProto.RankInfo.Builder everyRankInfo){