Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
cff26b2110
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue