Merge branch 'master_dev' into master_otnew
commit
619e187dc2
|
@ -748,8 +748,8 @@ public class CombatLogic {
|
|||
return "";
|
||||
}
|
||||
|
||||
public Set<Integer> passiveskillEffect(User user,Hero targetHero,int teamId){
|
||||
Set<Integer> passiveskillEffect = new HashSet<>();
|
||||
public List<Integer> passiveskillEffect(User user,Hero targetHero,int teamId){
|
||||
List<Integer> passiveskillEffect = new ArrayList<>();
|
||||
List<Integer> heroSkillList = HeroLogic.getInstance().getHeroSkillList(user, targetHero);
|
||||
for (Integer skill : heroSkillList) {
|
||||
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);
|
||||
|
|
|
@ -3416,7 +3416,7 @@ public class HeroLogic {
|
|||
|
||||
private void applyPassiveSkillAttribute(Map<Integer, Long> heroAllAttribute, Hero hero, int teamId, User user) {
|
||||
// ...被动技能处理...
|
||||
Set<Integer> heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero, teamId);
|
||||
List<Integer> heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero, teamId);
|
||||
// LOGGER.info("战力技能============={}",heroSkillList);
|
||||
|
||||
// 大闹天宫队伍特殊处理
|
||||
|
|
|
@ -156,12 +156,11 @@ public class SCHero implements BaseConfig{
|
|||
// 技能
|
||||
Map<Integer, List<Integer>> skillTmp = new HashMap<>();
|
||||
|
||||
for(int i=0;i<openSkillRules.length;i++){
|
||||
int[] openSkillRule = openSkillRules[i];
|
||||
for (int[] openSkillRule : openSkillRules) {
|
||||
int star = openSkillRule[0];
|
||||
int skillId = openSkillRule[1];
|
||||
if(!skillTmp.containsKey(star)){
|
||||
skillTmp.put(star,new ArrayList<>());
|
||||
if (!skillTmp.containsKey(star)) {
|
||||
skillTmp.put(star, new ArrayList<>());
|
||||
}
|
||||
skillTmp.get(star).add(skillId);
|
||||
}
|
||||
|
@ -181,9 +180,7 @@ public class SCHero implements BaseConfig{
|
|||
int starOrBreakId = openSkillRule[1];
|
||||
int skillId = openSkillRule[2];
|
||||
|
||||
passiveSkillMapTmp.get(type).computeIfAbsent(starOrBreakId,a->{
|
||||
return new ArrayList<>(passiveSkillMapTmp.get(type).getOrDefault(a-1,new ArrayList<>()));
|
||||
});
|
||||
passiveSkillMapTmp.get(type).computeIfAbsent(starOrBreakId,a-> new ArrayList<>(passiveSkillMapTmp.get(type).getOrDefault(a-1,new ArrayList<>())));
|
||||
passiveSkillMapTmp.get(type).get(starOrBreakId).add(skillId);
|
||||
}
|
||||
scHero.setPassiveSkillMap(passiveSkillMapTmp);
|
||||
|
|
Loading…
Reference in New Issue