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 d26be1e8a..2d4383ae1 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)==0){ + if(heroAllAttribute.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)==0){ + if(heroAllAttribute.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/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 332755092..745610504 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -857,7 +857,8 @@ public class ItemUtil { private static void addEquip(User user,int equipId ,List equipList,List especialEquipList) throws Exception { EquipManager equipManager = user.getEquipManager(); - int itemType = SItem.getsItemMap().get(equipId).getItemType(); + SItem item = SItem.getsItemMap().get(equipId); + int itemType = item.getItemType(); if(itemType==GlobalItemType.EQUIP){ Equip equip = new Equip(user.getId(),equipId); equipManager.addEquip(user,equip); @@ -865,11 +866,12 @@ public class ItemUtil { SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(equipId); if (sEquipConfig.getQuality() >= 5) { String nickName = user.getPlayerInfoManager().getNickName(); - String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_equip_content", new Object[]{nickName, equipQulityNameMap.get(sEquipConfig.getQuality()),SItem.getsItemMap().get(equipId).getName()}); + String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_equip_content", new Object[]{nickName, equipQulityNameMap.get(sEquipConfig.getQuality()), item.getName()}); ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,equipId,0,0,0,0,0); } }else if(itemType==GlobalItemType.ESPECIAL_EQUIP){ EspecialEquip especialEquip = new EspecialEquip(user.getId(),equipId); + especialEquip.setStar(item.getQuantity()); especialEquipList.add(CBean2Proto.getEquipProto(especialEquip)); equipManager.addEspecialEquip(user,especialEquip); }else if(itemType==GlobalItemType.SOUL_MARK){