From 06c60f4d0ab2d806f604290a71027e110f5b7870 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Sat, 16 Oct 2021 15:05:29 +0800 Subject: [PATCH] =?UTF-8?q?yx=E6=9F=A5=E7=9C=8B=E8=8B=B1=E9=9B=84=E5=AE=9D?= =?UTF-8?q?=E7=89=A9=E6=95=B0=E5=AD=97=E5=8F=B3=E4=B8=8A=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/CoreService.java | 8 +++++--- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index f304f7a79..1d7eb3e05 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -132,7 +132,7 @@ public class CoreService implements RPCRequestIFace.Iface { Map equipMap = user.getEquipManager().getEquipMap(); heroMap.values().forEach(v-> v.getJewelInfo().forEach(v2->{ com.ljsd.jieling.logic.dao.PropertyItem item = equipMap.get(v2); - jewels.put(v2,buildrprcPropertyItem(item)); + jewels.put(v2,buildrprcPropertyItem(item,user,v)); })); HashMap map = new HashMap<>(); teams.forEach((k,v)->{ @@ -185,12 +185,13 @@ public class CoreService implements RPCRequestIFace.Iface { } return null; } - private PropertyItem buildrprcPropertyItem(com.ljsd.jieling.logic.dao.PropertyItem propertyItem){ + private PropertyItem buildrprcPropertyItem(com.ljsd.jieling.logic.dao.PropertyItem propertyItem,User user,Hero hero){ PropertyItem rpcPropertyItem = new PropertyItem(); rpcPropertyItem.setId(propertyItem.getId()); rpcPropertyItem.setEquipId(propertyItem.getEquipId()); - rpcPropertyItem.setLevel(propertyItem.getLevel()); + //tempEquip.getLevelByHongMeng(user.getHeroManager(),heroId) + //rpcPropertyItem.setLevel(propertyItem.getLevelByHongMeng()); rpcPropertyItem.setHeroId(propertyItem.getHeroId()); rpcPropertyItem.setPropertyValueByIdMap(propertyItem.getPropertyValueByIdMap()); rpcPropertyItem.setSecondValueByIdMap(propertyItem.getSecondValueByIdMap()); @@ -200,6 +201,7 @@ public class CoreService implements RPCRequestIFace.Iface { if(propertyItem instanceof Jewel){ Jewel tempEquip =(Jewel)propertyItem; rpcPropertyItem.setRebuildLevel(tempEquip.getBuildLevel()); + rpcPropertyItem.setLevel(tempEquip.getLevelByHongMeng(user.getHeroManager(),hero.getId())); } return rpcPropertyItem; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 1f6f34f7e..a3039d8e6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1177,9 +1177,9 @@ public class PlayerLogic { for(Map.Entry item : heroNotBufferAttribute.entrySet()){ int id = item.getKey(); int values = item.getValue().intValue(); - if (id == 53 || id == 57 || id == 58){ + /*if (id == 53 || id == 57 || id == 58){ values = item.getValue().intValue()-10000; - } + }*/ builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); } Map jewels = crossArenaManager.getJewels(); @@ -1224,9 +1224,9 @@ public class PlayerLogic { for(Map.Entry item : heroNotBufferAttribute.entrySet()){ int id = item.getKey(); int values = item.getValue().intValue(); - if (id == 53 || id == 57 || id == 58){ + /*if (id == 53 || id == 57 || id == 58){ values = item.getValue().intValue()-10000; - } + }*/ builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); }