From 9de88982e21c979f92e2345df97f274f4e7c0131 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 23 Nov 2020 14:31:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D15?= =?UTF-8?q?=E6=94=BB=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){ From 5640521082b03f0ec8748bb58a9833749e9fce26 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 23 Nov 2020 15:18:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tablemanager/src/main/java/config/SSpecialConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index 161863eec..58288b87d 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -85,6 +85,7 @@ public class SSpecialConfig implements BaseConfig { public static final String ANIMAL_BROADCAST_QUALITY = "animal_broadcast_quality"; public static final String ITEM_1004_RETRIEVE = "item_1004_retrieve";// 结算补发道具16 # 50 + public static final String SKILL_EFFECT_TGMB = "skill_effect_tgmb";//天宫秘宝购买特权带来的攻击提升万分比(只在天宫生效) @Override public void init() throws Exception {