From ffea4a169f3d86eaa83d72098939a557f6026dcd Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Fri, 16 Aug 2024 14:10:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E7=8E=8Bv1.4,=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 04814f038..bc28af91f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2291,18 +2291,20 @@ public class HeroLogic { // 神王技能 Map shenWangMap = SShenWang.heroMap.get(heroVo.getTemplateId()); - for (Map.Entry entry : shenWangMap.entrySet()) { - Integer lv = entry.getKey(); - if (heroVo.getShenwangLv() < lv) { - continue; - } - SShenWang shenWang = entry.getValue(); - int[] passiveSkill = shenWang.getPassiveSkill(); - if (passiveSkill == null) { - continue; - } - for (int skill : passiveSkill) { - skillList.add(skill); + if (shenWangMap != null) { + for (Map.Entry entry : shenWangMap.entrySet()) { + Integer lv = entry.getKey(); + if (heroVo.getShenwangLv() < lv) { + continue; + } + SShenWang shenWang = entry.getValue(); + int[] passiveSkill = shenWang.getPassiveSkill(); + if (passiveSkill == null) { + continue; + } + for (int skill : passiveSkill) { + skillList.add(skill); + } } } @@ -3307,6 +3309,9 @@ public class HeroLogic { private void applyShenwangAttribute(Map heroAllAttribute, Hero hero) { HashMap map = new HashMap<>(); Map shenWangMap = SShenWang.heroMap.get(hero.getTemplateId()); + if (shenWangMap == null) { + return; + } for (Map.Entry entry : shenWangMap.entrySet()) { Integer lv = entry.getKey(); if (hero.getShenwangLv() < lv) { @@ -7543,6 +7548,9 @@ public class HeroLogic { throw new ErrorTableException(203);//英雄星级不够 } Map shenWangLvMap = SShenWang.heroMap.get(hero.getTemplateId()); + if (shenWangLvMap == null){ + throw new ErrorTableException(207);//此英雄不能升级神王技能 + } int maxKey = ToolsUtil.getMaxKey(shenWangLvMap.keySet()); int shenwangLv = hero.getShenwangLv(); if (shenwangLv >= maxKey){