Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

DESKTOP-98AVA47\Administrator 2020-12-28 05:05:22 +08:00
commit 6141729602
3 changed files with 15 additions and 7 deletions

View File

@ -784,13 +784,13 @@ public class CombatLogic {
} }
}); });
} }
if(teamId == GlobalsDef.EXPEDITION_TEAM){ // if(teamId == GlobalsDef.EXPEDITION_TEAM){
user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes().keySet().forEach(id->{ // user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes().keySet().forEach(id->{
for(int passId : SRechargeCommodityConfig.rechargeCommodityConfigMap.get(id).getPassiveSkill()) { // for(int passId : SRechargeCommodityConfig.rechargeCommodityConfigMap.get(id).getPassiveSkill()) {
passiveTeamskillEffect.add(passId); // passiveTeamskillEffect.add(passId);
} // }
}); // });
} // }
user.getTeamPosManager().updatePassSkillTeamPos(teamId,passiveTeamskillEffect); user.getTeamPosManager().updatePassSkillTeamPos(teamId,passiveTeamskillEffect);
passiveskillEffect.addAll(passiveTeamskillEffect); passiveskillEffect.addAll(passiveTeamskillEffect);
}else{ }else{

View File

@ -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队伍加成 //移除非pvp队伍加成
if(teamId!=GlobalsDef.TEAM_ARENA_ATTACH&&teamId!=GlobalsDef.TEAM_ARENA_DEFENSE){ if(teamId!=GlobalsDef.TEAM_ARENA_ATTACH&&teamId!=GlobalsDef.TEAM_ARENA_DEFENSE){

View File

@ -85,6 +85,7 @@ public class SSpecialConfig implements BaseConfig {
public static final String ANIMAL_BROADCAST_QUALITY = "animal_broadcast_quality"; 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 ITEM_1004_RETRIEVE = "item_1004_retrieve";// 结算补发道具16 # 50
public static final String SKILL_EFFECT_TGMB = "skill_effect_tgmb";//天宫秘宝购买特权带来的攻击提升万分比(只在天宫生效)
@Override @Override
public void init() throws Exception { public void init() throws Exception {