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 b3632365d..ccc62adee 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 @@ -549,6 +549,7 @@ public class GuildFightLogic { public static void getFamilyFightRoundInfo(ISession session, MessageTypeProto.MessageType messageType) throws Exception { RedisUtil redisUtil = RedisUtil.getInstence(); int guildId = UserManager.getUser(session.getUid()).getPlayerInfoManager().getGuildId(); + int enemyFamily = getEnemyFamily(guildId); Integer attackCount = redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_ATTACK_COUNT,"",String.valueOf(session.getUid()),Integer.class); if(attackCount==null){ @@ -561,7 +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 (enemyFamily != -1) { GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class); // GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);