From 747d2e4a5344334aba247dc29ef2777d00630cbf Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 2 Apr 2019 17:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E9=9B=84=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=9F=E5=91=BD=E6=9E=9A=E4=B8=BE=E5=80=BC=E4=B8=BA?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java index 3fc17936d..935c21b84 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.logic.hero; public enum HeroAttributeEnum { - CurHP(0), + CurHP(6), Hp(1), Attack(2), PhysicalDefence(3), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 9d20b7dd4..596d8d9a1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -725,6 +725,7 @@ public class HeroLogic { //获取英雄所有属性 public Map calHeroFinalAttribute(User user, Hero hero){ Map heroAllAttribute = calHeroAllAttribute(hero); + heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),(int)hero.getCurHp()); Collection values = hero.getEquipByPositionMap().values(); EquipManager equipManager = user.getEquipManager(); PokemonManager pokemonManager = user.getPokemonManager(); @@ -751,7 +752,6 @@ public class HeroLogic { //食物buffer加成 Map foodAddMap = CombatLogic.getInstance().attributeByEatFood(user,GlobalsDef.FOOD_ADDITION_EXPLORE_TYPE, GlobalsDef.FOOD_EAT_AFFECT_TEAM); combinedAttribute(foodAddMap,heroAllAttribute); - heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),(int)hero.getCurHp()); return heroAllAttribute; }