Merge branch 'dev_dh_bt' into bt/newhero
commit
b2f025713d
|
@ -201,6 +201,11 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
|
||||||
updateString("faxiangList",faxiangList);
|
updateString("faxiangList",faxiangList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFaxiang(Set<String> list) {
|
||||||
|
faxiangList = list;
|
||||||
|
updateString("faxiangList",faxiangList);
|
||||||
|
}
|
||||||
|
|
||||||
public void uninstallFaxiang(String key) {
|
public void uninstallFaxiang(String key) {
|
||||||
this.faxiangList.remove(key);
|
this.faxiangList.remove(key);
|
||||||
updateString("faxiangList",faxiangList);
|
updateString("faxiangList",faxiangList);
|
||||||
|
|
|
@ -74,13 +74,13 @@ public class EquipLogic {
|
||||||
for (String faxiangId : heroFaxiangList) {
|
for (String faxiangId : heroFaxiangList) {
|
||||||
Faxiang heroFaxiang = equipManager.getFaxiang(faxiangId);
|
Faxiang heroFaxiang = equipManager.getFaxiang(faxiangId);
|
||||||
if (heroFaxiang == null){
|
if (heroFaxiang == null){
|
||||||
hero.uninstallFaxiang(faxiangId);
|
removeList.add(faxiangId);
|
||||||
LOGGER.error("法相不存在装备库中,已卸载,uid:{}, hero:{}, faxiang:{}",user.getId(),heroID,faxiangId);
|
LOGGER.error("法相不存在装备库中,已卸载,uid:{}, hero:{}, faxiang:{}",user.getId(),heroID,faxiangId);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
SFaxiangConfig heroFaxiangConfig = SFaxiangConfig.faxiangMap.get(heroFaxiang.getItemId());
|
SFaxiangConfig heroFaxiangConfig = SFaxiangConfig.faxiangMap.get(heroFaxiang.getItemId());
|
||||||
if (heroFaxiangConfig == null){
|
if (heroFaxiangConfig == null){
|
||||||
hero.uninstallFaxiang(faxiangId);
|
removeList.add(faxiangId);
|
||||||
LOGGER.error("法相不存在配置表中,已卸载,uid:{}, hero:{}, faxiang:{}",user.getId(),heroID,faxiangId);
|
LOGGER.error("法相不存在配置表中,已卸载,uid:{}, hero:{}, faxiang:{}",user.getId(),heroID,faxiangId);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4448,10 +4448,13 @@ public class HeroLogic {
|
||||||
// 法相
|
// 法相
|
||||||
Set<String> faxiangList = hero.getFaxiangList();
|
Set<String> faxiangList = hero.getFaxiangList();
|
||||||
if (faxiangList != null && !faxiangList.isEmpty()){
|
if (faxiangList != null && !faxiangList.isEmpty()){
|
||||||
for (String key : faxiangList) {
|
Iterator<String> iterator = faxiangList.iterator();
|
||||||
hero.uninstallFaxiang(key);
|
while (iterator.hasNext()){
|
||||||
user.getEquipManager().unloadFaxiang(key);
|
String next = iterator.next();
|
||||||
|
user.getEquipManager().unloadFaxiang(next);
|
||||||
|
iterator.remove();
|
||||||
}
|
}
|
||||||
|
hero.setFaxiang(faxiangList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int breakId = hero.getBreakId();
|
int breakId = hero.getBreakId();
|
||||||
|
|
|
@ -1270,8 +1270,20 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
EquipManager equipManager = userInMem.getEquipManager();
|
EquipManager equipManager = userInMem.getEquipManager();
|
||||||
Map<String, PropertyItem> equipMap = equipManager.getEquipMap();
|
Map<String, PropertyItem> equipMap = equipManager.getEquipMap();
|
||||||
for(String equipId : hero.getJewelInfo()){
|
// 宝器
|
||||||
CommonProto.Equip.Builder toBuilder = CBean2Proto.getEquipProto(equipMap.get(equipId),userInMem).toBuilder();
|
for(String equipId : hero.getJewelInfo()){
|
||||||
|
PropertyItem propertyItem = equipMap.get(equipId);
|
||||||
|
Jewel jewel = null;
|
||||||
|
if (propertyItem instanceof Jewel){
|
||||||
|
jewel = (Jewel) propertyItem;
|
||||||
|
}else {
|
||||||
|
jewel = equipManager.getJewelMap().get(equipId);
|
||||||
|
if (jewel == null){
|
||||||
|
LOGGER.error("查看英雄信息,法宝找不到:{}",equipId);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CommonProto.Equip.Builder toBuilder = CBean2Proto.getEquipProto(jewel,userInMem).toBuilder();
|
||||||
builder.addEquip(toBuilder);
|
builder.addEquip(toBuilder);
|
||||||
}
|
}
|
||||||
for(int equipId : hero.getEquipByHongmengPositionMap(userInMem.getHeroManager()).values()){
|
for(int equipId : hero.getEquipByHongmengPositionMap(userInMem.getHeroManager()).values()){
|
||||||
|
|
Loading…
Reference in New Issue