Merge branch 'master' of 60.1.1.230:backend/jieling_server

back_recharge
wangyuan 2019-08-12 11:15:51 +08:00
commit cff26b2110
1 changed files with 7 additions and 5 deletions

View File

@ -996,11 +996,13 @@ public class HeroLogic {
}
//阵营光环加成
if(!isForce){
List<int[][]> elementEffect = CombatLogic.getInstance().elementEffect(user,teamId);
Iterator it = elementEffect.iterator();
while (it.hasNext()){
int[][] effect = (int[][])it.next();
combinedAttribute(effect,heroAllAttribute);
if(teamId!=0){
List<int[][]> elementEffect = CombatLogic.getInstance().elementEffect(user,teamId);
Iterator it = elementEffect.iterator();
while (it.hasNext()){
int[][] effect = (int[][])it.next();
combinedAttribute(effect,heroAllAttribute);
}
}
}
calInteractAdd(heroAllAttribute);