From ffcc775991ee610169e4bdfd0fb21c6c244d77c7 Mon Sep 17 00:00:00 2001
From: grimm <1769111741@qq.com>
Date: Tue, 23 Apr 2024 17:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=97=E6=B5=AE=EF=BC=8C=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b019268a954ec6eca60d62be2784ebcbf5598f36)
---
 .../com/ljsd/jieling/db/redis/RedisKey.java   |  2 +-
 .../gtw/GetWorldArenaInfoRequestHandler.java  |  2 +-
 .../ljsd/jieling/logic/arena/LuofuLogic.java  | 32 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
index f9f91a5a8..71db9b71c 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
@@ -305,7 +305,7 @@ public class RedisKey {
     public static final String LUOFU_ARENA_MY_PRON = "LUOFU_ARENA_MY_PRON";//我自己的膜拜信息
     public static final String LUOFU_ARENA_RRECORD = "LUOFU_ARENA_RRECORD";//罗浮战斗记录
     public static final String LUOFU_REGISTER_PLAYER = "LUOFU_REGISTER_PLAYER";//罗浮报名玩家信息
-    public static final String LUOFU_RANK_FIRST_MARK = "LUOFU_RANK_FIRST_MARK";//罗浮第一次初始化排行榜标记
+//    public static final String LUOFU_RANK_FIRST_MARK = "LUOFU_RANK_FIRST_MARK";//罗浮第一次初始化排行榜标记
 
     public static final String GUILD_SERVERID = "GUILD_SERVERID";
     public static final String CROSS_RANK_UPDATE = "CROSS_RANK_UPDATE";
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java
index 11a187531..74a087546 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java
@@ -42,7 +42,7 @@ public class GetWorldArenaInfoRequestHandler extends BaseHandler<WorldProto.GetW
         AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_SERVICE_ARENA.getType());
         int type = proto.getType();
         // 第一次初始化排行榜检测
-        LuofuLogic.getInstance().firstInitRank();
+//        LuofuLogic.getInstance().firstInitRank();
         //获取我的排名
         CommonProto.ArenaInfo.Builder arenaInfo = CommonProto.ArenaInfo.newBuilder();
         Integer registerType = LuofuLogic.getRegisterType(user.getId());
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/LuofuLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/LuofuLogic.java
index a1808a5fb..3dd741309 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/LuofuLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/LuofuLogic.java
@@ -90,10 +90,10 @@ public class LuofuLogic {
             return INIT_RANK;//初始化排行榜阶段
         }
         else if (now >= startTime + registerInterval + initRankInterval && now < startTime + registerInterval + initRankInterval + fightInterval){
-            return FIGHT;//报名阶段
+            return FIGHT;//战斗阶段
         }
         else if (now >= startTime + registerInterval + initRankInterval + fightInterval && now < startTime + registerInterval + initRankInterval + fightInterval + sendRewardInterval){
-            return SENDR_EWARD;//报名阶段
+            return SENDR_EWARD;//发奖阶段
         }
         else {
             return 0;//未在功能时间内
@@ -218,20 +218,20 @@ public class LuofuLogic {
     /**
      * 第一次初始化排行榜
      */
-    public void firstInitRank(){
-        int crossId = CrossServiceLogic.getCrossId();
-        if (crossId == -1){
-            return;
-        }
-        String key = RedisKey.LUOFU_RANK_FIRST_MARK + ":" + crossId;
-        String mark = RedisUtil.getInstence().getObject(key, String.class);
-        if (mark != null){
-            return;
-        }
-        RedisUtil.getInstence().set(key, "1");
-        LOGGER.info("罗浮争锋，第一次初始化排行榜....");
-        TaskKit.scheduleOne(this::initRankRobot, 0);
-    }
+//    public void firstInitRank(){
+//        int crossId = CrossServiceLogic.getCrossId();
+//        if (crossId == -1){
+//            return;
+//        }
+//        String key = RedisKey.LUOFU_RANK_FIRST_MARK + ":" + crossId;
+//        String mark = RedisUtil.getInstence().getObject(key, String.class);
+//        if (mark != null){
+//            return;
+//        }
+//        RedisUtil.getInstence().set(key, "1");
+//        LOGGER.info("罗浮争锋，第一次初始化排行榜....");
+//        TaskKit.scheduleOne(this::initRankRobot, 0);
+//    }
 
     /**
      * 罗浮争锋 初始化排行榜机器人信息