diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index 5aabbbd94..8b36e1fa9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -106,6 +106,8 @@ public class SGameSetting implements BaseConfig { private int adventureItem; + private int[] equipTalismanaUnlock; + private static SGameSetting gameSetting; @@ -313,4 +315,8 @@ public class SGameSetting implements BaseConfig { public int getAdventureItem() { return adventureItem; } + + public int[] getEquipTalismanaUnlock() { + return equipTalismanaUnlock; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 2d4383ae1..d6e39b893 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1293,7 +1293,7 @@ public class MapLogic { Map heroAllAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero,false,teamId); int per = (int)(checkResult[i+2] / (double) heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId())*10000); mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),per); - if(heroAllAttribute.get(HeroAttributeEnum.CurHP.getPropertyId())==0){ + if(mapManager.getHeroAllAttributeMap().get(hero.getId()).get(HeroAttributeEnum.CurHP.getPropertyId())==0){ mapManager.removeOneHeroAttribute(hero.getId()); }else{ mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]); @@ -1543,7 +1543,7 @@ public class MapLogic { Map heroAllAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero,false,teamId); int per =(int) (checkResult[i+2] / (double) heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId())*10000); mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),per); - if(heroAllAttribute.get(HeroAttributeEnum.CurHP.getPropertyId())==0){ + if(mapManager.getHeroAllAttributeMap().get(hero.getId()).get(HeroAttributeEnum.CurHP.getPropertyId())==0){ mapManager.removeOneHeroAttribute(hero.getId()); }else{ mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtySixBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtySixBehavior.java index e42409d5b..a5657877d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtySixBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtySixBehavior.java @@ -15,7 +15,7 @@ public class FourtySixBehavior extends BaseBehavior { @Override public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - BehaviorUtil.destoryPoints(user,new int[]{user.getMapManager().getCurXY()}); + BehaviorUtil.destoryApointXY(user,user.getMapManager().getCurXY()); return true; } 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 be325f38d..e746509a0 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 @@ -1367,6 +1367,11 @@ public class HeroLogic { if(equipIds.size()!=1){ MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE.getNumber(),"法宝智能穿戴一个"); }else{ + int[] equipTalismanaUnlock = SGameSetting.getGameSetting().getEquipTalismanaUnlock(); + if(user.getPlayerInfoManager().getLevel()