法相加入容错
parent
42efebd71a
commit
7b6fb24a7c
|
@ -3100,8 +3100,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);
|
||||||
|
|
|
@ -1055,8 +1055,10 @@ public class PlayerLogic {
|
||||||
// 法相
|
// 法相
|
||||||
for(String key : hero.getFaxiangList()){
|
for(String key : hero.getFaxiangList()){
|
||||||
PropertyItem faxiang = equipManager.getEquip(key);
|
PropertyItem faxiang = equipManager.getEquip(key);
|
||||||
|
if(faxiang != null){
|
||||||
builder.addEquip(CBean2Proto.getPropertyEquipProto(faxiang));
|
builder.addEquip(CBean2Proto.getPropertyEquipProto(faxiang));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// 法宝
|
// 法宝
|
||||||
Baubles baubles = equipManager.getBaubles(hero.getBauBlesId());
|
Baubles baubles = equipManager.getBaubles(hero.getBauBlesId());
|
||||||
if (baubles != null){
|
if (baubles != null){
|
||||||
|
|
Loading…
Reference in New Issue