共鸣装备看不到

DESKTOP-98AVA47\Administrator 2021-10-23 01:36:40 +08:00
parent 5974b1a730
commit 12b92a4250
2 changed files with 46 additions and 4 deletions

View File

@ -1245,7 +1245,11 @@ public class PlayerLogic {
builder.addEquip(CBean2Proto.getEquipProtoyx(jewels.get(equipId),user)); builder.addEquip(CBean2Proto.getEquipProtoyx(jewels.get(equipId),user));
} }
// 装备 // 装备
for(int equipId : hero.getEquipByPositionMap().values()){ Collection<Integer> equipList =hero.getEquipByPositionMap().values();
if(equipList.size() ==0 ){
equipList = hero.getEquipByHongmengPositionMap(user.getHeroManager()).values();
}
for(int equipId : equipList){
heroBuilder.addEquipIdList(equipId); heroBuilder.addEquipIdList(equipId);
builder.addEquip(CBean2Proto.getEquipProto(equipId)); builder.addEquip(CBean2Proto.getEquipProto(equipId));
} }

View File

@ -354,7 +354,7 @@ public class CBean2Proto {
.setFirstOrMini(function); .setFirstOrMini(function);
} }
public static CommonProto.Hero getHero(Hero hero){ public static CommonProto.Hero getHero(Hero hero,HeroManager heroManager){
List<CommonProto.SoulPos> soulPoss = new ArrayList<>(); List<CommonProto.SoulPos> soulPoss = new ArrayList<>();
Map<Integer, Integer> soulEquipMap = hero.getSoulEquipByPositionMap(); Map<Integer, Integer> soulEquipMap = hero.getSoulEquipByPositionMap();
if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){ if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){
@ -365,7 +365,12 @@ public class CBean2Proto {
soulPoss.add(builder.build()); soulPoss.add(builder.build());
} }
} }
//Collection<Integer> equipList = hero.getEquipByHongmengPositionMap(heroManager).values();
Collection<Integer> equipList =hero.getEquipByPositionMap().values();
if(equipList.size() ==0 ){
equipList = hero.getEquipByHongmengPositionMap(heroManager).values();
}
return CommonProto.Hero return CommonProto.Hero
.newBuilder() .newBuilder()
.setId(hero.getId()) .setId(hero.getId())
@ -375,7 +380,8 @@ public class CBean2Proto {
.setBreakId(hero.getBreakId()) .setBreakId(hero.getBreakId())
.setStarBreakId(hero.getStarBreakId()) .setStarBreakId(hero.getStarBreakId())
.setCreateTime(hero.getCreateTime()) .setCreateTime(hero.getCreateTime())
.addAllEquipIdList(hero.getEquipByPositionMap().values()) //.addAllEquipIdList(hero.getEquipByPositionMap().values())
.addAllEquipIdList(equipList)
.setEspecialEquipLevel(hero.getEspecialEquipLevel()) .setEspecialEquipLevel(hero.getEspecialEquipLevel())
.addAllSoulPos(soulPoss) .addAllSoulPos(soulPoss)
.setLockState(hero.getIsLock()) .setLockState(hero.getIsLock())
@ -386,6 +392,38 @@ public class CBean2Proto {
.build(); .build();
} }
public static CommonProto.Hero getHero(Hero hero){
List<CommonProto.SoulPos> soulPoss = new ArrayList<>();
Map<Integer, Integer> soulEquipMap = hero.getSoulEquipByPositionMap();
if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){
for (Map.Entry<Integer,Integer> entry:soulEquipMap.entrySet()){
CommonProto.SoulPos.Builder builder = CommonProto.SoulPos.newBuilder();
builder.setEquipId(entry.getValue());
builder.setPosition(entry.getKey());
soulPoss.add(builder.build());
}
}
return CommonProto.Hero
.newBuilder()
.setId(hero.getId())
.setHeroId(hero.getTemplateId())
.setLevel(hero.getOriginalLevel())
.setStar(hero.getStar())
.setBreakId(hero.getBreakId())
.setStarBreakId(hero.getStarBreakId())
.setCreateTime(hero.getCreateTime())
.addAllEquipIdList(hero.getEquipByPositionMap().values())
.setEspecialEquipLevel(hero.getEspecialEquipLevel())
.addAllSoulPos(soulPoss)
.setLockState(hero.getIsLock())
.addAllJewels(hero.getJewelInfo())
.setCreatetype(hero.getCreateType())
.setChangeId(hero.getChangeId())
.setSkinId(hero.getSkin())
.build();
}
/*** /***
* 鸿 * 鸿
* @param hero * @param hero
@ -393,7 +431,7 @@ public class CBean2Proto {
* @return * @return
*/ */
public static CommonProto.Hero getHeroByHongMeng(Hero hero,HeroManager heroManager){ public static CommonProto.Hero getHeroByHongMeng(Hero hero,HeroManager heroManager){
CommonProto.Hero hero1 = getHero(hero); CommonProto.Hero hero1 = getHero(hero,heroManager);
CommonProto.Hero.Builder builder = hero1.toBuilder(); CommonProto.Hero.Builder builder = hero1.toBuilder();
builder.setLevel(hero.getLevel(heroManager)); builder.setLevel(hero.getLevel(heroManager));
builder.setBreakId(hero.getBreakIdByHongMeng(heroManager)); builder.setBreakId(hero.getBreakIdByHongMeng(heroManager));