diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java index 42fb8a9b1..4f7e835d9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java @@ -87,6 +87,8 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler= timeControllerOfFunction.getStartTime() && yuxulundaoTime <= timeControllerOfFunction.getEndTime()) { builder.setIsFirst(false); } else { @@ -113,6 +115,8 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler propertyValueByIdMap = equip.getPropertyValueByIdMap(); + Map secondValueByIdMap = equip.getSecondValueByIdMap(); + CommonProto.Equip.Builder equipProto =CommonProto.Equip.newBuilder() + .setEquipId(equip.getEquipId()) + .setId(equip.getId()) + .setCreateTime(equip.getCreateTime()) + .setIsLocked(equip.getIsLocked()); + if(equip instanceof Equip){ + Equip tempEquip =(Equip)equip; + equipProto .addAllSecondAttribute(parseFromMap(secondValueByIdMap)) + .setRebuildLevel(tempEquip.getRebuildLevel()) + .setSkillId(tempEquip.getSkill()); + } + if(equip instanceof Jewel){ + Jewel tempEquip =(Jewel)equip; + equipProto.setRebuildLevel(tempEquip.getBuildLevel()) + .setExp(tempEquip.getLevel()).setTreeLv(user.getPlayerInfoManager().getTreeLevel()); + } + return equipProto.build(); + } //玉虚论道 public static CommonProto.Equip getEquipProto(com.ljsd.jieling.thrift.idl.PropertyItem equip,int treeLv){