diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index ccc62adee..4287f30e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -354,15 +354,15 @@ public class GuildFightLogic { RedisUtil redisUtil = RedisUtil.getInstence(); Set guildIds = GuilidManager.guildInfoMap.keySet(); for (Integer gid : guildIds) { - GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); - int enemyFamily = getEnemyFamily(guildInfo.getId()); + int enemyFamily = getEnemyFamily(gid); if (enemyFamily == -1) { continue; } + GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class); // GuildInfo enemyInfo = GuilidManager.guildInfoMap.get(enemyFamily); Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(enemyFamily) - .setLevel(enemyInfo.getLevel()) + .setLevel(enemyInfo.getLevel()) .setName(enemyInfo.getName()) .setPictureId(enemyInfo.getIcon()) .setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class)) @@ -562,12 +562,12 @@ public class GuildFightLogic { .setRoundEndTime(roundEndTime) .setAttackCount(attackCount) .setJoinType(1); - if(guildId==0){ - response.setType(-1); - response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000)); - MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true); - return; - } +// if(guildId==0){ +// response.setType(-1); +// response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000)); +// MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true); +// return; +// } if (enemyFamily != -1) { GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class); // GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily); @@ -583,19 +583,21 @@ public class GuildFightLogic { response.setEnemy(familyInfo); } }else{ - if(status!=0&&status!=1){ - if(!startMatching){ + if(status!=0){ + if(!startMatching&&status!=1){ response.setType(-1); response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000)); } + //todo 人数限制 + if(guildId!=0){ + Map configMap = STableManager.getConfig(SGuildLevelConfig.class); + if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size() configMap = STableManager.getConfig(SGuildLevelConfig.class); - if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size()roundStartTime&&createTime/1000