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 b28e2be5a..8bcddf299 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 @@ -10,8 +10,6 @@ public class RedisKey { - - public final static String Delimiter_colon = ":"; private final static String areaId = "0"; @@ -180,6 +178,15 @@ public class RedisKey { public static final String SESSION_OFFLINE = "SESSION_OFFLINE"; + public static final String DEATH_PATH_EVERY_PERSON_RANK = "DEATH_PATH_EVERY_PERSON_RANK"; + + public static final String DEATH_PATH_EVERY_GUILD_RANK = "DEATH_PATH_EVERY_GUILD_RANK"; + + public static final String DEATH_PATH_CHALLENGE_COUNT = "DEATH_PATH_CHALLENGE_COUNT"; + + public static final String DEATH_PATH_TOTAL_PERSON_RANK = "DEATH_PATH_TOTAL_PERSON_RANK"; + + public static final String DEATH_PATH_TOTAL_GUILD_RANK = "DEATH_PATH_TOTAL_GUILD_RANK"; //问卷调查 public static final String QUESTION_FROMBACK = "QUESTION_FROMBACK"; @@ -280,13 +287,6 @@ public class RedisKey { public static final String MONSTER_ATTACK_RANK = "MONSTER_ATTACK_RANK";//兽潮 - public static final String DEATH_PATH_EVERY_PERSON_RANK = "DEATH_PATH_EVERY_PERSON_RANK"; - - public static final String DEATH_PATH_EVERY_GUILD_RANK = "DEATH_PATH_EVERY_GUILD_RANK"; - - public static final String DEATH_PATH_TOTAL_PERSON_RANK = "DEATH_PATH_TOTAL_PERSON_RANK"; - - public static final String DEATH_PATH_TOTAL_GUILD_RANK = "DEATH_PATH_TOTAL_GUILD_RANK"; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java index 2d384b902..d53d7daae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java @@ -41,12 +41,12 @@ public class HeroFiveStarGetEventHandler implements IEventHandler { //动态控制购买数量 User user = UserManager.getUser(((HeroFiveStarGetEvent) event).getUid()); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); - int saveAmt = rechargeInfo.getSaveAmt(); + double saveAmt = rechargeInfo.getSaveAmt(); long now = System.currentTimeMillis(); Map typeBagMap = rechargeInfo.getTypeBagMap(); - Map.Entry entry = SRechargeCommodityConfig.getRecharegeHeroTime().ceilingEntry(saveAmt); + Map.Entry entry = SRechargeCommodityConfig.getRecharegeHeroTime().ceilingEntry(saveAmt); if(entry==null){ return; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java index 9e2c19684..476d119f8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java @@ -498,7 +498,7 @@ public class DeathPathLogic { } - private int[] getRewardByRank(int rank){ + private static int[] getRewardByRank(int rank){ TreeMap treeReward = (TreeMap)SGuildWarRewardConfig.treeReward; Map.Entry entry = treeReward.floorEntry(rank); diff --git a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java index 7b46fabce..8765f01da 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java @@ -64,7 +64,7 @@ public class SRechargeCommodityConfig implements BaseConfig { public static Map rechargeCommodityConfigMap; public static Map sdkRechargeCommodityConfigMap; public static Map rechargeLevelMap; - private static TreeMap recharegeHeroTime; + private static TreeMap recharegeHeroTime; public static TreeMap rechargePlayerLevelMap; public static Set refreshItemInfo; @@ -75,7 +75,7 @@ public class SRechargeCommodityConfig implements BaseConfig { sdkRechargeCommodityConfigMap = new HashMap<>(); - TreeMap recharegeHeroTimeTmp = new TreeMap<>(); + TreeMap recharegeHeroTimeTmp = new TreeMap<>(); TreeMap rechargePlayerLevelTemp = new TreeMap<>(); Set refreshItemInfoTmp = new HashSet<>(); @@ -89,7 +89,7 @@ public class SRechargeCommodityConfig implements BaseConfig { if(discountType!=null && discountType.length>0 &&sRechargeCommodityConfig.getTime()==4) { //五星成长礼初始化 if (discountType[0] == 4&&sRechargeCommodityConfig.getDiscountType().length==4) { - recharegeHeroTimeTmp.put(discountType[2], sRechargeCommodityConfig.getId()); + recharegeHeroTimeTmp.put((double)discountType[2], sRechargeCommodityConfig.getId()); } else if (discountType[0] == 3) { rechargePlayerLevelTemp.put(discountType[1], sRechargeCommodityConfig.getId()); } @@ -231,11 +231,11 @@ public class SRechargeCommodityConfig implements BaseConfig { return passiveSkill; } - public static TreeMap getRecharegeHeroTime() { + public static TreeMap getRecharegeHeroTime() { return recharegeHeroTime; } - public static void setRecharegeHeroTime(TreeMap recharegeHeroTime) { + public static void setRecharegeHeroTime(TreeMap recharegeHeroTime) { SRechargeCommodityConfig.recharegeHeroTime = recharegeHeroTime; }