冲突修改
parent
724a3b0fb4
commit
f25e6a5980
|
@ -61,7 +61,6 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
|
||||
public static Map<Integer, SRechargeCommodityConfig> rechargeCommodityConfigMap;
|
||||
public static Map<Integer, SRechargeCommodityConfig> rechargeLevelMap;
|
||||
private static Set<Integer> rchargeHeroGet;
|
||||
private static Map<Integer,Integer> recharegeHeroTime;
|
||||
public static TreeMap<Integer,Integer> rechargePlayerLevelMap;
|
||||
public static Set<SRechargeCommodityConfig> refreshItemInfo;
|
||||
|
@ -70,7 +69,6 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
public void init() throws Exception {
|
||||
Map<Integer, SRechargeCommodityConfig> config = STableManager.getConfig(SRechargeCommodityConfig.class);
|
||||
Map<Integer, SRechargeCommodityConfig> rechargeLevelMapTmp = new HashMap<>();
|
||||
Set<Integer> rchargeHeroGetTemp = new HashSet<>();
|
||||
|
||||
Map<Integer, Integer> recharegeHeroTimeTmp = new HashMap<>();
|
||||
TreeMap<Integer,Integer> rechargePlayerLevelTemp = new TreeMap<>();
|
||||
|
@ -81,12 +79,11 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
int level = discountType[1];
|
||||
rechargeLevelMapTmp.put(level,sRechargeCommodityConfig);
|
||||
}
|
||||
if(discountType!=null && discountType.length>0 &&sRechargeCommodityConfig.getTime()==4&&sRechargeCommodityConfig.getDiscountType().length==3){
|
||||
if(discountType[0] == 4){
|
||||
rchargeHeroGetTemp.add(sRechargeCommodityConfig.getId());
|
||||
recharegeHeroTimeTmp.put(discountType[1],sRechargeCommodityConfig.getId());
|
||||
}else if(discountType[0] == 3){
|
||||
rechargePlayerLevelTemp.put(discountType[1],sRechargeCommodityConfig.getId());
|
||||
if(discountType!=null && discountType.length>0 &&sRechargeCommodityConfig.getTime()==4&&sRechargeCommodityConfig.getDiscountType().length==3) {
|
||||
if (discountType[0] == 4) {
|
||||
recharegeHeroTimeTmp.put(discountType[1], sRechargeCommodityConfig.getId());
|
||||
} else if (discountType[0] == 3) {
|
||||
rechargePlayerLevelTemp.put(discountType[1], sRechargeCommodityConfig.getId());
|
||||
}
|
||||
}
|
||||
if(sRechargeCommodityConfig.getDailyUpdate()>0){
|
||||
|
@ -115,7 +112,6 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
}
|
||||
rechargeCommodityConfigMap = config;
|
||||
rechargeLevelMap = rechargeLevelMapTmp;
|
||||
rchargeHeroGet = rchargeHeroGetTemp;
|
||||
recharegeHeroTime = recharegeHeroTimeTmp;
|
||||
refreshItemInfo = refreshItemInfoTmp;
|
||||
rechargePlayerLevelMap = rechargePlayerLevelTemp;
|
||||
|
@ -227,16 +223,10 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
return passiveSkill;
|
||||
}
|
||||
|
||||
public static Set<Integer> getRchargeHeroGet() {
|
||||
return rchargeHeroGet;
|
||||
}
|
||||
|
||||
public static Map<Integer, Integer> getRecharegeHeroTime() {
|
||||
return recharegeHeroTime;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void setRecharegeHeroTime(Map<Integer, Integer> recharegeHeroTime) {
|
||||
SRechargeCommodityConfig.recharegeHeroTime = recharegeHeroTime;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue