Merge branch 'master_dev' into master_otnew

master_otnew
grimm 2024-01-03 18:56:16 +08:00
commit 619e187dc2
3 changed files with 7 additions and 10 deletions

View File

@ -748,8 +748,8 @@ public class CombatLogic {
return ""; return "";
} }
public Set<Integer> passiveskillEffect(User user,Hero targetHero,int teamId){ public List<Integer> passiveskillEffect(User user,Hero targetHero,int teamId){
Set<Integer> passiveskillEffect = new HashSet<>(); List<Integer> passiveskillEffect = new ArrayList<>();
List<Integer> heroSkillList = HeroLogic.getInstance().getHeroSkillList(user, targetHero); List<Integer> heroSkillList = HeroLogic.getInstance().getHeroSkillList(user, targetHero);
for (Integer skill : heroSkillList) { for (Integer skill : heroSkillList) {
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);

View File

@ -3416,7 +3416,7 @@ public class HeroLogic {
private void applyPassiveSkillAttribute(Map<Integer, Long> heroAllAttribute, Hero hero, int teamId, User user) { 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); // LOGGER.info("战力技能============={}",heroSkillList);
// 大闹天宫队伍特殊处理 // 大闹天宫队伍特殊处理

View File

@ -156,12 +156,11 @@ public class SCHero implements BaseConfig{
// 技能 // 技能
Map<Integer, List<Integer>> skillTmp = new HashMap<>(); Map<Integer, List<Integer>> skillTmp = new HashMap<>();
for(int i=0;i<openSkillRules.length;i++){ for (int[] openSkillRule : openSkillRules) {
int[] openSkillRule = openSkillRules[i];
int star = openSkillRule[0]; int star = openSkillRule[0];
int skillId = openSkillRule[1]; int skillId = openSkillRule[1];
if(!skillTmp.containsKey(star)){ if (!skillTmp.containsKey(star)) {
skillTmp.put(star,new ArrayList<>()); skillTmp.put(star, new ArrayList<>());
} }
skillTmp.get(star).add(skillId); skillTmp.get(star).add(skillId);
} }
@ -181,9 +180,7 @@ public class SCHero implements BaseConfig{
int starOrBreakId = openSkillRule[1]; int starOrBreakId = openSkillRule[1];
int skillId = openSkillRule[2]; int skillId = openSkillRule[2];
passiveSkillMapTmp.get(type).computeIfAbsent(starOrBreakId,a->{ passiveSkillMapTmp.get(type).computeIfAbsent(starOrBreakId,a-> new ArrayList<>(passiveSkillMapTmp.get(type).getOrDefault(a-1,new ArrayList<>())));
return new ArrayList<>(passiveSkillMapTmp.get(type).getOrDefault(a-1,new ArrayList<>()));
});
passiveSkillMapTmp.get(type).get(starOrBreakId).add(skillId); passiveSkillMapTmp.get(type).get(starOrBreakId).add(skillId);
} }
scHero.setPassiveSkillMap(passiveSkillMapTmp); scHero.setPassiveSkillMap(passiveSkillMapTmp);