Merge branch 'master_dev' into master_otnew
commit
d1410377a6
|
@ -3944,7 +3944,7 @@ public class HeroLogic {
|
|||
totalForce += playerSkill.getFight();
|
||||
}
|
||||
}
|
||||
LOGGER.info("calTeamTotalForce uid={} 总战力={} 耗时={}", targetUser.getId(), totalForce, TimeUtils.now() - now);
|
||||
LOGGER.info("calTeamTotalForce uid={} teamId={} 总战力={} 耗时={}ms", targetUser.getId(), teamId, totalForce, TimeUtils.now() - now);
|
||||
return totalForce;
|
||||
}
|
||||
|
||||
|
@ -7015,7 +7015,7 @@ public class HeroLogic {
|
|||
int result = 0;
|
||||
for (Integer id : set) {
|
||||
SEquipConfig config = configMap.get(id);
|
||||
if (config == null || config.getPotentialNew() == null) {
|
||||
if (config == null || config.getPotentialNew() == null || config.getPotentialNew().length == 0) {
|
||||
continue;
|
||||
}
|
||||
result += config.getPotentialNew()[1];
|
||||
|
|
Loading…
Reference in New Issue