From 56f9773f7b30c80ad95bc58cae05f8630b36237c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 4 Aug 2021 10:51:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=9B=BE=E9=89=B4=E6=BF=80=E6=B4=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/pokemon/AllBookEnableHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java index 47de7395d..15abceab6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.handler.pokemon; +import com.ljsd.jieling.exception.ErrorCode; +import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.session.ISession; @@ -21,6 +23,7 @@ public class AllBookEnableHandler extends BaseHandler Date: Wed, 4 Aug 2021 16:56:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B7=A8=E6=9C=8Dbug=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/crossService/CrossServiceLogic.java | 2 +- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 4771cc7ed..1ae2e81b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -214,7 +214,7 @@ public class CrossServiceLogic { if (collect.isEmpty()){ continue; } - Map attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId); + Map attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId); arenaOfHero.putAttributeMapByTeam(teamId,attribute); } return arenaOfHero; 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 7a60d3328..bab98690f 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 @@ -774,10 +774,16 @@ public class PlayerLogic { Map heroNotBufferAttribute = hero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>()); for(Map.Entry item : heroNotBufferAttribute.entrySet()){ - builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(item.getKey()).setPropertyValue(item.getValue().intValue()).build()); + int id = item.getKey(); + int values = item.getValue().intValue(); + if (id == 53 || id == 57 || id == 58){ + values = item.getValue().intValue()-10000; + } + builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); } Map jewels = query.getHeroManager().getJewels(); for(String equipId : hero.getJewelInfo()){ + heroBuilder.addJewels(equipId); builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId))); } for(int equipId : hero.getEquipByPositionMap().values()){ From 0de9a4ee309ec519027e0a742cdec429885d125e Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 4 Aug 2021 17:50:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=BC=80=E5=9B=BE=E9=89=B4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java index 15abceab6..309c46f62 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/AllBookEnableHandler.java @@ -23,7 +23,6 @@ public class AllBookEnableHandler extends BaseHandler