From aab210369800a22f969f83207d5367245acc0c78 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <490717040@qq.com> Date: Thu, 9 Dec 2021 02:36:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 --- 1 file changed, 3 deletions(-) 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 d3558c2f5..646b23f9b 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 @@ -2308,9 +2308,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()) { From 9873a26fffc5ab7d9258a12feda8d5f85ab72423 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <490717040@qq.com> Date: Thu, 9 Dec 2021 15:19:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BA=AB=E5=A4=96=E5=8C=96=E8=BA=AB?= =?UTF-8?q?=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/FightDataUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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());