From 554c62964bb8ad32ec4c0c514d4361fbdd9f6509 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 21 Oct 2019 15:25:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/core/GlobalsDef.java | 1 + .../jieling/logic/family/GuildFightLogic.java | 16 ++++++++++++++-- .../ljsd/jieling/logic/family/GuildLogic.java | 7 +++++-- .../com/ljsd/jieling/logic/mail/MailLogic.java | 2 +- .../java/com/ljsd/jieling/util/CBean2Proto.java | 11 ++++++----- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index 12a3070fc..75d8fc863 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -8,6 +8,7 @@ public interface GlobalsDef { int CHAIRMAN = 1; int ADMINISTRATORS =2; int MEMBER = 3; + int CHAIRMAN_TO_MENBER = 4; int RANDOM_LOTTERY_TYPE = 1; 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 5528f381e..b3632365d 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 @@ -255,12 +255,12 @@ public class GuildFightLogic { continue; } Map configMap = STableManager.getConfig(SGuildLevelConfig.class); - //匹配处理 - GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); //todo 人数限制 + GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); if(guildInfo.getDefendInfo().size()> entry:guildInfo.getMembers().entrySet()){ for(Integer uid:entry.getValue()){ @@ -561,6 +561,7 @@ public class GuildFightLogic { .setRoundEndTime(roundEndTime) .setAttackCount(attackCount) .setJoinType(1); + if (enemyFamily != -1) { GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class); // GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily); @@ -583,6 +584,12 @@ public class GuildFightLogic { } } } + //todo 人数限制 + Map configMap = STableManager.getConfig(SGuildLevelConfig.class); + if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size()roundStartTime&&createTime/1000 Date: Mon, 21 Oct 2019 17:53:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=88=98=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E4=BF=A1=E6=81=AF=E6=97=A0=E5=85=AC=E4=BC=9A=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildFightLogic.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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);