神王v1.4,非空验证

grimm 2024-08-16 14:10:44 +08:00
parent e485af1227
commit ffea4a169f
1 changed files with 20 additions and 12 deletions

View File

@ -2291,18 +2291,20 @@ public class HeroLogic {
// 神王技能 // 神王技能
Map<Integer, SShenWang> shenWangMap = SShenWang.heroMap.get(heroVo.getTemplateId()); Map<Integer, SShenWang> shenWangMap = SShenWang.heroMap.get(heroVo.getTemplateId());
for (Map.Entry<Integer, SShenWang> entry : shenWangMap.entrySet()) { if (shenWangMap != null) {
Integer lv = entry.getKey(); for (Map.Entry<Integer, SShenWang> entry : shenWangMap.entrySet()) {
if (heroVo.getShenwangLv() < lv) { Integer lv = entry.getKey();
continue; if (heroVo.getShenwangLv() < lv) {
} continue;
SShenWang shenWang = entry.getValue(); }
int[] passiveSkill = shenWang.getPassiveSkill(); SShenWang shenWang = entry.getValue();
if (passiveSkill == null) { int[] passiveSkill = shenWang.getPassiveSkill();
continue; if (passiveSkill == null) {
} continue;
for (int skill : passiveSkill) { }
skillList.add(skill); for (int skill : passiveSkill) {
skillList.add(skill);
}
} }
} }
@ -3307,6 +3309,9 @@ public class HeroLogic {
private void applyShenwangAttribute(Map<Integer, Long> heroAllAttribute, Hero hero) { private void applyShenwangAttribute(Map<Integer, Long> heroAllAttribute, Hero hero) {
HashMap<Integer, Long> map = new HashMap<>(); HashMap<Integer, Long> map = new HashMap<>();
Map<Integer, SShenWang> shenWangMap = SShenWang.heroMap.get(hero.getTemplateId()); Map<Integer, SShenWang> shenWangMap = SShenWang.heroMap.get(hero.getTemplateId());
if (shenWangMap == null) {
return;
}
for (Map.Entry<Integer, SShenWang> entry : shenWangMap.entrySet()) { for (Map.Entry<Integer, SShenWang> entry : shenWangMap.entrySet()) {
Integer lv = entry.getKey(); Integer lv = entry.getKey();
if (hero.getShenwangLv() < lv) { if (hero.getShenwangLv() < lv) {
@ -7543,6 +7548,9 @@ public class HeroLogic {
throw new ErrorTableException(203);//英雄星级不够 throw new ErrorTableException(203);//英雄星级不够
} }
Map<Integer, SShenWang> shenWangLvMap = SShenWang.heroMap.get(hero.getTemplateId()); Map<Integer, SShenWang> shenWangLvMap = SShenWang.heroMap.get(hero.getTemplateId());
if (shenWangLvMap == null){
throw new ErrorTableException(207);//此英雄不能升级神王技能
}
int maxKey = ToolsUtil.getMaxKey(shenWangLvMap.keySet()); int maxKey = ToolsUtil.getMaxKey(shenWangLvMap.keySet());
int shenwangLv = hero.getShenwangLv(); int shenwangLv = hero.getShenwangLv();
if (shenwangLv >= maxKey){ if (shenwangLv >= maxKey){