Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
6141729602
|
@ -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{
|
||||
|
|
|
@ -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){
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
Loading…
Reference in New Issue