增加法相容错

master_xiyou_zhibo
DESKTOP-C3M45P4\dengdan 2024-12-27 17:13:35 +08:00
parent 57806bd9c5
commit 86217b7bca
2 changed files with 9 additions and 2 deletions

View File

@ -3122,8 +3122,13 @@ public class HeroLogic {
if (!faxiangList.isEmpty()) { if (!faxiangList.isEmpty()) {
for (String id : faxiangList) { for (String id : faxiangList) {
PropertyItem faxiang = equipManager.getEquip(id); PropertyItem faxiang = equipManager.getEquip(id);
if(faxiang == null){
continue;
}
SFaxiangConfig config = SFaxiangConfig.faxiangMap.get(faxiang.getEquipId()); SFaxiangConfig config = SFaxiangConfig.faxiangMap.get(faxiang.getEquipId());
if(config == null){
continue;
}
// 潜能加成 // 潜能加成
int potentialType = config.getType() == 0 ? 7 : 8; int potentialType = config.getType() == 0 ? 7 : 8;
int potentialBuff = getPotentialBuff(user, hero, potentialType); int potentialBuff = getPotentialBuff(user, hero, potentialType);

View File

@ -1038,7 +1038,9 @@ public class PlayerLogic {
// 法相 // 法相
for(String key : hero.getFaxiangList()){ for(String key : hero.getFaxiangList()){
PropertyItem faxiang = equipManager.getEquip(key); PropertyItem faxiang = equipManager.getEquip(key);
builder.addEquip(CBean2Proto.getPropertyEquipProto(faxiang)); if(faxiang != null){
builder.addEquip(CBean2Proto.getPropertyEquipProto(faxiang));
}
} }
// 法宝 // 法宝
Baubles baubles = equipManager.getBaubles(hero.getBauBlesId()); Baubles baubles = equipManager.getBaubles(hero.getBauBlesId());