diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java index 41866b487..e339d9ad7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java @@ -13,7 +13,7 @@ import util.MathUtils; import java.util.*; public class SArenaRobotStaticConfig extends AbstractClassStaticConfig { - private static TreeMap> force2robotId; + private static TreeMap> force2robotId; @Override public void registConfigs(Set registConfigs) { registConfigs.add(SArenaRobotConfig.class.getAnnotation(Table.class).name()); @@ -110,9 +110,9 @@ public class SArenaRobotStaticConfig extends AbstractClassStaticConfig { } int[][] returnMaterials = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getReturnMaterials(); - Map> sWorkTechMapByTechIdAndLevel = STableManager.getFigureConfig(CommonStaticConfig.class).getsWorkTechMapByTechIdAndLevelTmp(); + Map> sWorkTechMapByTechIdAndLevel = STableManager.getFigureConfig(CommonStaticConfig.class).getsWorkTechMapByTechIdAndLevelTmp(); for(Map item : sWorkTechMapByTechIdAndLevel.values()){ - for(SWorkShopTechnology sWorkShopTechnology:item.values()){ + for(SWorkShopTechnology sWorkShopTechnology : item.values()){ if(sWorkShopTechnology.getWillReturn() == null){ continue; } @@ -123,12 +123,12 @@ public class SArenaRobotStaticConfig extends AbstractClassStaticConfig { public static Integer getFloorForce2robotId(int force) { Map.Entry> entry = force2robotId.ceilingEntry(force); - if(null==entry){ - LinkedList value = force2robotId.lastEntry().getValue(); - int num = MathUtils.randomInt(value.size()); - return value.get(num); + LinkedList value; + if(null == entry){ + value = force2robotId.lastEntry().getValue(); + }else { + value = entry.getValue(); } - LinkedList value = entry.getValue(); int num = MathUtils.randomInt(value.size()); return value.get(num); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java index 3b876dcb5..3a9304310 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java @@ -175,7 +175,7 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler 0) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/GetPlayerOneTeamInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/GetPlayerOneTeamInfo.java index 164a0d823..d4a4b139f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/GetPlayerOneTeamInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/GetPlayerOneTeamInfo.java @@ -46,7 +46,6 @@ public class GetPlayerOneTeamInfo extends BaseHandler heroInfos = teamPosManager.getTeamPosForHero().get(teamId); + if (heroInfos == null || heroInfos.isEmpty()){ + return false; + } for (TeamPosHeroInfo heroInfo : heroInfos) { Hero hero = heroManager.getHero(heroInfo.getHeroId()); if (hero == null){ 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 fae48024c..686a49691 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 @@ -3437,7 +3437,6 @@ public class HeroLogic { attribute.put(id, attribute.getOrDefault(id, 0L) + num); } } - LOGGER.info("===助阵属性:{}",attribute); combinedAttribute(attribute, heroAllAttribute); return totalAdd; }