From 5f83cc7f81749a4465749ef9d30cf893fad47869 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 23 Dec 2022 14:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/dao/Hero.java | 26 +++++------ .../com/ljsd/jieling/logic/dao/Jewel.java | 42 +++++++++--------- .../ljsd/jieling/logic/hero/HeroLogic.java | 44 +++++++++---------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 1166bbd1e..4390d64f1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -280,19 +280,19 @@ public class Hero extends MongoBase implements Comparable,Cloneable { } public Map getEquipByHongmengPositionMap(HeroManager heroManager) { - if (!equipByPositionMap.isEmpty()) { - return equipByPositionMap; - } +// if (!equipByPositionMap.isEmpty()) { +// return equipByPositionMap; +// } // 英雄在共鸣池中 - if (heroManager.getResonances().values().contains(id)) { - // 模板,取装备 - HongMengAddAttribute hongMengByEquip = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP); - if (hongMengByEquip != null && hongMengByEquip.value != -1) { - // 根据星级获取装备位置和信息 - Map map = SEquipConfig.starByPositionMap.get(hongMengByEquip.value); - return map == null ? new HashMap<>() : map; - } - } +// if (heroManager.getResonances().values().contains(id)) { +// // 模板,取装备 +// HongMengAddAttribute hongMengByEquip = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP); +// if (hongMengByEquip != null && hongMengByEquip.value != -1) { +// // 根据星级获取装备位置和信息 +// Map map = SEquipConfig.starByPositionMap.get(hongMengByEquip.value); +// return map == null ? new HashMap<>() : map; +// } +// } return equipByPositionMap; } @@ -432,7 +432,7 @@ public class Hero extends MongoBase implements Comparable,Cloneable { public int getEspecialEquipLevel() { int max = SSpecialConfig.getIntegerValue(SSpecialConfig.EquipTalismanaUpperLimit); - return especialEquipLevel>max ? max : especialEquipLevel; + return Math.min(especialEquipLevel, max); } public int getOriginalEspecialEquipLevel() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java index e6f060be8..d704b5236 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Jewel.java @@ -83,27 +83,27 @@ public class Jewel extends PropertyItem implements Cloneable { public int getLevelByHongMeng(HeroManager heroManager,String heroId) { // 英雄在共鳴池中 - if (heroManager.getResonances().containsValue(heroId)) { - // 1:魂宝,2:灵宝 - HongMengAddAttribute hongMengAddAttribute = null; - if (jewelType == 1){ - hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SOUL_EQUIP); - } - if (jewelType == 2){ - hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SPIRIT_EQUIP); - } - // 读配置表 - SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(getEquipId()); - // 0:最大等级,1最大精炼等级 - int[] max = config.getMax(); - if (hongMengAddAttribute != null){ - // 比较当前等级和共鸣等级 - int newLevel = Math.max(getLevel(), hongMengAddAttribute.value); - // 第一次结果和最大等级限制比较 - newLevel = Math.min(max[0], newLevel); - return newLevel; - } - } +// if (heroManager.getResonances().containsValue(heroId)) { +// // 1:魂宝,2:灵宝 +// HongMengAddAttribute hongMengAddAttribute = null; +// if (jewelType == 1){ +// hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SOUL_EQUIP); +// } +// if (jewelType == 2){ +// hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.SPIRIT_EQUIP); +// } +// // 读配置表 +// SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(getEquipId()); +// // 0:最大等级,1最大精炼等级 +// int[] max = config.getMax(); +// if (hongMengAddAttribute != null){ +// // 比较当前等级和共鸣等级 +// int newLevel = Math.max(getLevel(), hongMengAddAttribute.value); +// // 第一次结果和最大等级限制比较 +// newLevel = Math.min(max[0], newLevel); +// return newLevel; +// } +// } return getLevel(); } 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 d4f010332..675c3d961 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 @@ -5267,7 +5267,7 @@ public class HeroLogic { /** * 添加或更新鸿蒙守卫 - * + * 2022-12-23 鸿蒙阵只保留等级共鸣 * @param session * @param judge true:返回,false:推送 */ @@ -5423,9 +5423,9 @@ public class HeroLogic { especialEquipLevel.value = -1; } resonanceAddition.put(HongMengAttributeEnum.LEVEL, resonanceLevel); - resonanceAddition.put(HongMengAttributeEnum.EQUIP, hongMengAddAttributeEquip); - resonanceAddition.put(HongMengAttributeEnum.SOUL_EQUIP, soulEquip); - resonanceAddition.put(HongMengAttributeEnum.SPIRIT_EQUIP, spiritEquip); +// resonanceAddition.put(HongMengAttributeEnum.EQUIP, hongMengAddAttributeEquip); +// resonanceAddition.put(HongMengAttributeEnum.SOUL_EQUIP, soulEquip); +// resonanceAddition.put(HongMengAttributeEnum.SPIRIT_EQUIP, spiritEquip); heroManager.setResonanceAddition(resonanceAddition); /*** ============================= 开始组装鸿蒙阵信息 ==================================== **/ @@ -5652,7 +5652,7 @@ public class HeroLogic { LOGGER.info("resonance uid=>{} no the heroId=>{}", user.getId(), heroId); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); } - if (heroManager.getHongmengGuards().values().contains(heroId)) { + if (heroManager.getHongmengGuards().containsValue(heroId)) { LOGGER.info("resonance uid=>{} the heroId=>{} is HongmengGuard", user.getId(), heroId); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); } @@ -5663,28 +5663,28 @@ public class HeroLogic { throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); } Map resonancesTime = heroManager.getResonancesTime(); - if (resonancesTime.get(index) != null && resonancesTime.get(index) > TimeUtils.now() / 1000) { + if (resonancesTime.get(index) != null && resonancesTime.get(index) > TimeUtils.nowInt()) { LOGGER.info("resonance uid=>{} time =>{}", user.getId(), resonancesTime.get(index)); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); } // 添加到共鸣区 heroManager.updateResonances(index, heroId); - HongMengAddAttribute hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP); - if (hongMengAddAttribute.value != -1) { - Map equipByPositionMap = hero.getEquipByPositionMap(); - - if (equipByPositionMap.size() > 0) { - ArrayList strings = new ArrayList<>(); - equipByPositionMap.forEach((k, v) -> { - strings.add(String.valueOf(v)); - }); - // 卸下装备 - getInstance().unloadEquipOpt(session, heroId, strings, 1); - } - - equipByPositionMap.clear(); - hero.setEquipByPositionMap(equipByPositionMap); - } +// HongMengAddAttribute hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.EQUIP); +// if (hongMengAddAttribute.value != -1) { +// Map equipByPositionMap = hero.getEquipByPositionMap(); +// +// if (equipByPositionMap.size() > 0) { +// ArrayList strings = new ArrayList<>(); +// equipByPositionMap.forEach((k, v) -> { +// strings.add(String.valueOf(v)); +// }); +// // 卸下装备 +// getInstance().unloadEquipOpt(session, heroId, strings, 1); +// } +// +// equipByPositionMap.clear(); +// hero.setEquipByPositionMap(equipByPositionMap); +// } // 更新战力 Poster.getPoster().dispatchEvent(new SaveHeroForceEvent(user.getId(),heroId));