合分支
parent
23ade886ae
commit
07595796fa
|
@ -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";
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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<Integer, Long> typeBagMap = rechargeInfo.getTypeBagMap();
|
||||
|
||||
Map.Entry<Integer, Integer> entry = SRechargeCommodityConfig.getRecharegeHeroTime().ceilingEntry(saveAmt);
|
||||
Map.Entry<Double, Integer> entry = SRechargeCommodityConfig.getRecharegeHeroTime().ceilingEntry(saveAmt);
|
||||
if(entry==null){
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -498,7 +498,7 @@ public class DeathPathLogic {
|
|||
}
|
||||
|
||||
|
||||
private int[] getRewardByRank(int rank){
|
||||
private static int[] getRewardByRank(int rank){
|
||||
TreeMap<Integer,SGuildWarRewardConfig> treeReward = (TreeMap<Integer,SGuildWarRewardConfig>)SGuildWarRewardConfig.treeReward;
|
||||
|
||||
Map.Entry<Integer, SGuildWarRewardConfig> entry = treeReward.floorEntry(rank);
|
||||
|
|
|
@ -64,7 +64,7 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
public static Map<Integer, SRechargeCommodityConfig> rechargeCommodityConfigMap;
|
||||
public static Map<String, SRechargeCommodityConfig> sdkRechargeCommodityConfigMap;
|
||||
public static Map<Integer, SRechargeCommodityConfig> rechargeLevelMap;
|
||||
private static TreeMap<Integer,Integer> recharegeHeroTime;
|
||||
private static TreeMap<Double,Integer> recharegeHeroTime;
|
||||
public static TreeMap<Integer,Integer> rechargePlayerLevelMap;
|
||||
public static Set<SRechargeCommodityConfig> refreshItemInfo;
|
||||
|
||||
|
@ -75,7 +75,7 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
|
||||
sdkRechargeCommodityConfigMap = new HashMap<>();
|
||||
|
||||
TreeMap<Integer, Integer> recharegeHeroTimeTmp = new TreeMap<>();
|
||||
TreeMap<Double, Integer> recharegeHeroTimeTmp = new TreeMap<>();
|
||||
|
||||
TreeMap<Integer,Integer> rechargePlayerLevelTemp = new TreeMap<>();
|
||||
Set<SRechargeCommodityConfig> 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<Integer, Integer> getRecharegeHeroTime() {
|
||||
public static TreeMap<Double, Integer> getRecharegeHeroTime() {
|
||||
return recharegeHeroTime;
|
||||
}
|
||||
|
||||
public static void setRecharegeHeroTime(TreeMap<Integer, Integer> recharegeHeroTime) {
|
||||
public static void setRecharegeHeroTime(TreeMap<Double, Integer> recharegeHeroTime) {
|
||||
SRechargeCommodityConfig.recharegeHeroTime = recharegeHeroTime;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue