Merge branch 'master_online_hw' into master_test_hw

zhangshanxue 2021-02-08 01:28:00 +08:00
commit c160bca82e
2 changed files with 12 additions and 3 deletions

View File

@ -696,7 +696,7 @@ public class ItemLogic {
int especialEquipId = scHero.getEquipTalismana()[1];
SEquipTalismana sEquipTalismana = SEquipTalismana.equipTalismanaStarMap.get(especialEquipId).get(hero.getEspecialEquipLevel());
if (sEquipTalismana == null || sEquipTalismana.getRankupBasicMaterial() == null) {
if (sEquipTalismana == null || sEquipTalismana.getRankupBasicMaterial() == null|| sEquipTalismana.getRankupBasicMaterial().length==0) {
throw new ErrorCodeException(ErrorCode.newDefineCode("法宝已最大等级"));
}
boolean b = ItemUtil.itemCost(user, sEquipTalismana.getRankupBasicMaterial(), BIReason.ESPECIAL_EQUIP_UP_LEVEL_CONSUME, 1);

View File

@ -24,8 +24,11 @@ public class SJewelConfig implements BaseConfig {
private int[][] rankupResources;
@Override
private int godHoodPool;
private int godHoodMaxlv;
@Override
public void init() throws Exception {
}
@ -67,5 +70,11 @@ public class SJewelConfig implements BaseConfig {
return rankupResources;
}
public int getGodHoodPool() {
return godHoodPool;
}
public int getGodHoodMaxlv() {
return godHoodMaxlv;
}
}