diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 9d762c2f6..20a6fcb76 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -166,9 +166,12 @@ public class MapManager extends MongoBase { public void eatFood(int foodId,int remainStep){ + if(remainStep == 0){ + remainStep = -1; //表示一次性生效 + } int finalRemainStep = remainStep; if(this.foodBufferMap.containsKey(foodId)){ - finalRemainStep = this.foodBufferMap.get(foodId); + finalRemainStep += this.foodBufferMap.get(foodId); } this.foodBufferMap.put(foodId,finalRemainStep); updateString( "foodBuffers."+foodId, this.foodBufferMap.get(foodId)); @@ -183,6 +186,9 @@ public class MapManager extends MongoBase { for(Map.Entry item : entries){ Integer foodId = item.getKey(); Integer remainStep = item.getValue(); + if(remainStep < 0){ + continue; + } int finalRemainStep = remainStep - step; if(finalRemainStep<=0){ removeFoodIds.add(foodId); 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; }