root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_dev' into master_otnew

master_otnew
grimm 2023-12-29 15:31:00 +08:00
parent ecc76d4e87 1b9cbd6f25
commit 9aa8d5333f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
View File

@ -252,12 +252,15 @@ public class CBean2Proto {
List<CommonProto.Equip> jewels = buildHelpFightEquip(helpHero.getJewels());
// 法相
List<CommonProto.Equip> faxiang = buildHelpFightEquip(helpHero.getFaxiangs());
Hero hero = helpHero.getHero();
// 装备详细信息
Hero hero = helpHero.getHero();
List<CommonProto.Equip> equips = new ArrayList<>();
hero.getEquipByPositionMap().values().forEach(v->equips.add(getEquipProto(v)));
// 法宝
CommonProto.Equip baublesProto = getBaublesProto(helpHero.getBaublesList(), helpHero.getBaubles());
CommonProto.Equip.Builder baublesProto = null;
if (helpHero.getBaubles() != null){
baublesProto = getBaublesProto(helpHero.getBaublesList(), helpHero.getBaubles()).toBuilder();
}
// 获取英雄信息
return CommonProto.HelpFightList.newBuilder()
.setUid(otherUser.getId())