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 f7c990a63..ac92d7b7d 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 @@ -2338,9 +2338,6 @@ public class HeroLogic { public void getPracticeSkill(List infoList, Map practiceSkillMap, long maxForce,int sex,int userLv,List tfInfoList) { - if (practiceSkillMap.isEmpty()) { - return; - } StringBuilder skillStr = new StringBuilder(); // 修行技能 for (Map.Entry entry : practiceSkillMap.entrySet()) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index 94251aa95..bd704e3a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -268,14 +268,14 @@ public class FightDataUtil { for (int i = 0; i < pokemonUnitList.size(); i++) { CommonProto.FightUnitInfo unitInfo=pokemonUnitList.get(i); String skillId = unitInfo.getUnitSkillIds(); - if(skillId.equals("0")||skillId==""){ + if(skillId.equals("0")|| StringUtil.isEmpty(skillId)){ continue; } ///100代表是修行技能 if (unitInfo.getPosition()==100){ LuaValue monster = new LuaTable(); monster.set("id",0); - monster.set("star",0); + monster.set("star",unitInfo.getStar()); monster.set("teamDamage",unitInfo.getForceScore()); monster.set("camp",camp); monster.set("position",unitInfo.getPosition());