From bece9581b39184916f6ff83194425145dfca150c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 1 Sep 2023 15:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/blood/BloodLogic.java | 6 +++--- .../com/ljsd/jieling/logic/fight/CombatLogic.java | 2 +- .../com/ljsd/jieling/logic/hero/HeroLogic.java | 14 +++++++------- .../logic/home/ArchitectureUnLockHandler.java | 2 +- .../jieling/logic/rank/rankImpl/PowerRiceRank.java | 1 - 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java index 798efdeb4..f1bc07c71 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java @@ -61,9 +61,9 @@ public class BloodLogic { Hero hero = heroManager.getHero(heroInfo.getHeroId()); Map heroAttributeMap = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId); //加buff - if(buffInfo!=null && buffInfo.length>0){ - for(int i = 0 ; i < buffInfo.length ; i++){ - heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap,buffInfo[i]); + if(buffInfo != null){ + for (int j : buffInfo) { + heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap, j); } } int position = heroInfo.getPosition(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index dd8277305..6dc6d7471 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -91,7 +91,7 @@ public class CombatLogic { SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(effectId); if( sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){ if(effectId == HeroAttributeEnum.CurHpExtra.getPropertyId()){ - effectId = HeroAttributeEnum.CurHP.getPropertyId(); + effectId = HeroAttributeEnum.CurHP.getPropertyId(); effectValue = (int) (value.get(HeroAttributeEnum.Hp.getPropertyId()) * effectValue/10000); }else{ if(sPropertyConfig.getTargetPropertyId()!=0){ 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 beeb84612..13ad1ccb5 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 @@ -2710,10 +2710,11 @@ public class HeroLogic { heroAllAttribute.remove(HeroAttributeEnum.PVPDamageBocusFactor.getPropertyId()); heroAllAttribute.remove(HeroAttributeEnum.PVPDamageReduceFactor.getPropertyId()); } - +// LOGGER.info("战力基础属性1=================={}",heroAllAttribute); // 总计算 calInteractAdd(heroAllAttribute, isForce); heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(), heroAllAttribute.get(GlobalsDef.HP_TYPE)); +// LOGGER.info("战力基础属性2=================={}",heroAllAttribute); return heroAllAttribute; } @@ -3220,7 +3221,7 @@ public class HeroLogic { private void applyPassiveSkillAttribute(Map heroAllAttribute, Hero hero, int teamId, User user){ // ...被动技能处理... Set heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero, teamId); - LOGGER.info("战力技能============={}",heroSkillList); +// LOGGER.info("战力技能============={}",heroSkillList); // 大闹天宫队伍特殊处理 if (teamId == TeamEnum.EXPEDITION_TEAM.getTeamId()) { @@ -3313,15 +3314,15 @@ public class HeroLogic { if (targetPropertyId == 0) { continue; } - SPropertyConfig stargetPro = SPropertyConfig.getsPropertyConfigByPID(targetPropertyId); - if (stargetPro == null) { + SPropertyConfig targetPro = SPropertyConfig.getsPropertyConfigByPID(targetPropertyId); + if (targetPro == null) { continue; } int style = sPropertyConfig.getStyle(); int effectValue = item.getValue().intValue(); //如果目标属性也是万分比 直接加 - if (style == GlobalsDef.ABSOLUTE_TYPE || stargetPro.getStyle() == GlobalsDef.PERCENT_TYPE) { + if (style == GlobalsDef.ABSOLUTE_TYPE || targetPro.getStyle() == GlobalsDef.PERCENT_TYPE) { if (heroAllAttribute.containsKey(targetPropertyId)) { long targetValue = heroAllAttribute.getOrDefault(targetPropertyId, 0L); effectValue += targetValue; @@ -3342,7 +3343,7 @@ public class HeroLogic { for (Map.Entry item : propertyPercentMap.entrySet()) { Integer propertyId = item.getKey(); Long propertyValue = heroAllAttribute.getOrDefault(propertyId, 0L); - heroAllAttribute.put(propertyId, (BigDecimal.valueOf(propertyValue).multiply(BigDecimal.valueOf(item.getValue()).divide(BigDecimal.valueOf(10000f))).intValue() + propertyValue)); + heroAllAttribute.put(propertyId, BigDecimal.valueOf(propertyValue).multiply(BigDecimal.valueOf(item.getValue()).divide(BigDecimal.valueOf(10000f))).intValue() + propertyValue); } Long maxHp = heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId()); @@ -3408,7 +3409,6 @@ public class HeroLogic { public int calForce(Map heroAllAttribute) { float forceNum = 0;//基础值 float forceAdd = 0;//加成值 -// LOGGER.info("战力基础属性=================={}",heroAllAttribute); //战力计算 for(Map.Entry item : heroAllAttribute.entrySet()){ Integer propertyId = item.getKey(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/home/ArchitectureUnLockHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/home/ArchitectureUnLockHandler.java index 0957e497a..6881ede8e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/home/ArchitectureUnLockHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/home/ArchitectureUnLockHandler.java @@ -71,7 +71,7 @@ public class ArchitectureUnLockHandler implements IEventHandler { // 浮生殿等级解锁 ArchitectureInfo beforeInfo = infoMap.get(5); if (beforeInfo == null){ - LOGGER.info("建筑解锁,前置条件浮生殿未解锁,poolId:{}",land.getId()); +// LOGGER.info("建筑解锁,前置条件浮生殿未解锁,poolId:{}",land.getId()); continue; } Integer level = Optional.ofNullable(levelMap.get(beforeInfo.getId())).map(SHomeLandLevel::getlevel).orElse(0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/PowerRiceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/PowerRiceRank.java index 2e6bb0bed..236433b24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/PowerRiceRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/PowerRiceRank.java @@ -28,7 +28,6 @@ public class PowerRiceRank extends AbstractRank implements IEventHandler { public PowerRiceRank(int type, String redisKey) { super(type, redisKey); Poster.getPoster().listenEvent(this, UserMainTeamForceEvent.class); - } @Override