From ba608937cc56a62eb3ff8b25aa21b7478b862883 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 10 Sep 2019 20:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=88=98=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/config/SEquipSignSetting.java | 6 +++++- .../ljsd/jieling/logic/hero/HeroLogic.java | 20 ++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SEquipSignSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SEquipSignSetting.java index 6c79168e3..1c8703c4b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SEquipSignSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SEquipSignSetting.java @@ -14,10 +14,11 @@ public class SEquipSignSetting implements BaseConfig { private int[] openRules; + public static Map signSettingMap; @Override public void init() throws Exception { - + signSettingMap = STableManager.getConfig(SEquipSignSetting.class); } @@ -33,5 +34,8 @@ public class SEquipSignSetting implements BaseConfig { return openRules; } + public static Map getSignSettingMap() { + return signSettingMap; + } } \ No newline at end of file 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 0eb0998a9..f4e239307 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 @@ -1160,6 +1160,7 @@ public class HeroLogic { //法宝加成 String especialEquip = hero.getEspecialEquip(); if(!StringUtil.isEmpty(especialEquip)){ + Map especialEquipMap = user.getEquipManager().getEspecialEquipMap(); int equipTempId = especialEquipMap.get(especialEquip).getEquipId(); int tempStar = especialEquipMap.get(especialEquip).getStar(); @@ -1179,6 +1180,23 @@ public class HeroLogic { } } + //魂印加成 + Iterator> soulIterator = hero.getSoulEquipByPositionMap().entrySet().iterator(); + while (soulIterator.hasNext()){ + Map.Entry next = soulIterator.next(); + String equipId = next.getValue(); + SoulEquip equip = equipManager.getSoulEquipMap().get(equipId); + if(equip == null){ + LOGGER.error("魂印null"+equipId); + continue; + } + SEquipSign sEquipSign = SEquipSign.getsEquipSignMap().get(equip.getCfgId()); + if(null==sEquipSign){ + LOGGER.error("魂印cfg_null"+equip.getCfgId()); + continue; + } + combinedAttribute(sEquipSign.getProperty(),heroAllAttribute); + } //阵营光环加成 if(!isForce){ @@ -1486,7 +1504,7 @@ public class HeroLogic { private boolean checkPosAccess(int pos, User user, Hero hero) throws Exception { - SEquipSignSetting cfg = STableManager.getConfig(SEquipSignSetting.class).get(pos); + SEquipSignSetting cfg = SEquipSignSetting.getSignSettingMap().get(pos); if (null == cfg) { return false; }