From 49811877fae6af5b3adae0039e969720e3f08f73 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 21 Dec 2021 19:07:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=98=E6=96=97=E6=98=9F=E7=BA=A7?= 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, 3 insertions(+), 1 deletion(-) 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 bd704e3a4..355e86a04 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -25,7 +25,7 @@ public class FightDataUtil { LuaValue LuaTable = new LuaTable(); LuaTable.set("uid",data); - // LuaTable.set("enemyData", getEnemyData(monsterTeamList)); + // LuaTable.set("enemyData", getEnemyData(monsterTeamList)); // // if (data.equals("") || data==null){ // return new LuaTable(); @@ -99,6 +99,7 @@ public class FightDataUtil { SCHero hero = SCHero.getsCHero().get(sMonster.getMonsterId()); if(hero!=null){ unitData.set("job",hero.getJob()); + unitData.set("star",hero.getStar()); } if (unitSkill.length==1){ unitData.set("skill", getSkill(unitSkill[0],sMonster.getSkinId())); @@ -389,6 +390,7 @@ public class FightDataUtil { unitData.set("property", getProperty(property)); unitData.set("skinId",data.getSkinId()); unitData.set("job",hero.getJob()); + unitData.set("star",data.getStar()); return unitData; } From a9df7aa7e0cf895d8f89591cacdce6bdefa414cf Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 22 Dec 2021 10:54:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=94=E8=BF=98=E9=81=93=E5=85=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index c2e7def40..2f2f37c34 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -209,7 +209,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ hasHeroMap.put(10, 1); } } else if (value.getStar() == 11) { - if (hasHeroMap.containsKey(1)) { + if (hasHeroMap.containsKey(11)) { hasHeroMap.put(11, hasHeroMap.get(11) + 1); } else { hasHeroMap.put(11, 1);