From 9de88982e21c979f92e2345df97f274f4e7c0131 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 23 Nov 2020 14:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D15=E6=94=BB?= =?UTF-8?q?=E5=87=BB=E5=8A=9B=E5=8A=A0=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/fight/CombatLogic.java | 14 +++++++------- .../com/ljsd/jieling/logic/hero/HeroLogic.java | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) 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 82adc5190..37511f5ad 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 @@ -784,13 +784,13 @@ public class CombatLogic { } }); } - if(teamId == GlobalsDef.EXPEDITION_TEAM){ - user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes().keySet().forEach(id->{ - for(int passId : SRechargeCommodityConfig.rechargeCommodityConfigMap.get(id).getPassiveSkill()) { - passiveTeamskillEffect.add(passId); - } - }); - } +// if(teamId == GlobalsDef.EXPEDITION_TEAM){ +// user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes().keySet().forEach(id->{ +// for(int passId : SRechargeCommodityConfig.rechargeCommodityConfigMap.get(id).getPassiveSkill()) { +// passiveTeamskillEffect.add(passId); +// } +// }); +// } user.getTeamPosManager().updatePassSkillTeamPos(teamId,passiveTeamskillEffect); passiveskillEffect.addAll(passiveTeamskillEffect); }else{ 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 2330adea0..13ef462bf 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 @@ -1783,6 +1783,13 @@ public class HeroLogic{ } } + if(teamId==GlobalsDef.EXPEDITION_TEAM){ + if(user.getExpeditionManager().getWorldTreasureReward().getIsBuy()==1){ + int[] onceArrayValue = SSpecialConfig.getOnceArrayValue(SSpecialConfig.SKILL_EFFECT_TGMB); + combinedAttribute(new int[][]{onceArrayValue},heroAllAttribute); + } + } + //移除非pvp队伍加成 if(teamId!=GlobalsDef.TEAM_ARENA_ATTACH&&teamId!=GlobalsDef.TEAM_ARENA_DEFENSE){