diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java index 5102d9f23..8b731030b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java @@ -2,13 +2,9 @@ package com.ljsd.jieling.logic; import com.ljsd.fight.CheckFight; -import com.ljsd.jieling.config.clazzStaticCfg.RewardStaticConfig; -import com.ljsd.jieling.db.redis.RedisKey; -import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.globals.BIReason; -import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.dao.Hero; @@ -18,7 +14,6 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.*; import com.ljsd.jieling.logic.fight.result.FightResult; -import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.mission.MissionType; import com.ljsd.jieling.logic.player.PlayerLogic; @@ -28,19 +23,22 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; -import rpc.protocols.CommonProto; -import rpc.protocols.MapInfoProto; -import rpc.protocols.MessageTypeProto; import com.ljsd.jieling.util.FightDataUtil; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; -import config.*; +import config.SRaceTowerConfig; +import config.SSpecialConfig; import manager.STableManager; import org.luaj.vm2.LuaValue; -import org.springframework.data.redis.core.ZSetOperations; +import rpc.protocols.CommonProto; +import rpc.protocols.MapInfoProto; +import rpc.protocols.MessageTypeProto; import util.TimeUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author lvxinran @@ -110,11 +108,11 @@ public class SituationLogic { if(TimeUtils.getDayOfWeek()==1&&TimeUtils.getHourOfDay()==0&&TimeUtils.getMiunte()==0){ remove = true; } - if(remove){ - //发排行奖励,删除排行信息 - Runnable runnable = this::rankReward; - runnable.run(); - } +// if(remove){ +// //发排行奖励,删除排行信息 +// Runnable runnable = this::rankReward; +// runnable.run(); +// } try { Map sessionMap = OnlineUserManager.sessionMap; for(Map.Entry entry:sessionMap.entrySet()){ @@ -141,32 +139,31 @@ public class SituationLogic { } } - public void rankReward() { - AbstractRank rank = RankContext.getRankEnum(RankEnum.SITUATION_RANK.getType()); - Map rewardConfigMap = RewardStaticConfig.getRaceRewardConfigMap(); - Set> rankInfos = rank.getRankByKey("", 0, rewardConfigMap.size()); - if(rankInfos.size()<1){ - return; - } - try{ - int index = 1; - for(ZSetOperations.TypedTuple rankInfo:rankInfos){ - String title = SErrorCodeEerverConfig.getI18NMessage("xuanyuan_Ranking_reward_title"); - String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("xuanyuan_Ranking_reward_txt", new Object[]{index},new int[0],"#"); - SRaceTowerRewardConfig sRaceTowerRewardConfig = rewardConfigMap.get(index); - if(sRaceTowerRewardConfig==null){ - continue; - } - String mailReward = ItemUtil.getMailReward(sRaceTowerRewardConfig.getReward()); - MailLogic.getInstance().sendMail(Integer.parseInt(rankInfo.getValue()), title, content, mailReward, TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); - index++; - } - RedisUtil.getInstence().del(RedisKey.getKey(rank.getRedisKey(),"",false)); - }catch (Exception e){ - e.printStackTrace(); - } - - } +// public void rankReward() { +// AbstractRank rank = RankContext.getRankEnum(RankEnum.SITUATION_RANK.getType()); +// Map rewardConfigMap = RewardStaticConfig.getRaceRewardConfigMap(); +// Set> rankInfos = rank.getRankByKey("", 0, rewardConfigMap.size()); +// if(rankInfos.size()<1){ +// return; +// } +// try{ +// int index = 1; +// for(ZSetOperations.TypedTuple rankInfo:rankInfos){ +// String title = SErrorCodeEerverConfig.getI18NMessage("xuanyuan_Ranking_reward_title"); +// String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("xuanyuan_Ranking_reward_txt", new Object[]{index},new int[0],"#"); +// SRaceTowerRewardConfig sRaceTowerRewardConfig = rewardConfigMap.get(index); +// if(sRaceTowerRewardConfig==null){ +// continue; +// } +// String mailReward = ItemUtil.getMailReward(sRaceTowerRewardConfig.getReward()); +// MailLogic.getInstance().sendMail(Integer.parseInt(rankInfo.getValue()), title, content, mailReward, TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); +// index++; +// } +// RedisUtil.getInstence().del(RedisKey.getKey(rank.getRedisKey(),"",false)); +// }catch (Exception e){ +// e.printStackTrace(); +// } +// } public void getAllSituationStatus(ISession session, MessageTypeProto.MessageType messageType) throws Exception {