Merge branch 'master_dev' into master_otnew
commit
43a2c16a99
|
|
@ -2136,7 +2136,7 @@ public class HeroLogic {
|
|||
skillList.addAll(godSoulSkills);
|
||||
}
|
||||
|
||||
///法宝之魂共鸣技能
|
||||
//法宝之魂共鸣技能(法宝之魂)
|
||||
Map<Integer, Integer> trumpBookStarMap = heroVo.getTrumpBookStarMap();
|
||||
if (!trumpBookStarMap.isEmpty()) {
|
||||
List<Integer> faBaoSoulSkills = new ArrayList<>();
|
||||
|
|
@ -2149,7 +2149,7 @@ public class HeroLogic {
|
|||
if (entry.getValue() == 0){
|
||||
continue;
|
||||
}
|
||||
int xiuxianSkillId = trumpBook.getSkillList()[entry.getValue() - 1][0];
|
||||
int xiuxianSkillId = trumpBook.getSkillList()[entry.getValue() - 1][1];
|
||||
SXiuXianSkill sXiuXianSkill = STableManager.getConfig(SXiuXianSkill.class).get(xiuxianSkillId);
|
||||
if (sXiuXianSkill == null){
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in New Issue