Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
commit
b64c22c7a9
|
@ -3741,12 +3741,17 @@ public class HeroLogic {
|
|||
}
|
||||
totalForce += force;
|
||||
}
|
||||
LOGGER.info("calTeamTotalForce uid={} 总战力={}", targetUser.getId(), totalForce);
|
||||
//TODO
|
||||
// if(SimpleTransaction.current()!=null&&SimpleTransaction.current().getSession().getId().equals(heroid)){
|
||||
targetUser.getPlayerInfoManager().setMaxforceHero(heroid);
|
||||
// }
|
||||
|
||||
///计算修行技能战力加成
|
||||
Map<Integer, Integer>practiceSkillMap=targetUser.getHeroManager().getPracticeSkillMap();
|
||||
for (Map.Entry<Integer, Integer> entry : practiceSkillMap.entrySet()) {
|
||||
SPlayerSkill playerSkill = SPlayerSkill.GetSPlayerSkill(entry.getKey(), entry.getValue());
|
||||
if (playerSkill!=null){
|
||||
totalForce+=playerSkill.getFight();
|
||||
}
|
||||
}
|
||||
LOGGER.info("calTeamTotalForce uid={} 总战力={}", targetUser.getId(), totalForce);
|
||||
return totalForce;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,8 @@ public class SPlayerSkill implements BaseConfig {
|
|||
|
||||
private int[] turnEffectCount;
|
||||
|
||||
private int fight;//技能战斗力加成
|
||||
|
||||
private static Map<Integer, Map<Integer,SPlayerSkill>>mapData;
|
||||
|
||||
public static Map<Integer,SPlayerSkill> sPrivilegeTypeConfigMap;
|
||||
|
@ -99,6 +101,10 @@ public class SPlayerSkill implements BaseConfig {
|
|||
return turnEffectCount;
|
||||
}
|
||||
|
||||
public int getFight() {
|
||||
return fight;
|
||||
}
|
||||
|
||||
public static SPlayerSkill GetSPlayerSkill(int skillId, int skillLv){
|
||||
if (!mapData.containsKey(skillId)||!mapData.get(skillId).containsKey(skillLv))return null;
|
||||
return mapData.get(skillId).get(skillLv);
|
||||
|
|
Loading…
Reference in New Issue