From a6416fb8402ce1027ee320498da51db798171e73 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 14 Oct 2021 18:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/globals/Global.java | 1 - .../ridingsward/RidingSwardRewardHandler.java | 4 +- .../logic/activity/ActivityTypeEnum.java | 2 +- .../logic/activity/RidingSwardActivity.java | 51 +++++++++++++++++++ .../logic/ridingSward/RidingSwardLogic.java | 28 ++-------- .../ljsd/jieling/thread/task/MinuteTask.java | 2 - 6 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RidingSwardActivity.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java index 60a9819fe..0bebf29f2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java @@ -74,7 +74,6 @@ public interface Global { int LUXURYMONTHCARDID =11;//6豪华月卡 废弃 改版 int WEEKCARDID = 10; //月卡 - int MONTHCARDID =1;//1月卡 int LMONTHCARDID =2;//2豪华月卡 } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/ridingsward/RidingSwardRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/ridingsward/RidingSwardRewardHandler.java index 0febcea20..3b49a4663 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/ridingsward/RidingSwardRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/ridingsward/RidingSwardRewardHandler.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.handler.ridingsward; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.ridingSward.RidingSwardLogic; import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; import rpc.protocols.ActivityProto; import rpc.protocols.MessageTypeProto; @@ -22,6 +23,7 @@ public class RidingSwardRewardHandler extends BaseHandler getRidingSwardRecord(int uid){ + public List getRidingSwardRecord(int uid){ // 返回值 List list = new ArrayList<>(); // 投注记录,key:时间戳,value:竞猜记录信息list @@ -509,10 +508,10 @@ public class RidingSwardLogic{ return map; } - private String getRankKey(){ + public static String getRankKey(){ return RedisUtil.getInstence().getKey(RedisKey.RIDING_SWARD_RANK, ""); } - private String getRecordKey(int uid){ + public static String getRecordKey(int uid){ return RedisUtil.getInstence().getKey(RedisKey.RIDING_SWARD_RECORD, String.valueOf(uid)); } @@ -523,22 +522,5 @@ public class RidingSwardLogic{ public void zeroClearRidingSwardByUser(User user){ // 玩家信息清理 user.getPlayerInfoManager().setRidingSwardNum(0); - // 玩家记录信息 - RedisUtil.getInstence().rename(TimeUtils.ONE_DAY*7/1000,getRecordKey(user.getId())); - } - - /** - * 零点清理御剑行数据 - * @param user - */ - public void zeroClearRidingSwardByRank(){ - try { - RedisUtil.getInstence().rename(TimeUtils.ONE_DAY*7/1000,getRankKey()); - // 初始化第二天的比赛数据 - getInstance().createExecuteScript(); - }catch (Exception e){ - LOGGER.error("零点处理御剑行排行数据报错,{}",e.getMessage()); - e.printStackTrace(); - } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index b8677434e..205dc0d7a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -213,8 +213,6 @@ public class MinuteTask extends Thread { FourChallengeLogic.getInstance().check(); // 助战 HelpHeroLogic.getInstance().zeroClearRedisHelp(); - // 御剑行处理 - RidingSwardLogic.getInstance().zeroClearRidingSwardByRank(); // 公会信息处理 Map guildInfoMap = GuilidManager.guildInfoMap;