Merge branch 'master_test_gn' into master_prb_gn

back_recharge
duhui 2021-07-06 10:52:30 +08:00
commit f99d167acb
1 changed files with 9 additions and 10 deletions

View File

@ -1681,17 +1681,16 @@ public class HeroLogic{
//法宝技能
int[] equipTalismana = tempHero.getEquipTalismana();
if(equipTalismana.length<1 ||hero.getStar()<equipTalismana[0]){
return skillList;
if(equipTalismana.length >= 2 && hero.getStar() >= equipTalismana[0]){
int especialEquipLevel = hero.getEspecialEquipLevelByHongmeng(user.getHeroManager(),hero.getId());
int especialEquipId = equipTalismana[1];
Map<Integer,SEquipTalismana> sEquipTalismana = SEquipTalismana.equipTalismanaStarMap.get(especialEquipId);
sEquipTalismana.forEach((k,v)->{
if(k<=especialEquipLevel&&v.getOpenSkillRules()!=null){
Arrays.stream(v.getOpenSkillRules()).forEach(skillList::add);
}
});
}
int especialEquipLevel = hero.getEspecialEquipLevelByHongmeng(user.getHeroManager(),hero.getId());
int especialEquipId = equipTalismana[1];
Map<Integer,SEquipTalismana> sEquipTalismana = SEquipTalismana.equipTalismanaStarMap.get(especialEquipId);
sEquipTalismana.forEach((k,v)->{
if(k<=especialEquipLevel&&v.getOpenSkillRules()!=null){
Arrays.stream(v.getOpenSkillRules()).forEach(i->skillList.add(i));
}
});
// 紫府神印技能
Collection<PurpleMansionSeal> seals = user.getHeroManager().getPurpleMansionSeal().values();