From dc5792aa0fd63912855bb791b359850143ffaf28 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 8 Jun 2020 16:59:02 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E3=80=90ID1007767=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=89=B9=E6=9D=83=E3=80=91=E8=BF=B7=E5=AE=AB=E5=AF=BB=E5=AE=9D?= =?UTF-8?q?=E6=9C=AA=E8=A7=A3=E9=94=81=EF=BC=8C=E5=88=B7=E6=96=B0=E8=BF=B7?= =?UTF-8?q?=E5=AE=AB=E5=AF=BB=E5=AE=9D=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 19 +++++++++++++++++-- .../data/RefreshMissionRoomMamager.java | 2 +- .../src/main/java/config/SVipLevelConfig.java | 3 +++ 3 files changed, 21 insertions(+), 3 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 657cdca1b..28abdc6c8 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 @@ -1427,13 +1427,11 @@ public class HeroLogic{ if(teamId!=0){ int[][] elementEffect = CombatLogic.getInstance().elementEffect(user,teamId); - if (elementEffect!=null&&elementEffect.length>0){ combinedAttribute(elementEffect,heroAllAttribute); } } - //被动技能加成 List heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId); Map heroSkillAdMap = new HashMap<>(); @@ -1449,6 +1447,23 @@ public class HeroLogic{ heroSkillAdMap.clear(); } + //特权加成 + int vipLevel = user.getPlayerInfoManager().getVipLevel(); + SVipLevelConfig sVipLevelConfig = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel); + if(null!=sVipLevelConfig){ + int[][] elementEffect =sVipLevelConfig.getProperty(); + if (elementEffect!=null&&elementEffect.length>0) { + combinedAttribute(elementEffect,heroAllAttribute); + } + } + + //移除非pvp队伍加成 + + if(teamId!=GlobalsDef.TEAM_ARENA_ATTACH&&teamId!=GlobalsDef.TEAM_ARENA_DEFENSE){ + heroAllAttribute.remove(HeroAttributeEnum.PVPDamageBocusFactor.getPropertyId()); + heroAllAttribute.remove(HeroAttributeEnum.PVPDamageReduceFactor.getPropertyId()); + } + calInteractAdd(heroAllAttribute); heroSkillList.forEach(skill->{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RefreshMissionRoomMamager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RefreshMissionRoomMamager.java index 4517cacdf..fce18c650 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RefreshMissionRoomMamager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RefreshMissionRoomMamager.java @@ -6,7 +6,7 @@ import com.ljsd.jieling.logic.mission.MissionType; public class RefreshMissionRoomMamager implements BaseDataManager{ @Override public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { - data.refreshMrTimes++; + data.refreshMrTimes+=(int)parm[0]; return new CumulationData.Result(missionType); } } diff --git a/tablemanager/src/main/java/config/SVipLevelConfig.java b/tablemanager/src/main/java/config/SVipLevelConfig.java index 86ff4fb35..8e8d85235 100644 --- a/tablemanager/src/main/java/config/SVipLevelConfig.java +++ b/tablemanager/src/main/java/config/SVipLevelConfig.java @@ -71,4 +71,7 @@ public class SVipLevelConfig implements BaseConfig { return money2vip; } + public int[][] getProperty() { + return property; + } } \ No newline at end of file