diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 289fa8965..ba12cbf50 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -853,26 +853,6 @@ public class GuildLogic { } } } - - /** - * 公会战查看双方对战信息 - * @param session - * @param messageType - * @throws Exception - */ - public static void viewFightInfo(ISession session, MessageTypeProto.MessageType messageType) throws Exception { - User user = UserManager.getUser(session.getUid()); - int guildId = user.getPlayerInfoManager().getGuildId(); - int enemyId = 13; - if(guildId==13){ - enemyId = 14; - } - Family.FamilyFightInfoResponse.Builder builder = Family.FamilyFightInfoResponse.newBuilder(); - builder.addInfo(familyFightDetailInfo(guildId)); - builder.addInfo(familyFightDetailInfo(enemyId)); - MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build(),true); - - } private static Family.FamilyFightInfo familyFightDetailInfo(int guildId) throws Exception { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); Map defendInfo = guildInfo.getDefendInfo(); @@ -902,6 +882,25 @@ public class GuildLogic { } return fightInfo.build(); } + /** + * 公会战查看双方对战信息 + * @param session + * @param messageType + * @throws Exception + */ + public static void viewFightInfo(ISession session, MessageTypeProto.MessageType messageType) throws Exception { + User user = UserManager.getUser(session.getUid()); + int guildId = user.getPlayerInfoManager().getGuildId(); + int enemyId = 13; + if(guildId==13){ + enemyId = 14; + } + Family.FamilyFightInfoResponse.Builder builder = Family.FamilyFightInfoResponse.newBuilder(); + builder.addInfo(familyFightDetailInfo(guildId)); + builder.addInfo(familyFightDetailInfo(enemyId)); + MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build(),true); + + } /** * 公会战计入缓存 * @throws Exception